OpenBIOS May 2010

openbios@openbios.org

15 participants
48 discussions

[commit] r770 - trunk/openbios-devel/arch/sparc64
by repository service 03 May '10

03 May '10

Author: mcayland Date: Mon May 3 08:56:57 2010 New Revision: 770 URL: http://tracker.coreboot.org/trac/openbios/changeset/770 Log: Fix missing parentheses from r766. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 01:00:21 2010 (r769) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Mon May 3 08:56:57 2010 (r770) @@ -103,7 +103,7 @@ retain_t *retained = (retain_t *)RETAIN_OFMEM; /* Clear all memory except any retained areas */ - if (!retained->magic == RETAIN_MAGIC) { + if (!(retained->magic == RETAIN_MAGIC)) { memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); s_ofmem_data.ofmem.ramsize = qemu_mem_size;

1 0

[commit] r769 - trunk/openbios-devel/arch/sparc64
by repository service 03 May '10

03 May '10

Author: mcayland Date: Mon May 3 01:00:21 2010 New Revision: 769 URL: http://tracker.coreboot.org/trac/openbios/changeset/769 Log: Create extra CPU properties required by OpenSolaris kernel. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/openbios.c Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun May 2 22:08:43 2010 (r768) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon May 3 01:00:21 2010 (r769) @@ -78,6 +78,17 @@ struct cpudef { unsigned long iu_version; const char *name; + unsigned long ecache_associativity; + unsigned long ecache_line_size; + unsigned long ecache_size; + unsigned long num_dtlb_entries; + unsigned long dcache_associativity; + unsigned long dcache_line_size; + unsigned long dcache_size; + unsigned long num_itlb_entries; + unsigned long icache_associativity; + unsigned long icache_line_size; + unsigned long icache_size; }; /* @@ -157,6 +168,61 @@ push_str("clock-frequency"); fword("property"); + PUSH(cpu->ecache_associativity); + fword("encode-int"); + push_str("ecache-associativity"); + fword("property"); + + PUSH(cpu->ecache_line_size); + fword("encode-int"); + push_str("ecache-line-size"); + fword("property"); + + PUSH(cpu->ecache_size); + fword("encode-int"); + push_str("ecache-size"); + fword("property"); + + PUSH(cpu->dcache_associativity); + fword("encode-int"); + push_str("dcache-associativity"); + fword("property"); + + PUSH(cpu->dcache_line_size); + fword("encode-int"); + push_str("dcache-line-size"); + fword("property"); + + PUSH(cpu->dcache_size); + fword("encode-int"); + push_str("dcache-size"); + fword("property"); + + PUSH(cpu->icache_associativity); + fword("encode-int"); + push_str("icache-associativity"); + fword("property"); + + PUSH(cpu->ecache_line_size); + fword("encode-int"); + push_str("icache-line-size"); + fword("property"); + + PUSH(cpu->ecache_size); + fword("encode-int"); + push_str("icache-size"); + fword("property"); + + PUSH(cpu->num_itlb_entries); + fword("encode-int"); + push_str("#itlb-entries"); + fword("property"); + + PUSH(cpu->num_dtlb_entries); + fword("encode-int"); + push_str("#dtlb-entries"); + fword("property"); + fword("finish-device"); // Trap table @@ -190,14 +256,26 @@ { .iu_version = (0x17ULL << 48) | (0x10ULL << 32), .name = "SUNW,UltraSPARC", + .ecache_associativity = 1, .ecache_line_size = 0x40, .ecache_size = 0x100000, + .dcache_associativity = 1, .dcache_line_size = 0x20, .dcache_size = 0x4000, + .icache_associativity = 2, .icache_line_size = 0x20, .icache_size = 0x4000, + .num_dtlb_entries = 0x40, .num_itlb_entries = 0x40, }, { .iu_version = (0x17ULL << 48) | (0x11ULL << 32), .name = "SUNW,UltraSPARC-II", + .ecache_associativity = 1, .ecache_line_size = 0x40, .ecache_size = 0x100000, + .dcache_associativity = 1, .dcache_line_size = 0x20, .dcache_size = 0x4000, + .icache_associativity = 2, .icache_line_size = 0x20, .icache_size = 0x4000, + .num_dtlb_entries = 0x40, .num_itlb_entries = 0x40, }, { .iu_version = (0x17ULL << 48) | (0x12ULL << 32), .name = "SUNW,UltraSPARC-IIi", + .ecache_associativity = 1, .ecache_line_size = 0x40, .ecache_size = 0x40000, + .dcache_associativity = 1, .dcache_line_size = 0x20, .dcache_size = 0x4000, + .icache_associativity = 2, .icache_line_size = 0x20, .icache_size = 0x4000, + .num_dtlb_entries = 0x40, .num_itlb_entries = 0x40, }, { .iu_version = (0x17ULL << 48) | (0x13ULL << 32),

