OpenBIOS January 2011

openbios@openbios.org

10 participants
48 discussions

[commit] r1013 - in trunk/openbios-devel: . config/xml kernel
by repository service 02 Jan '11

02 Jan '11

Author: blueswirl Date: Sun Jan 2 10:56:19 2011 New Revision: 1013 URL: http://tracker.coreboot.org/trac/openbios/changeset/1013 Log: Generate Makefile dependencies also from Forth files 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> Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/config/xml/dictionary.xsl trunk/openbios-devel/kernel/bootstrap.c Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Sun Jan 2 02:32:17 2011 (r1012) +++ trunk/openbios-devel/Makefile.target Sun Jan 2 10:56:19 2011 (r1013) @@ -77,4 +77,4 @@ 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) Modified: trunk/openbios-devel/config/xml/dictionary.xsl ============================================================================== --- trunk/openbios-devel/config/xml/dictionary.xsl Sun Jan 2 02:32:17 2011 (r1012) +++ trunk/openbios-devel/config/xml/dictionary.xsl Sun Jan 2 10:56:19 2011 (r1013) @@ -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> Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Sun Jan 2 02:32:17 2011 (r1012) +++ trunk/openbios-devel/kernel/bootstrap.c Sun Jan 2 10:56:19 2011 (r1013) @@ -69,6 +69,7 @@ }; static include includes = { ".", NULL }; +static FILE *depfile; static ucell * relocation_address=NULL; static int relocation_length=0; @@ -465,6 +466,10 @@ srclines [ cursrc ] = 1; srcfiles [ cursrc++ ] = ret; + if (depfile) { + fprintf(depfile, " %s", fullpath); + } + return ret; } @@ -1025,7 +1030,9 @@ " 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 @@ " -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 @@ 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 @@ {"source-dictionary", 1, NULL, 'd'}, {"target-dictionary", 1, NULL, 'D'}, {"console", 1, NULL, 'c'}, + {"dependency-dump", 1, NULL, 'M'}, }; /* @@ -1118,6 +1127,11 @@ consolefile = optarg; } break; + case 'M': + if (!depfilename) { + depfilename = optarg; + } + break; default: return 1; } @@ -1127,6 +1141,7 @@ 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,15 @@ return 1; } + if (depfilename) { + depfile = fopen(depfilename, "w"); + if (!depfile) { + printk("panic: can't write to dependency file '%s'.\n", + depfilename); + exit(1); + } + fprintf(depfile, "%s:", dictname); + } /* * Get all required resources @@ -1203,6 +1227,11 @@ run_dictionary(basedict, consolefile); } + if (depfile) { + fprintf(depfile, "\n"); + fclose(depfile); + depfile = NULL; + } if(errors) break; }

1 0

Re: [OpenBIOS] [PATCH 00/13] Convert SPARC32 to OFMEM v2
by Blue Swirl 02 Jan '11

02 Jan '11

On Thu, Dec 30, 2010 at 11:22 PM, Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> wrote: > 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. For all patches: Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com>

2 2

[commit] r1012 - trunk/openbios-devel/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 02:32:17 2011 New Revision: 1012 URL: http://tracker.coreboot.org/trac/openbios/changeset/1012 Log: Add extra debugging to display the parameters being passed to obp_fortheval_v2() on SPARC32. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Jan 2 01:39:04 2011 (r1011) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Jan 2 02:32:17 2011 (r1012) @@ -442,7 +442,7 @@ PUSH(arg1); PUSH(arg0); - DPRINTF("obp_fortheval_v2(%s)\n", str); + DPRINTF("obp_fortheval_v2(%x %x %x %x %x %s)\n", arg4, arg3, arg2, arg1, arg0, str); push_str(str); fword("eval");

1 0

