OpenBIOS February 2011

openbios@openbios.org

9 participants
25 discussions

[commit] r1023 - trunk/openbios-devel/libopenbios
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:56 2011 New Revision: 1023 URL: http://tracker.coreboot.org/trac/openbios/changeset/1023 Log: OFMEM: Fix missing ofmem_update_translations() calls. Otherwise the device tree properties will not always get updated to reflect the current memory ranges. 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 Tue Feb 8 23:06:54 2011 (r1022) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Tue Feb 8 23:06:56 2011 (r1023) @@ -481,6 +481,7 @@ return -1; } add_entry( phys, size, &ofmem->phys_range ); + ofmem_update_translations(); return phys; } phys = find_area( align, size, ofmem->phys_range, min, max, reverse ); @@ -515,6 +516,7 @@ return -1; } add_entry( virt, size, &ofmem->virt_range ); + ofmem_update_translations(); return virt; } @@ -524,6 +526,9 @@ return -1; } add_entry( virt, size, &ofmem->virt_range ); + + ofmem_update_translations(); + return virt; }

1 0

[commit] r1022 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:54 2011 New Revision: 1022 URL: http://tracker.coreboot.org/trac/openbios/changeset/1022 Log: Fix up /virtual-memory reg property on SPARC32. Make it similar to the OBP output with 2 entries consisting of half the virtual address space. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/drivers/iommu.c Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Tue Feb 8 23:06:51 2011 (r1021) +++ trunk/openbios-devel/arch/sparc32/lib.c Tue Feb 8 23:06:54 2011 (r1022) @@ -373,7 +373,10 @@ void ob_init_mmu(void) { - ucell *reg; + ucell *memreg; + ucell *virtreg; + phys_addr_t virtregsize; + ofmem_t *ofmem = ofmem_arch_get_private(); init_romvec_mem(); @@ -391,18 +394,35 @@ ofmem_register(s_phandle_memory, s_phandle_mmu); /* 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 */ + memreg = malloc(3 * sizeof(ucell)); + ofmem_arch_encode_physaddr(memreg, 0); /* physical base */ + memreg[2] = (ucell)ofmem->ramsize; /* size */ push_str("/memory"); fword("find-device"); - PUSH(pointer2cell(reg)); + PUSH(pointer2cell(memreg)); PUSH(3 * sizeof(ucell)); push_str("reg"); PUSH_ph(s_phandle_memory); fword("encode-property"); + /* Setup /virtual-memory:reg property */ + virtregsize = ((phys_addr_t)((ucell)-1) + 1) / 2; + + virtreg = malloc(6 * sizeof(ucell)); + ofmem_arch_encode_physaddr(virtreg, 0); + virtreg[2] = virtregsize; + ofmem_arch_encode_physaddr(&virtreg[3], virtregsize); + virtreg[5] = virtregsize; + + push_str("/virtual-memory"); + fword("find-device"); + PUSH(pointer2cell(virtreg)); + PUSH(6 * sizeof(ucell)); + push_str("reg"); + PUSH_ph(s_phandle_mmu); + fword("encode-property"); + PUSH(0); fword("active-package!"); bind_func("pgmap@", pgmap_fetch); Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Tue Feb 8 23:06:51 2011 (r1021) +++ trunk/openbios-devel/drivers/iommu.c Tue Feb 8 23:06:54 2011 (r1022) @@ -155,20 +155,6 @@ regs = iommu_init(&ciommu, base); - push_str("/virtual-memory"); - fword("find-device"); - - PUSH(base >> 32); - fword("encode-int"); - PUSH(base & 0xffffffff); - fword("encode-int"); - fword("encode+"); - PUSH(IOMMU_REGS); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); - push_str("/iommu"); fword("find-device"); PUSH((unsigned long)regs);

1 0

[commit] r1021 - trunk/openbios-devel/arch/sparc32
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:51 2011 New Revision: 1021 URL: http://tracker.coreboot.org/trac/openbios/changeset/1021 Log: Explicitly claim physical and virtual memory used by OpenBIOS in OFMEM under SPARC32. This is required to ensure that Solaris doesn't consider the memory used by OpenBIOS as available when interpreting the memory lists. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:49 2011 (r1020) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:51 2011 (r1021) @@ -161,4 +161,10 @@ { memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); s_ofmem_data.ofmem.ramsize = qemu_mem_size; + + /* Claim reserved physical addresses at top of RAM */ + ofmem_claim_phys(ofmem_arch_get_phys_top(), s_ofmem_data.ofmem.ramsize - ofmem_arch_get_phys_top(), 0); + + /* Claim OpenBIOS reserved space */ + ofmem_claim_virt(0xffd00000, 0x300000, 0); }

1 0