1 0

[commit] r768 - in trunk/openbios-devel: arch/sparc64 drivers
by repository service 02 May '10

02 May '10

Author: blueswirl Date: Sun May 2 22:08:43 2010 New Revision: 768 URL: http://tracker.coreboot.org/trac/openbios/changeset/768 Log: Sparc64: add upa-portid properties Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun May 2 22:01:34 2010 (r767) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun May 2 22:08:43 2010 (r768) @@ -147,6 +147,11 @@ push_str("cpuid"); fword("property"); + PUSH(0); + fword("encode-int"); + push_str("upa-portid"); + fword("property"); + PUSH(clock_frequency); fword("encode-int"); push_str("clock-frequency"); Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Sun May 2 22:01:34 2010 (r767) +++ trunk/openbios-devel/drivers/pci.c Sun May 2 22:08:43 2010 (r768) @@ -446,6 +446,8 @@ props[2] = 0x000007ef; props[3] = 0x000007e5; set_property(dev, "interrupts", (char *)props, 4 * sizeof(props[0])); + props[0] = 0x0000001f; + set_property(dev, "upa-portid", (char *)props, 1 * sizeof(props[0])); return 0; }

3 2

[commit] r767 - trunk/openbios-devel/arch/sparc64
by repository service 02 May '10

02 May '10

Author: blueswirl Date: Sun May 2 22:01:34 2010 New Revision: 767 URL: http://tracker.coreboot.org/trac/openbios/changeset/767 Log: Sparc64: fix reset The zeroth I/D TLB entries weren't cleared. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S Modified: trunk/openbios-devel/arch/sparc64/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S Sun May 2 21:26:29 2010 (r766) +++ trunk/openbios-devel/arch/sparc64/entry.S Sun May 2 22:01:34 2010 (r767) @@ -85,14 +85,14 @@ mov 63 << 3, %g1 1: stxa %g0, [%g1] ASI_ITLB_DATA_ACCESS subcc %g1, 1 << 3, %g1 - bne 1b + bpos 1b nop ! Clear DTLB mov 63 << 3, %g1 1: stxa %g0, [%g1] ASI_DTLB_DATA_ACCESS subcc %g1, 1 << 3, %g1 - bne 1b + bpos 1b nop ! Get memory size from configuration device

1 0

[commit] r766 - in trunk/openbios-devel: arch/sparc64 include/libopenbios libopenbios
by repository service 02 May '10

02 May '10