[commit] r1011 - trunk/openbios-devel/drivers
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:39:04 2011 New Revision: 1011 URL: http://tracker.coreboot.org/trac/openbios/changeset/1011 Log: Register SPARC32 auxio device and correctly encode virtual addresses in the OBIO device tree. Once the auxio device is registered, we must also correct the address properties which currently set a 64-bit rather than a 32-bit property. This fixes error messages related to auxio when attempting to boot a Solaris 8 CD. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/drivers/obio.c Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Jan 2 01:07:34 2011 (r1010) +++ trunk/openbios-devel/drivers/obio.c Sun Jan 2 01:39:04 2011 (r1011) @@ -75,9 +75,6 @@ PUSH(addr); fword("encode-int"); - PUSH(4); - fword("encode-int"); - fword("encode+"); push_str("address"); fword("property"); return addr; @@ -228,7 +225,7 @@ { ob_new_obio_device("auxio", NULL); - ob_reg(base, offset, AUXIO_REGS, 0); + ob_reg(base, offset, AUXIO_REGS, 1); fword("finish-device"); }

1 0

[commit] r1010 - trunk/openbios-devel/include/arch/sparc32
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:07:34 2011 New Revision: 1010 URL: http://tracker.coreboot.org/trac/openbios/changeset/1010 Log: Fix the FMT_cell and FMT_ucell definitions for SPARC32. 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> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/include/arch/sparc32/types.h Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Jan 2 01:07:26 2011 (r1009) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Jan 2 01:07:34 2011 (r1010) @@ -26,6 +26,8 @@ typedef long long int64_t; typedef long intptr_t; +#define PRId32 "d" +#define PRIu32 "u" #define PRIx32 "x" #define PRIx64 "llx" #endif @@ -46,8 +48,8 @@ typedef long long dcell; typedef unsigned long long ducell; -#define FMT_cell "%ld" -#define FMT_ucell "%lu" +#define FMT_cell "%" PRId32 +#define FMT_ucell "%" PRIu32 #define FMT_ucellx "%08x" #define FMT_ucellX "%08X"

1 0

[commit] r1009 - in trunk/openbios-devel: arch/sparc32 drivers include/libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:07:26 2011 New Revision: 1009 URL: http://tracker.coreboot.org/trac/openbios/changeset/1009 Log: Switch remaining SPARC32 code over to OFMEM. 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> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:07:19 2011 (r1008) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:07:26 2011 (r1009) @@ -53,8 +53,6 @@ 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 @@ 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 @@ 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 ob_init_mmu(void) { + ucell *reg; + init_romvec_mem(); /* Find the phandles for the /memory and /virtual-memory nodes */ @@ -400,30 +390,18 @@ 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 @@ 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)); Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:07:19 2011 (r1008) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:07:26 2011 (r1009) @@ -68,7 +68,7 @@ */ 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. Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:07:19 2011 (r1008) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:07:26 2011 (r1009) @@ -135,7 +135,6 @@ 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 0

[commit] r1008 - in trunk/openbios-devel: arch/sparc32 drivers include/libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:07:19 2011 New Revision: 1008 URL: http://tracker.coreboot.org/trac/openbios/changeset/1008 Log: Switch all SPARC32 devices over from the private map_io() function over to OFMEM's ofmem_map_io() function. 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> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/esp.c trunk/openbios-devel/drivers/fw_cfg.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/sbus.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/arch/sparc32/console.c Sun Jan 2 01:07:19 2011 (r1008) @@ -46,8 +46,8 @@ 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(); } Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:07:19 2011 (r1008) @@ -218,29 +218,6 @@ } /* - * 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_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) Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/escc.c Sun Jan 2 01:07:19 2011 (r1008) @@ -105,7 +105,7 @@ 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 @@ 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; } Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/esp.c Sun Jan 2 01:07:19 2011 (r1008) @@ -311,7 +311,7 @@ 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 @@ 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"); Modified: trunk/openbios-devel/drivers/fw_cfg.c ============================================================================== --- trunk/openbios-devel/drivers/fw_cfg.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/fw_cfg.c Sun Jan 2 01:07:19 2011 (r1008) @@ -65,7 +65,7 @@ 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 Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:07:19 2011 (r1008) @@ -103,7 +103,7 @@ 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 (;;) { } Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/obio.c Sun Jan 2 01:07:19 2011 (r1008) @@ -71,7 +71,7 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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)); } Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/drivers/sbus.c Sun Jan 2 01:07:19 2011 (r1008) @@ -49,7 +49,7 @@ 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"); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:59 2011 (r1007) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:07:19 2011 (r1008) @@ -136,7 +136,6 @@ 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 0