[commit] r1020 - trunk/openbios-devel/arch/sparc32
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:49 2011 New Revision: 1020 URL: http://tracker.coreboot.org/trac/openbios/changeset/1020 Log: Switch SPARC32 to use 2 address cells for addresses within the /virtual-memory available property. This matches the format of the /virtual-memory available property generated by OBP under QEMU. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:46 2011 (r1019) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:49 2011 (r1020) @@ -127,11 +127,7 @@ /* Return the size of a memory available entry given the phandle in cells */ int ofmem_arch_get_available_entry_size(phandle_t ph) { - if (ph == s_phandle_memory) { - return 1 + ofmem_arch_get_physaddr_cellsize(); - } else { - return 1 + 1; - } + return 1 + ofmem_arch_get_physaddr_cellsize(); } /* Generate memory available property entry for Sparc32 */ @@ -139,12 +135,7 @@ { int i = 0; - if (ph == s_phandle_memory) { - i += ofmem_arch_encode_physaddr(availentry, start); - } else { - availentry[i++] = start; - } - + i += ofmem_arch_encode_physaddr(availentry, start); availentry[i] = size; }

1 0

[commit] r1019 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 include/libopenbios libopenbios
by repository service 08 Feb '11

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:46 2011 New Revision: 1019 URL: http://tracker.coreboot.org/trac/openbios/changeset/1019 Log: Delegate construction of memory "available" property to each architecture. This is required because some architectures do not strictly follow the convention of using physical addresses sizes in the /memory node and virtual addresses in the /virtual-memory node. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc32/lib.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 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Tue Feb 8 23:06:46 2011 (r1019) @@ -195,6 +195,30 @@ transentry[i++] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for PPC */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* OF private allocations */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/arch/sparc32/lib.c Tue Feb 8 23:06:46 2011 (r1019) @@ -59,8 +59,6 @@ static unsigned long *context_table; static unsigned long *l1; -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; static ucell *mem_reg = 0; static ucell *mem_avail = 0; static ucell *virt_avail = 0; Modified: trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/arch/sparc32/ofmem_sparc32.c Tue Feb 8 23:06:46 2011 (r1019) @@ -124,6 +124,30 @@ transentry[2] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for Sparc32 */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* misc */ /************************************************************************/ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Tue Feb 8 23:06:46 2011 (r1019) @@ -110,6 +110,30 @@ transentry[2] = t->mode; } +/* Return the size of a memory available entry given the phandle in cells */ +int ofmem_arch_get_available_entry_size(phandle_t ph) +{ + if (ph == s_phandle_memory) { + return 1 + ofmem_arch_get_physaddr_cellsize(); + } else { + return 1 + 1; + } +} + +/* Generate memory available property entry for Sparc64 */ +void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size) +{ + int i = 0; + + if (ph == s_phandle_memory) { + i += ofmem_arch_encode_physaddr(availentry, start); + } else { + availentry[i++] = start; + } + + availentry[i] = size; +} + /************************************************************************/ /* misc */ /************************************************************************/ Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Tue Feb 8 23:06:46 2011 (r1019) @@ -69,6 +69,8 @@ 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); +extern int ofmem_arch_get_available_entry_size(phandle_t ph); +extern void ofmem_arch_create_available_entry(phandle_t ph, ucell *availentry, phys_addr_t start, ucell size); 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 ); @@ -120,6 +122,10 @@ extern void ofmem_release_virt( ucell virt, ucell size ); extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); +/* memory and virtual-memory nodes */ +extern phandle_t s_phandle_memory; +extern phandle_t s_phandle_mmu; + /* Currently the same for all architectures */ #define PAGE_SHIFT 12 Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Jan 30 14:07:40 2011 (r1018) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Tue Feb 8 23:06:46 2011 (r1019) @@ -222,8 +222,8 @@ fword("encode-property"); } -static phandle_t s_phandle_memory = 0; -static phandle_t s_phandle_mmu = 0; +phandle_t s_phandle_memory = 0; +phandle_t s_phandle_mmu = 0; static void ofmem_update_mmu_translations( void ) { @@ -290,8 +290,7 @@ /* inverse of phys_range list could take 2 or more additional cells for the tail For /memory, physical addresses may be wider than one ucell. */ - prop_used = (ncells + 1) * sizeof(ucell) * - (((ph == s_phandle_memory) ? ofmem_arch_get_physaddr_cellsize() : 1) + 1); + prop_used = (ncells + 1) * sizeof(ucell) * ofmem_arch_get_available_entry_size(ph) + 1; if (prop_used > *mem_prop_size) { @@ -325,28 +324,16 @@ size = r->start - start; if (size) { - if (ph == s_phandle_memory) { - /* physical address for /memory */ - ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); - } else { - /* virtual address for MMU */ - prop[ncells++] = start; - } - prop[ncells++] = size; + ofmem_arch_create_available_entry(ph, &prop[ncells], start, size); + ncells += ofmem_arch_get_available_entry_size(ph); } start = r->start + r->size; } /* tail */ if (start < top_address) { - if (ph == s_phandle_memory) { - /* physical address for /memory */ - ncells += ofmem_arch_encode_physaddr(&prop[ncells], start); - } else { - /* virtual address for MMU */ - prop[ncells++] = start; - } - prop[ncells++] = top_address - start; + ofmem_arch_create_available_entry(ph, &prop[ncells], start, top_address - start); + ncells += ofmem_arch_get_available_entry_size(ph); } ofmem_set_property(ph, "available",

1 0