Author: mcayland Date: Sun May 2 21:26:29 2010 New Revision: 766 URL: http://tracker.coreboot.org/trac/openbios/changeset/766 Log: Commit partial implementation of SUNW,retain for SPARC64 based upon the existing physical allocation routines. I've been unable to finish the code and test retention after a restart since the OpenBIOS words reset and reset-all don't seem to work at the moment. However, it enables OpenSolaris boot to get further in the meantime. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: 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/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun May 2 21:26:29 2010 (r766) @@ -394,11 +394,35 @@ ofmem_release_phys(phys, size); } +/* ( name-cstr phys size align --- phys ) */ +static void +mem_retain ( void ) +{ + ucell phys=-1UL, size, align; + + align = POP(); + size = POP(); + if (!align) { + phys = POP(); + phys <<= 32; + phys |= POP(); + } + + /* Currently do nothing with the name */ + POP(); + + phys = ofmem_retain(phys, size, align); + + PUSH(phys & 0xffffffffUL); + PUSH(phys >> 32); +} + DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); NODE_METHODS( memory ) = { { "claim", mem_claim }, { "release", mem_release }, + { "SUNW,retain", mem_retain }, }; DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sun May 2 21:26:29 2010 (r766) @@ -26,19 +26,19 @@ ofmem_t ofmem; } s_ofmem_data; -#define OFMEM (&s_ofmem_data.ofmem) -#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) +#define OFMEM (&s_ofmem_data.ofmem) +#define TOP_OF_RAM (s_ofmem_data.memory + MEMSIZE) translation_t **g_ofmem_translations = &s_ofmem_data.ofmem.trans; -static ucell get_heap_top( void ) +static inline size_t ALIGN_SIZE(size_t x, size_t a) { - return (ucell)TOP_OF_RAM; + return (x + a - 1) & ~(a-1); } -static inline size_t ALIGN_SIZE(size_t x, size_t a) +static ucell get_heap_top( void ) { - return (x + a - 1) & ~(a-1); + return (ucell)(TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)); } ofmem_t* ofmem_arch_get_private(void) @@ -95,10 +95,27 @@ return 0; } +#define RETAIN_OFMEM (TOP_OF_RAM - ALIGN_SIZE(sizeof(retain_t), 8)) +#define RETAIN_MAGIC 0x1100220033004400 + void ofmem_init( void ) { - memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); - s_ofmem_data.ofmem.ramsize = qemu_mem_size; + retain_t *retained = (retain_t *)RETAIN_OFMEM; + + /* Clear all memory except any retained areas */ + if (!retained->magic == RETAIN_MAGIC) { + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + + retained->magic = RETAIN_MAGIC; + } else { + /* TODO: walk retain_phys_range and add entries to phys_range to prevent + them being reused */ + OFMEM_TRACE("ofmem_init has detected retained magic but currently not implemented"); + + memset(&s_ofmem_data, 0, sizeof(s_ofmem_data)); + s_ofmem_data.ofmem.ramsize = qemu_mem_size; + } /* inherit translations set up by entry.S */ ofmem_walk_boot_map(remap_page_range); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun May 2 21:26:29 2010 (r766) @@ -46,10 +46,17 @@ range_t *phys_range; range_t *virt_range; + range_t *retain_phys_range; /* physical memory that should survive a warm reset */ translation_t *trans; /* this is really a translation_t */ } ofmem_t; +/* structure for retained data at the top of the heap */ +typedef struct { + ucell magic; + range_t *retain_phys_range; +} retain_t; + /* TODO: temporary migration interface */ extern ofmem_t* ofmem_arch_get_private(void); extern void* ofmem_arch_get_malloc_base(void); @@ -86,6 +93,8 @@ extern ucell ofmem_claim_phys( ucell 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 int ofmem_map( ucell phys, ucell virt, ucell size, ucell mode ); extern int ofmem_unmap( ucell virt, ucell size ); Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sat May 1 14:13:16 2010 (r765) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun May 2 21:26:29 2010 (r766) @@ -449,6 +449,23 @@ get_ram_size(), ofmem_arch_get_virt_top(), 0 ); } +/* if align != 0, phys is ignored. Returns -1 on error */ +ucell ofmem_retain( ucell phys, ucell size, ucell align ) +{ + ofmem_t *ofmem = ofmem_arch_get_private(); + ucell retain_phys; + + OFMEM_TRACE("ofmem_retain phys=" FMT_ucellx " size=" FMT_ucellx + " align=" FMT_ucellx "\n", + phys, size, align); + + retain_phys = ofmem_claim_phys_( phys, size, align, 0, get_ram_size(), 0 ); + + /* Also add to the retain_phys_range list */ + add_entry( phys, size, &ofmem->retain_phys_range ); + + return retain_phys; +} /* allocate both physical and virtual space and add a translation */ ucell ofmem_claim( ucell addr, ucell size, ucell align )

1 0

/packages/elf-loader is missing
by Andreas Färber 01 May '10

01 May '10