[commit] r1007 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 include/libopenbios libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:59 2011 New Revision: 1007 URL: http://tracker.coreboot.org/trac/openbios/changeset/1007 Log: Implement ofmem_map_io() within OFMEM as a function to map I/O memory (similar to SPARC32's private map_io() function). 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.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc32/ofmem_sparc32.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 Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 2 01:06:59 2011 (r1007) @@ -132,6 +132,18 @@ /* 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 */ Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:59 2011 (r1007) @@ -71,6 +71,16 @@ 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 */ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 2 01:06:59 2011 (r1007) @@ -70,6 +70,18 @@ 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 */ Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:59 2011 (r1007) @@ -46,6 +46,7 @@ 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 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 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; Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Jan 2 01:06:53 2011 (r1006) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Jan 2 01:06:59 2011 (r1007) @@ -551,6 +551,35 @@ 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 @@ 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 0

[commit] r1006 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 drivers include/libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:53 2011 New Revision: 1006 URL: http://tracker.coreboot.org/trac/openbios/changeset/1006 Log: Introduce ofmem_arch_io_translation_mode() to allow an OFMEM arch to specify different MMU modes for I/O memory mapped regions. 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> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Jan 2 01:06:53 2011 (r1006) @@ -239,6 +239,10 @@ 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 */ Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:53 2011 (r1006) @@ -208,15 +208,7 @@ 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 @@ 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 @@ 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 @@ { 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 @@ 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 @@ 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 Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 2 01:06:53 2011 (r1006) @@ -123,6 +123,11 @@ return SRMMU_REF | SRMMU_CACHE | SRMMU_PRIV; } +ucell ofmem_arch_io_translation_mode( phys_addr_t phys ) +{ + return SRMMU_REF | SRMMU_PRIV; +} + /************************************************************************/ /* init / cleanup */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 2 01:06:53 2011 (r1006) @@ -120,8 +120,11 @@ 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 */ Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:53 2011 (r1006) @@ -68,7 +68,7 @@ */ 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. Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:47 2011 (r1005) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:53 2011 (r1006) @@ -69,6 +69,7 @@ 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 0

[commit] r1005 - in trunk/openbios-devel: arch/sparc32 drivers include/libopenbios
by repository service 02 Jan '11

02 Jan '11

Author: mcayland Date: Sun Jan 2 01:06:47 2011 New Revision: 1005 URL: http://tracker.coreboot.org/trac/openbios/changeset/1005 Log: Remove the existing map_page() function and instead install a transitional API using map_pages() which is almost identical to the OFMEM API. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Tested-by: Blue Swirl <blauwirbel(a)gmail.com> Reviewed-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/include/libopenbios/ofmem.h Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:40 2011 (r1004) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 2 01:06:47 2011 (r1005) @@ -190,49 +190,41 @@ 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 @@ 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 @@ 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 @@ { 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 @@ 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 @@ { 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 @@ // 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 Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:40 2011 (r1004) +++ trunk/openbios-devel/drivers/iommu.c Sun Jan 2 01:06:47 2011 (r1005) @@ -68,11 +68,7 @@ */ 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. Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:40 2011 (r1004) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 2 01:06:47 2011 (r1005) @@ -129,7 +129,7 @@ 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 0