OpenBIOS December 2010

openbios@openbios.org

12 participants
64 discussions

[commit] r985 - trunk/openbios-devel/arch/ppc/qemu
by repository service 17 Dec '10

17 Dec '10

Author: afaerber Date: Fri Dec 17 15:25:14 2010 New Revision: 985 URL: http://tracker.coreboot.org/trac/openbios/changeset/985 Log: ppc: unexpected_excep() needs an absolute branch When called from address 0x700, trap_error must not use a relative branch to unexpected_excep() since that is beyond __vectors_end. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Dec 12 21:09:49 2010 (r984) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Fri Dec 17 15:25:14 2010 (r985) @@ -288,7 +288,9 @@ _GLOBAL(__divide_error): trap_error: mflr r3 - b BRANCH_LABEL(unexpected_excep) + LOAD_REG_FUNC(r4, unexpected_excep) + mtctr r4 + bctr VECTOR( 0x100, "SRE" ): b _entry

1 0

Re: [OpenBIOS] [PATCHv8 00/16] boot order specification
by Blue Swirl 17 Dec '10

17 Dec '10

On Wed, Dec 8, 2010 at 11:34 AM, Gleb Natapov <gleb(a)redhat.com> wrote: > Forget to save a couple of buffers before sending version 7 :( > > Anthony, Blue can this be applied now? I made some more tests, this time with PPC. I modified OpenBIOS to print out the boot device list: $ qemu-system-ppc -drive if=none,id=hda,file=/dev/null -device ide-drive,drive=hda,bootindex=1 -drive if=none,id=cd,file=/dev/null -device ide-drive,drive=cd,bootindex=0 -nographic -prom-env 'auto-boot?=false' -L . qemu-system-ppc: pci_add_option_rom: failed to find romfile "vgabios-stdvga.bin" Could not open option rom 'pxe-ne2k_pci.bin': No such file or directory >> ============================================================= >> OpenBIOS 1.0 [Nov 28 2010 19:37] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 128M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 >> bootindex /grackle@fec00000/ide@3/drive@1/disk@1 >> /grackle@fec00000/ide@3/drive@1/disk@0 Welcome to OpenBIOS v1.0 built on Nov 28 2010 19:37 0 > show-devs 7be6324 / 7be6440 /aliases 7be64e4 /openprom (BootROM) 7bebfa0 /openprom/client-services 7be668c /options 7be6704 /chosen 7be67e8 /builtin 7be688c /builtin/console 7bebcac /packages 7becda8 /packages/cmdline 7becee8 /packages/disk-label 7bedb58 /packages/terminal-emulator 7bee548 /packages/deblocker 7bee89c /packages/hfsplus-files 7beeb3c /packages/hfs-files 7beedd8 /packages/ext2-files 7bef010 /packages/iso9660-files 7bef248 /packages/grubfs-files 7bef480 /packages/mac-parts 7bef6b8 /packages/pc-parts 7bef8ec /packages/xcoff-loader 7bef9b8 /packages/elf-loader 7befa80 /packages/bootinfo-loader 7bed958 /cpus 7bf2fe8 /cpus/PowerPC,750@0 (cpu) 7beda58 /memory@0 (memory) 7befb4c /pci@80000000 (pci) 7beff64 /pci@80000000/QEMU,VGA@1 (display) 7bf0438 /pci@80000000/NE2000@2 (network) 7bf0814 /pci@80000000/pci-ata@3 (pci-ide) 7bf0c50 /pci@80000000/pci-ata@3/ata-1@500 (ata) 7bf0dd0 /pci@80000000/pci-ata@3/ata-2@600 (ata) 7bf0f50 /pci@80000000/pci-ata@3/ata-2@600/disk@1 (block) 7bf131c /pci@80000000/pci-ata@3/ata-2@600/disk@0 (block) 7bf1674 /pci@80000000/mac-io@4 (mac-io) 7bf1b54 /pci@80000000/mac-io@4/via-cuda@16000 (via-cuda) 7bf1d70 /pci@80000000/mac-io@4/via-cuda@16000/adb (adb) 7bf1ed8 /pci@80000000/mac-io@4/via-cuda@16000/adb/keyboard@8 (keyboard) 7bf2080 /pci@80000000/mac-io@4/via-cuda@16000/adb/mouse@9 (mouse) 7bf220c /pci@80000000/mac-io@4/via-cuda@16000/rtc (rtc) 7bf23f4 /pci@80000000/mac-io@4/nvram@60000 (nvram) 7bf2614 /pci@80000000/mac-io@4/escc@13000 (escc) 7bf271c /pci@80000000/mac-io@4/escc@13000/ch-a@13020 (serial) 7bf29b4 /pci@80000000/mac-io@4/escc@13000/ch-b@13000 (serial) 7bf2c20 /pci@80000000/mac-io@4/ata-3@20000 (ata) ok /grackle@fec00000/ide@3/drive@1/disk@1 does not match /pci@80000000/pci-ata@3/ata-2@600/disk@1. I wonder where '@80000000' comes from. A dump of original g3beige device tree is here: http://penguinppc.org/historical/dev-trees-html/g3_beige_300.html But actually the tree generated by OpenBIOS looks more like g3bw one: http://penguinppc.org/historical/dev-trees-html/g3bw_400.html How can we get the names to be more compatible? At least s/grackle/pci/ is easy to do in QEMU, but which instance (QEMU or OpenBIOS) should handle pci-ata vs ide change? What should we do with ata-2@600 vs drive@1?

6 16

ppc64 boot issues
by Andreas Färber 13 Dec '10

13 Dec '10

Hello, With or without the pending ofmem patches, ppc64 boot currently hangs after "Trying cd:,\\:tbxi..." (before "Trying cd:,\ppc\chrp \bootfile.exe..."). Symptom is, 0x700 program exception vector (not 0xfff00700) is being called with SRR1 pointing to some address that's neither in the low vectors range nor in OpenBIOS itself apparently. I noticed that branching relatively to unexpected_excep from there is wrong and patched it to bctr there (which unfortunately appears to break 32-bit ppc64), but usually it does not manage to properly do the printk() Here's what I found out so far: * a breakpoint for bootinfo_loader_init() or so is not reached * The "Trying" comes from (encode-bootpath) in forth/debugging/client.fs * `debug (encode-bootpath) boot` does not return from open-dev * `debug open-dev` does not return from path-resolution * path-resolution gets called "endlessly" (5+ times single-stepping it), the hang occurred after successfully returning from some instance (after having successfully done so for a previous instance) Does anyone have a hunch what might be going wrong? Or tips how to further debug? Thanks, Andreas

3 4

[PATCH] forth: Pretty-print MMU translations property
by Andreas Färber 12 Dec '10

12 Dec '10

Display one MMU translation per row for .properties command. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- forth/admin/devices.fs | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/forth/admin/devices.fs b/forth/admin/devices.fs index 7a5b693..00b4f55 100644 --- a/forth/admin/devices.fs +++ b/forth/admin/devices.fs @@ -326,6 +326,30 @@ 3drop drop ; +\ Print the value of the MMU translations property +: .p-translations ( data len -- ) + 2dup + -rot ( data+len data len ) + >r >r [IFDEF] CONFIG_PPC + [IFDEF] CONFIG_PPC64 5 [ELSE] 4 [THEN] + [ELSE] + 3 + [THEN] 4 * dup ( data+len #bytes #bytes R: len data ) r> r> + bounds ( data+len #bytes #bytes data+len data ) ?do + 2dup <> if \ non-first byte in row + dup 3 and 0= if space then \ make numbers more readable + then + i c@ 2 0.r \ print byte + 1- dup 0= if \ end of row + 2 pick i 1+ > if \ non-last byte + cr \ start new line + d# 26 spaces \ indentation + then + drop dup \ update counter + then + loop + 2drop drop +; + \ This function hardwires data formats to particular node properties : (.property-by-name) ( name-str name-len data len -- ) 2over " reg" strcmp 0= if @@ -346,6 +370,10 @@ 1 1 2swap .p-reg 2drop exit then + 2over " translations" strcmp 0= if + .p-translations + 2drop exit + then then then then -- 1.7.3

3 11

[commit] r984 - trunk/openbios-devel/forth/admin
by repository service 12 Dec '10

12 Dec '10

Author: afaerber Date: Sun Dec 12 21:09:49 2010 New Revision: 984 URL: http://tracker.coreboot.org/trac/openbios/changeset/984 Log: forth: Fix MMU available pretty-printing for sparc64 On sparc64 a virtual address or size value is contained within one stack cell but that makes two property cells. The columns for the /virtual-memory "available" property thus looked wrong. Do read the number of cells from #address-cells but make sure the size is at least one to not break ppc. Cc: Tarl Neustaedter <tarl-b2(a)tarl.net> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Sun Dec 12 21:08:25 2010 (r983) +++ trunk/openbios-devel/forth/admin/devices.fs Sun Dec 12 21:09:49 2010 (r984) @@ -408,7 +408,7 @@ " mmu" rot get-package-property 0= if decode-int nip nip ihandle>phandle active-package = if 2over " available" strcmp 0= if - 1 1 2swap .p-reg + my-#acells my-#scells 1 max 2swap .p-reg 2drop exit then 2over " translations" strcmp 0= if

1 0

[commit] r983 - trunk/openbios-devel/forth/admin
by repository service 12 Dec '10

12 Dec '10

Author: afaerber Date: Sun Dec 12 21:08:25 2010 New Revision: 983 URL: http://tracker.coreboot.org/trac/openbios/changeset/983 Log: forth: Pretty-print MMU translations property Display one MMU translation per row for .properties command. Define a variable number of columns to handle platform specifics. v3: * Only ppc includes the physical address in the translations property. Simplify loop by reverting to decreasing column offsets. v2: * Define columns for spacing. Add helpers to facilitate this. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Sun Dec 12 14:44:18 2010 (r982) +++ trunk/openbios-devel/forth/admin/devices.fs Sun Dec 12 21:08:25 2010 (r983) @@ -326,6 +326,71 @@ 3drop drop ; +\ Return the number of cells per physical address +: .p-translations-#pacells ( -- #cells ) + " /" find-package if + " #address-cells" rot get-package-property if + 1 + else + decode-int nip nip 1 max + then + else + 1 + then +; + +\ Return the number of cells per translation entry +: .p-translations-#cells ( -- #cells ) + [IFDEF] CONFIG_PPC + my-#acells 3 * + .p-translations-#pacells + + [ELSE] + my-#acells 3 * + [THEN] +; + +\ Set up column offsets +: .p-translations-cols ( -- col1 ... coln #cols ) + .p-translations-#cells 4 * + [IFDEF] CONFIG_PPC + 4 - + dup 4 - + dup .p-translations-#pacells 4 * - + 3 + [ELSE] + my-#acells 4 * - + dup my-#scells 4 * - + 2 + [THEN] +; + +\ Print the value of the MMU translations property +: .p-translations ( data len -- ) + >r >r .p-translations-cols r> r> ( col1 ... coln #cols data len ) + 2dup + -rot ( col1 ... coln #cols data+len data len ) + >r >r .p-translations-#cells 4 * dup r> r> + ( col1 ... coln #cols data+len #bytes #bytes len data ) + bounds ( col1 ... coln #cols data+len #bytes #bytes data+len data ) ?do + 3 pick 4 + 4 ?do \ check all defined columns + i pick over = if + 2 spaces \ start new column + then + loop + 2dup <> if \ non-first byte in row + dup 3 and 0= if space then \ make numbers more readable + then + i c@ 2 0.r \ print byte + 1- dup 0= if \ end of row + 2 pick i 1+ > if \ non-last byte + cr \ start new line + d# 26 spaces \ indentation + then + drop dup \ update counter + then + loop + 2drop drop 0 ?do drop loop +; + \ This function hardwires data formats to particular node properties : (.property-by-name) ( name-str name-len data len -- ) 2over " reg" strcmp 0= if @@ -346,6 +411,10 @@ 1 1 2swap .p-reg 2drop exit then + 2over " translations" strcmp 0= if + .p-translations + 2drop exit + then then then then

1 0

[RFC] Switch OFMEM to use phys_addr_t for physical addresses
by Mark Cave-Ayland 12 Dec '10

12 Dec '10

Hi all, Here is my first attempt at switching over OFMEM to use phys_addr_t for physical addresses. It was mainly a case of going through all of the OFMEM APIs by hand and then updating the definitions used to hold physical addresses, along with swapping over range_t to use phys_addr_t on the assumption that sizeof(phys_addr_t) >= sizeof(ucell). Andreas - note I've not touched anything in ppc64 as I figure this is still experimental and I don't really have anything to test it with. This patch seems to work on my SPARC64/PPC tests here, but since it touches a core part of OpenBIOS I'd like to get a little more feedback before committing it. ATB, Mark. -- Mark Cave-Ayland - Senior Technical Architect PostgreSQL - PostGIS Sirius Corporation plc - control through freedom http://www.siriusit.co.uk t: +44 870 608 0063 Sirius Labs: http://www.siriusit.co.uk/labs

3 27

[commit] r982 - trunk/openbios-devel/arch/ppc/qemu
by repository service 12 Dec '10

12 Dec '10

Author: afaerber Date: Sun Dec 12 14:44:18 2010 New Revision: 982 URL: http://tracker.coreboot.org/trac/openbios/changeset/982 Log: ppc: Use unsigned long for effective addresses Adjust the special handling of ROM-to-RAM for ppc64. In particular this allows ISI and DSI exceptions to set up TLB entries for high addresses on ppc64. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 12 14:12:20 2010 (r981) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 12 14:44:18 2010 (r982) @@ -47,7 +47,7 @@ #define FREE_BASE 0x00004000UL #define OF_CODE_START 0xfff00000UL #define OF_CODE_SIZE 0x00100000 -#define IO_BASE 0x80000000 +#define IO_BASE 0x80000000UL #ifdef __powerpc64__ #define HASH_BITS 18 @@ -85,7 +85,7 @@ return FREE_BASE; } -static ucell get_heap_top(void) +static unsigned long get_heap_top(void) { return get_hash_base() - (32 + 64 + 64) * 1024; } @@ -217,11 +217,11 @@ /************************************************************************/ static phys_addr_t -ea_to_phys(ucell ea, ucell *mode) +ea_to_phys(unsigned long ea, ucell *mode) { phys_addr_t phys; - if (ea >= OF_CODE_START) { + if (ea >= OF_CODE_START && ea <= 0xffffffffUL) { /* ROM into RAM */ ea -= OF_CODE_START; phys = get_rom_base() + ea; @@ -242,7 +242,7 @@ } static void -hash_page_64(ucell ea, phys_addr_t phys, ucell mode) +hash_page_64(unsigned long ea, phys_addr_t phys, ucell mode) { static int next_grab_slot = 0; uint64_t vsid_mask, page_mask, pgidx, hash; @@ -308,7 +308,7 @@ } static void -hash_page_32(ucell ea, phys_addr_t phys, ucell mode) +hash_page_32(unsigned long ea, phys_addr_t phys, ucell mode) { #ifndef __powerpc64__ static int next_grab_slot = 0;

1 0

[commit] r981 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc64 include/libopenbios libopenbios
by repository service 12 Dec '10

12 Dec '10

Author: afaerber Date: Sun Dec 12 14:12:20 2010 New Revision: 981 URL: http://tracker.coreboot.org/trac/openbios/changeset/981 Log: ofmem: Use phys_addr_t for physical addresses Based on Mark's previous work, let ofmem handle addresses wider than one cell. This is based on the assumption that sizeof(phys_addr_t) >= sizeof(ucell). Affected are in particular sparc32 (36 bits) and ppc64 (64 bits). As a consequence, some range_t related code shared with virtual/effective addresses needed to be migrated, too. Since both address types are unsigned this should be okay. v4: * Coding style fixes and comments, as suggested by Mark. v3: * Rebased: Prefer FMT_plx for trace output. * Convert some more places to phys_addr_t to avoid breakage on ppc64. * Add helpers ofmem_arch_{get_physaddr_cellsize,encode_physaddr}(), requested by Mark. v2: * Use FMT_physaddr_t in ofmem trace code. (by Mark) Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/sparc64/lib.c trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Dec 12 14:12:20 2010 (r981) @@ -120,7 +120,7 @@ /* kill page mappings in provided range */ } -void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) +void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { /* none yet */ } @@ -131,10 +131,29 @@ return NULL; } +int ofmem_arch_get_physaddr_cellsize(void) +{ +#ifdef CONFIG_PPC64 + return 2; +#else + return 1; +#endif +} + +int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value) +{ + int n = 0; +#ifdef CONFIG_PPC64 + p[n++] = value >> 32; +#endif + p[n++] = value; + return n; +} + /* Return size of a single MMU package translation property entry in cells */ int ofmem_arch_get_translation_entry_size(void) { - return 4; + return 3 + ofmem_arch_get_physaddr_cellsize(); } /* Generate translation property entry for PPC. @@ -149,10 +168,12 @@ */ void ofmem_arch_create_translation_entry(ucell *transentry, translation_t *t) { - transentry[0] = t->virt; - transentry[1] = t->size; - transentry[2] = t->phys; - transentry[3] = t->mode; + int i = 0; + + transentry[i++] = t->virt; + transentry[i++] = t->size; + i += ofmem_arch_encode_physaddr(&transentry[i], t->phys); + transentry[i++] = t->mode; } /************************************************************************/ @@ -182,7 +203,7 @@ /* misc */ /************************************************************************/ -ucell ofmem_arch_default_translation_mode(ucell phys) +ucell ofmem_arch_default_translation_mode(phys_addr_t phys) { /* XXX: Guard bit not set as it should! */ if (phys < IO_BASE) @@ -195,10 +216,10 @@ /* page fault handler */ /************************************************************************/ -static ucell +static phys_addr_t ea_to_phys(ucell ea, ucell *mode) { - ucell phys; + phys_addr_t phys; if (ea >= OF_CODE_START) { /* ROM into RAM */ @@ -221,7 +242,7 @@ } static void -hash_page_64(ucell ea, ucell phys, ucell mode) +hash_page_64(ucell ea, phys_addr_t phys, ucell mode) { static int next_grab_slot = 0; uint64_t vsid_mask, page_mask, pgidx, hash; @@ -270,7 +291,7 @@ .h = 0, .v = 1, - .rpn = (phys & ~0xfff) >> 12, + .rpn = (phys & ~0xfffUL) >> 12, .r = mode & (1 << 8) ? 1 : 0, .c = mode & (1 << 7) ? 1 : 0, .w = mode & (1 << 6) ? 1 : 0, @@ -287,7 +308,7 @@ } static void -hash_page_32(ucell ea, ucell phys, ucell mode) +hash_page_32(ucell ea, phys_addr_t phys, ucell mode) { #ifndef __powerpc64__ static int next_grab_slot = 0; @@ -341,7 +362,7 @@ } /* XXX Remove these ugly constructs when legacy 64-bit support is dropped. */ -static void hash_page(unsigned long ea, unsigned long phys, ucell mode) +static void hash_page(unsigned long ea, phys_addr_t phys, ucell mode) { if (is_ppc64()) hash_page_64(ea, phys, mode); @@ -354,7 +375,7 @@ { unsigned long dar, dsisr; ucell mode; - ucell phys; + phys_addr_t phys; asm volatile("mfdar %0" : "=r" (dar) : ); asm volatile("mfdsisr %0" : "=r" (dsisr) : ); @@ -368,7 +389,7 @@ { unsigned long nip, srr1; ucell mode; - ucell phys; + phys_addr_t phys; asm volatile("mfsrr0 %0" : "=r" (nip) : ); asm volatile("mfsrr1 %0" : "=r" (srr1) : ); Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Dec 12 14:12:20 2010 (r981) @@ -120,7 +120,8 @@ static void mmu_translate(void) { - ucell virt, phys, mode; + ucell virt, mode; + phys_addr_t phys; virt = POP(); @@ -352,7 +353,7 @@ } static void -map_pages(unsigned long phys, unsigned long virt, +map_pages(phys_addr_t phys, unsigned long virt, unsigned long size, unsigned long mode) { unsigned long tte_data, currsize; @@ -393,7 +394,7 @@ } } -void ofmem_map_pages(ucell phys, ucell virt, ucell size, ucell mode) +void ofmem_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { return map_pages(phys, virt, size, mode); } @@ -405,7 +406,8 @@ static void mmu_map(void) { - ucell virt, size, mode, phys; + ucell virt, size, mode; + phys_addr_t phys; mode = POP(); size = POP(); @@ -453,7 +455,7 @@ unmap_pages(virt, size); } -void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, ucell mode) +void ofmem_arch_early_map_pages(phys_addr_t phys, ucell virt, ucell size, ucell mode) { if (mode & SPITFIRE_TTE_LOCKED) { // install locked tlb entries now @@ -514,7 +516,8 @@ static void mem_claim( void ) { - ucell phys=-1UL, size, align; + ucell size, align; + phys_addr_t phys=-1UL; align = POP(); size = POP(); @@ -534,7 +537,8 @@ static void mem_release( void ) { - ucell phys, size; + phys_addr_t phys; + ucell size; size = POP(); phys = POP(); @@ -548,7 +552,8 @@ static void mem_retain ( void ) { - ucell phys=-1UL, size, align; + ucell size, align; + phys_addr_t phys=-1UL; align = POP(); size = POP(); Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun Dec 12 14:12:20 2010 (r981) @@ -95,7 +95,18 @@ /* misc */ /************************************************************************/ -ucell ofmem_arch_default_translation_mode( ucell phys ) +int ofmem_arch_get_physaddr_cellsize(void) +{ + return 1; +} + +int ofmem_arch_encode_physaddr(ucell *p, phys_addr_t value) +{ + p[0] = value; + return 1; +} + +ucell ofmem_arch_default_translation_mode( phys_addr_t phys ) { /* Writable, cacheable */ /* not privileged and not locked */ @@ -109,7 +120,7 @@ /* init / cleanup */ /************************************************************************/ -static int remap_page_range( ucell phys, ucell virt, ucell size, ucell mode ) +static int remap_page_range( phys_addr_t phys, ucell virt, ucell size, ucell mode ) { ofmem_claim_phys(phys, size, 0); ofmem_claim_virt(virt, size, 0); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Dec 12 14:12:20 2010 (r981) @@ -26,7 +26,7 @@ typedef struct mem_range { struct mem_range *next; - ucell start; + phys_addr_t start; /* sizeof(phys) >= sizeof(virt), e.g SPARC32 */ ucell size; } range_t; @@ -34,7 +34,7 @@ struct trans *next; ucell virt; /* chain is sorted by virt */ ucell size; - ucell phys; + phys_addr_t phys; ucell mode; } translation_t; @@ -63,14 +63,16 @@ extern ucell ofmem_arch_get_heap_top(void); extern ucell ofmem_arch_get_virt_top(void); extern retain_t* ofmem_arch_get_retained(void); +extern int ofmem_arch_get_physaddr_cellsize(void); +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( ucell phys ); -extern void ofmem_arch_early_map_pages(ucell phys, ucell virt, ucell size, +extern ucell ofmem_arch_default_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); /* sparc64 uses this method */ -extern int ofmem_map_page_range( ucell phys, ucell virt, ucell size, +extern int ofmem_map_page_range( phys_addr_t phys, ucell virt, ucell size, ucell mode ); /* malloc interface */ @@ -93,18 +95,18 @@ extern void ofmem_register( phandle_t ph_memory, phandle_t ph_mmu ); extern ucell ofmem_claim( ucell addr, ucell size, ucell align ); -extern ucell ofmem_claim_phys( ucell mphys, 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_retain( ucell phys, ucell size, ucell align ); +extern phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ); -extern int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); +extern int ofmem_map( phys_addr_t phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); extern void ofmem_release( ucell virt, ucell size ); -extern void ofmem_release_phys( ucell phys, ucell size ); +extern void ofmem_release_phys( phys_addr_t phys, ucell size ); extern void ofmem_release_virt( ucell virt, ucell size ); -extern ucell ofmem_translate( ucell virt, ucell *ret_mode ); +extern phys_addr_t ofmem_translate( ucell virt, ucell *ret_mode ); #ifdef CONFIG_PPC #define PAGE_SHIFT 12 Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Dec 5 15:16:13 2010 (r980) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Dec 12 14:12:20 2010 (r981) @@ -49,7 +49,7 @@ { printk("--- Range %s ---\n", str ); for( ; r; r=r->next ) - printk("%08lx - %08lx\n", r->start, r->start + r->size -1 ); + printk(FMT_plx " - " FMT_plx "\n", r->start, r->start + r->size - 1); printk("\n"); } @@ -72,7 +72,7 @@ printk("--- Translations ---\n"); for( ; t; t=t->next ) - printk("%08lx -> %08lx [size %lx]\n", t->virt, t->phys, t->size ); + printk("%08lx -> " FMT_plx " [size %lx]\n", t->virt, t->phys, t->size); printk("\n"); } #endif @@ -246,8 +246,8 @@ { range_t *r; int ncells, prop_used, prop_size; - - ucell start, size, *prop; + phys_addr_t start; + ucell size, *prop; if (s_phandle_memory == 0) return; @@ -256,8 +256,10 @@ for( r = range, ncells = 0; r ; r=r->next, ncells++ ) { } - /* inverse of phys_range list could take 2 more cells for the tail */ - prop_used = (ncells+1) * sizeof(ucell) * 2; + /* 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); if (prop_used > *mem_prop_size) { @@ -291,7 +293,13 @@ size = r->start - start; if (size) { - prop[ncells++] = start; + 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; } start = r->start + r->size; @@ -299,7 +307,13 @@ /* tail */ if (start < top_address) { - prop[ncells++] = start; + 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; } @@ -323,7 +337,7 @@ /* client interface */ /************************************************************************/ -static int is_free( ucell ea, ucell size, range_t *r ) +static int is_free( phys_addr_t ea, ucell size, range_t *r ) { if( size == 0 ) return 1; @@ -336,7 +350,7 @@ return 1; } -static void add_entry_( ucell ea, ucell size, range_t **r ) +static void add_entry_( phys_addr_t ea, ucell size, range_t **r ) { range_t *nr; @@ -350,7 +364,7 @@ *r = nr; } -static int add_entry( ucell ea, ucell size, range_t **r ) +static int add_entry( phys_addr_t ea, ucell size, range_t **r ) { if( !is_free( ea, size, *r ) ) { OFMEM_TRACE("add_entry: range not free!\n"); @@ -380,7 +394,7 @@ } } -static void fill_range( ucell ea, ucell size, range_t **rr ) +static void fill_range( phys_addr_t ea, ucell size, range_t **rr ) { add_entry_( ea, size, rr ); join_ranges( rr ); @@ -388,9 +402,9 @@ #endif static ucell find_area( ucell align, ucell size, range_t *r, - ucell min, ucell max, int reverse ) + phys_addr_t min, phys_addr_t max, int reverse ) { - ucell base = min; + phys_addr_t base = min; range_t *r2; if( (align & (align-1)) ) { @@ -438,7 +452,7 @@ return -1; } -static ucell ofmem_claim_phys_( ucell phys, ucell size, ucell align, +static phys_addr_t ofmem_claim_phys_( phys_addr_t phys, ucell size, ucell align, ucell min, ucell max, int reverse ) { ofmem_t *ofmem = ofmem_arch_get_private(); @@ -463,9 +477,9 @@ } /* if align != 0, phys is ignored. Returns -1 on error */ -ucell ofmem_claim_phys( ucell phys, ucell size, ucell align ) +phys_addr_t ofmem_claim_phys( phys_addr_t phys, ucell size, ucell align ) { - OFMEM_TRACE("ofmem_claim phys=" FMT_ucellx " size=" FMT_ucellx + OFMEM_TRACE("ofmem_claim phys=" FMT_plx " size=" FMT_ucellx " align=" FMT_ucellx "\n", phys, size, align); @@ -506,12 +520,12 @@ } /* if align != 0, phys is ignored. Returns -1 on error */ -ucell ofmem_retain( ucell phys, ucell size, ucell align ) +phys_addr_t ofmem_retain( phys_addr_t phys, ucell size, ucell align ) { retain_t *retained = ofmem_arch_get_retained(); - ucell retain_phys; + phys_addr_t retain_phys; - OFMEM_TRACE("ofmem_retain phys=" FMT_ucellx " size=" FMT_ucellx + OFMEM_TRACE("ofmem_retain phys=" FMT_plx " size=" FMT_ucellx " align=" FMT_ucellx "\n", phys, size, align); @@ -530,7 +544,8 @@ ucell ofmem_claim( ucell addr, ucell size, ucell align ) { ofmem_t *ofmem = ofmem_arch_get_private(); - ucell virt, phys; + ucell virt; + phys_addr_t phys; ucell offs = addr & 0xfff; OFMEM_TRACE("ofmem_claim " FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", addr, size, align ); @@ -595,13 +610,13 @@ } } -int ofmem_map_page_range( ucell phys, ucell virt, ucell size, ucell mode ) +int ofmem_map_page_range( phys_addr_t phys, ucell virt, ucell size, ucell mode ) { ofmem_t *ofmem = ofmem_arch_get_private(); translation_t *t, **tt; OFMEM_TRACE("ofmem_map_page_range " FMT_ucellx - " -> " FMT_ucellx " " FMT_ucellx " mode " FMT_ucellx "\n", + " -> " FMT_plx " " FMT_ucellx " mode " FMT_ucellx "\n", virt, phys, size, mode ); split_trans( virt ); @@ -677,7 +692,7 @@ *plinkentry = t->next; OFMEM_TRACE("unmap_page_range found " - FMT_ucellx " -> " FMT_ucellx " " FMT_ucellx + FMT_ucellx " -> " FMT_plx " " FMT_ucellx " mode " FMT_ucellx "\n", t->virt, t->phys, t->size, t->mode ); @@ -693,7 +708,7 @@ return 0; } -int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ) +int ofmem_map( phys_addr_t phys, ucell virt, ucell size, ucell mode ) { /* printk("+ofmem_map: %08lX --> %08lX (size %08lX, mode 0x%02X)\n", virt, phys, size, mode ); */ @@ -701,7 +716,7 @@ if( (phys & 0xfff) || (virt & 0xfff) || (size & 0xfff) ) { OFMEM_TRACE("ofmem_map: Bad parameters (" - FMT_ucellX " " FMT_ucellX " " FMT_ucellX ")\n", + FMT_plx " " FMT_ucellX " " FMT_ucellX ")\n", phys, virt, size ); phys &= ~0xfff; @@ -751,7 +766,7 @@ } /* virtual -> physical. */ -ucell ofmem_translate( ucell virt, ucell *mode ) +phys_addr_t ofmem_translate( ucell virt, ucell *mode ) { ofmem_t *ofmem = ofmem_arch_get_private(); translation_t *t; @@ -776,9 +791,9 @@ } /* release memory allocated by ofmem_claim_phys */ -void ofmem_release_phys( ucell phys, ucell size ) +void ofmem_release_phys( phys_addr_t phys, ucell size ) { - OFMEM_TRACE("ofmem_release_phys addr=" FMT_ucellx " size=" FMT_ucellx "\n", + OFMEM_TRACE("ofmem_release_phys addr=" FMT_plx " size=" FMT_ucellx "\n", phys, size); ofmem_t *ofmem = ofmem_arch_get_private(); @@ -802,8 +817,8 @@ __func__, virt, size); ucell mode; - ucell phys = ofmem_translate(virt, &mode); - if (phys == (ucell)-1) { + phys_addr_t phys = ofmem_translate(virt, &mode); + if (phys == (phys_addr_t)-1) { OFMEM_TRACE("%s: no mapping\n", __func__); return; }

1 0

[PATCH] Zero-pad byte properties
by Andreas Färber 06 Dec '10

06 Dec '10

.properties before: someproperty -- 3 : 1 42 3 Now: someproperty -- 3 : 01 42 03 Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- forth/admin/devices.fs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/forth/admin/devices.fs b/forth/admin/devices.fs index e24c6da..dbb4646 100644 --- a/forth/admin/devices.fs +++ b/forth/admin/devices.fs @@ -283,7 +283,7 @@ dup r@ + c@ ( len n ch ) - pocket tohexstr type ." " + pocket tohexstr dup 2 <> if ." 0" then type ." " 1+ repeat 2drop r> drop 1 -- 1.7.3

5 52