... is the message I get from QEMU's official ppc OpenBIOS blob. sparc and sparc64 blobs work better. Probably the ppc blob just needs updating. My cross-compilation is still running to confirm whether HEAD works better. Some notes: binutils 2.20.1 and 2.20 do not compile on Mac OS X v10.6. They error about lots of _("...") format strings that Ubuntu (gcc 4.4.1) just warns about. OSX default gcc is 4.2.1; CC=gcc-4.0 leads to /usr/lib/iconv.la not found during linking instead. Andreas

6 22

[commit] r765 - trunk/openbios-devel/forth/device
by repository service 01 May '10

01 May '10

Author: mcayland Date: Sat May 1 14:13:16 2010 New Revision: 765 URL: http://tracker.coreboot.org/trac/openbios/changeset/765 Log: Demote the 'byte-load: stack overflow' message so that it only appears when fcode-debug? is set to true. This is because the stack is automatically corrected anyway, and is triggered by a bug in older versions of the OpenSolaris boot blocks. See the following for more information: http://src.opensolaris.org/source/history/onnv/onnv-gate/usr/src/psm/stand/… (rev 9941:eb1c075cb0e4) http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6803195 Anyone developing new Fcode under OpenBIOS is extremely likely to want fcode-debug? enabled during development, so this seems like a reasonable compromise. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/device/feval.fs Modified: trunk/openbios-devel/forth/device/feval.fs ============================================================================== --- trunk/openbios-devel/forth/device/feval.fs Sat May 1 11:48:57 2010 (r764) +++ trunk/openbios-devel/forth/device/feval.fs Sat May 1 14:13:16 2010 (r765) @@ -76,8 +76,10 @@ cr ." byte-load: exception caught!" cr then - depth r@ <> if - cr ." byte-load: stack overflow, diff " depth r@ - . cr + s" fcode-debug?" evaluate if + depth r@ <> if + cr ." byte-load: warning stack overflow, diff " depth r@ - . cr + then then r> depth! 3drop 3drop

1 0

[commit] r764 - trunk/openbios-devel/libc
by repository service 01 May '10

01 May '10

Author: mcayland Date: Sat May 1 11:48:57 2010 New Revision: 764 URL: http://tracker.coreboot.org/trac/openbios/changeset/764 Log: Add checks to the read_io, seek_io and close_io routines to ensure that they do not perform any actions if an invalid file handle (-1) is passed. This resolves the issue with extra arguments being left on the Forth stack when an invalid device access is attempted. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libc/diskio.c Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Fri Apr 30 23:56:29 2010 (r763) +++ trunk/openbios-devel/libc/diskio.c Sat May 1 11:48:57 2010 (r764) @@ -164,27 +164,40 @@ int read_io( int fd, void *buf, size_t cnt ) { - priv_fd_t *fdp = file_descriptors[fd]; + priv_fd_t *fdp; ucell ret; - PUSH( (ucell)buf ); - PUSH( cnt ); - call_package( fdp->read_xt, fdp->ih ); - ret = POP(); + if (fd != -1) { + fdp = file_descriptors[fd]; - if( !ret && cnt ) + PUSH( (ucell)buf ); + PUSH( cnt ); + call_package( fdp->read_xt, fdp->ih ); + ret = POP(); + + if( !ret && cnt ) + ret = -1; + } else { ret = -1; + } + return ret; } int seek_io( int fd, llong offs ) { - priv_fd_t *fdp = file_descriptors[fd]; + priv_fd_t *fdp; - DPUSH( offs ); - call_package( fdp->seek_xt, fdp->ih ); - return ((((cell)POP()) >= 0)? 0 : -1); + if (fd != -1) { + fdp = file_descriptors[fd]; + + DPUSH( offs ); + call_package( fdp->seek_xt, fdp->ih ); + return ((((cell)POP()) >= 0)? 0 : -1); + } else { + return -1; + } } llong @@ -203,13 +216,17 @@ int close_io( int fd ) { - priv_fd_t *fdp = file_descriptors[fd]; + priv_fd_t *fdp; + + if (fd != -1) { + fdp = file_descriptors[fd]; - if( fdp->do_close ) - close_dev( fdp->ih ); - free( fdp ); + if( fdp->do_close ) + close_dev( fdp->ih ); + free( fdp ); - file_descriptors[fd]=NULL; + file_descriptors[fd]=NULL; + } return 0; }

1 0