OpenBIOS February 2014

openbios@openbios.org

5 participants
26 discussions

[commit] r1262 - trunk/openbios-devel/arch/sparc32
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:25 2014 New Revision: 1262 URL: http://tracker.coreboot.org/trac/openbios/changeset/1262 Log: SPARC32: fixup psr.h header file for subsequent use Soon we will need to use the get_psr() and put_psr() functions, however the header file needs some tidying up first. Here the extern C functions are redeclared as static inline functions, and the __ASSEMBLY macro correctly set across the relevant .S files to allow compilation to succeed as normal. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/call-romvec.S trunk/openbios-devel/arch/sparc32/entry.S trunk/openbios-devel/arch/sparc32/psr.h trunk/openbios-devel/arch/sparc32/switch.S Modified: trunk/openbios-devel/arch/sparc32/call-romvec.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/call-romvec.S Sun Feb 16 17:26:19 2014 (r1261) +++ trunk/openbios-devel/arch/sparc32/call-romvec.S Sun Feb 16 17:26:25 2014 (r1262) @@ -1,3 +1,4 @@ +#define __ASSEMBLY #include "psr.h" #include "asm/asi.h" Modified: trunk/openbios-devel/arch/sparc32/entry.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/entry.S Sun Feb 16 17:26:19 2014 (r1261) +++ trunk/openbios-devel/arch/sparc32/entry.S Sun Feb 16 17:26:25 2014 (r1262) @@ -7,6 +7,7 @@ * $Id: head.S,v 1.12 2002/07/23 05:47:09 zaitcev Exp $ */ +#define __ASSEMBLY #include "psr.h" #include "asm/asi.h" #include "asm/crs.h" Modified: trunk/openbios-devel/arch/sparc32/psr.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/psr.h Sun Feb 16 17:26:19 2014 (r1261) +++ trunk/openbios-devel/arch/sparc32/psr.h Sun Feb 16 17:26:25 2014 (r1262) @@ -34,11 +34,9 @@ #define PSR_VERS 0x0f000000 /* cpu-version field */ #define PSR_IMPL 0xf0000000 /* cpu-implementation field */ -#ifdef __KERNEL__ - -#ifndef __ASSEMBLY__ +#ifndef __ASSEMBLY /* Get the %psr register. */ -extern __inline__ unsigned int get_psr(void) +static __inline__ unsigned int get_psr(void) { unsigned int psr; __asm__ __volatile__( @@ -53,7 +51,7 @@ return psr; } -extern __inline__ void put_psr(unsigned int new_psr) +static __inline__ void put_psr(unsigned int new_psr) { __asm__ __volatile__( "wr %0, 0x0, %%psr\n\t" @@ -70,9 +68,9 @@ * incur a trap. */ -extern unsigned int fsr_storage; +static unsigned int fsr_storage; -extern __inline__ unsigned int get_fsr(void) +static __inline__ unsigned int get_fsr(void) { unsigned int fsr = 0; @@ -87,6 +85,4 @@ #endif /* !(__ASSEMBLY__) */ -#endif /* (__KERNEL__) */ - #endif /* !(__LINUX_SPARC_PSR_H) */ Modified: trunk/openbios-devel/arch/sparc32/switch.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/switch.S Sun Feb 16 17:26:19 2014 (r1261) +++ trunk/openbios-devel/arch/sparc32/switch.S Sun Feb 16 17:26:25 2014 (r1262) @@ -1,3 +1,4 @@ +#define __ASSEMBLY #include "psr.h" #include "asm/asi.h" #define ASI_BP ASI_M_BYPASS

1 0

[commit] r1261 - in trunk/openbios-devel: arch/sparc32 drivers include/drivers
by repository service 16 Feb '14

16 Feb '14

Author: mcayland Date: Sun Feb 16 17:26:19 2014 New Revision: 1261 URL: http://tracker.coreboot.org/trac/openbios/changeset/1261 Log: SPARC32: properly handle SS-5, SS-10 and SS-20 timers/interrupts SparcStation 5 has 1 timer and 1 per-cpu interrupt controller. SparcStation 10/20 has 4 timers and 4 per-cpu interrupt controllers, independently from the number of CPUs installed. Timer and interrupt controller properties are set accordingly. This is what Sun's OpenBOOT does and having only 1 timer/interrupt declared on SS5 is necessary for NextSTEP. Signed-off-by: Olivier Danet <odanet(a)caramail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Fri Feb 7 19:12:41 2014 (r1260) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Feb 16 17:26:19 2014 (r1261) @@ -41,6 +41,7 @@ unsigned long aux1_offset, aux2_offset; uint64_t dma_base, esp_base, le_base; uint64_t tcx_base; + int intr_ncpu; int mid_offset; int machine_id_low, machine_id_high; }; @@ -57,6 +58,7 @@ .fd_offset = 0x00400000, .counter_offset = 0x00d00000, .intr_offset = 0x00e00000, + .intr_ncpu = 1, .aux1_offset = 0x00900000, .aux2_offset = 0x00910000, .dma_base = 0x78400000, @@ -66,7 +68,7 @@ .machine_id_low = 32, .machine_id_high = 63, }, - /* SS-10 */ + /* SS-10, SS-20 */ { .iommu_base = 0xfe0000000ULL, .tcx_base = 0xe20000000ULL, @@ -77,6 +79,7 @@ .fd_offset = 0x00700000, // 0xff1700000ULL, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .intr_ncpu = 4, .aux1_offset = 0x00800000, // 0xff1800000ULL, .aux2_offset = 0x00a01000, // 0xff1a01000ULL, .dma_base = 0xef0400000ULL, @@ -97,6 +100,7 @@ .fd_offset = -1, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .intr_ncpu = 4, .aux1_offset = 0x00800000, // 0xff1800000ULL, .aux2_offset = 0x00a01000, // 0xff1a01000ULL, XXX should not exist .dma_base = 0xef0081000ULL, @@ -837,7 +841,7 @@ #ifdef CONFIG_DRIVER_OBIO mem_size = fw_cfg_read_i32(FW_CFG_RAM_SIZE); ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, - hwdef->counter_offset, hwdef->intr_offset, + hwdef->counter_offset, hwdef->intr_offset, hwdef->intr_ncpu, hwdef->aux1_offset, hwdef->aux2_offset, mem_size); Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Fri Feb 7 19:12:41 2014 (r1260) +++ trunk/openbios-devel/drivers/obio.c Sun Feb 16 17:26:19 2014 (r1261) @@ -26,14 +26,6 @@ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ -/* "NCPU" is an historical name that's now a bit of a misnomer. The sun4m - * architecture registers NCPU CPU-specific interrupts along with one - * system-wide interrupt, regardless of the number of actual CPUs installed. - * See the comment on "NCPU" at <http://stuff.mit.edu/afs/athena/astaff/ - * project/opssrc/sys.sunos/sun4m/devaddr.h>. - */ -#define SUN4M_NCPU 4 - /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); @@ -262,13 +254,13 @@ volatile struct sun4m_timer_regs *counter_regs; static void -ob_counter_init(uint64_t base, unsigned long offset) +ob_counter_init(uint64_t base, unsigned long offset, int ncpu) { int i; ob_new_obio_device("counter", NULL); - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH(0); fword("encode-int"); if (i != 0) fword("encode+"); @@ -300,7 +292,7 @@ counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH((unsigned long)&counter_regs->cpu_timers[i]); fword("encode-int"); if (i != 0) @@ -318,13 +310,13 @@ static volatile struct sun4m_intregs *intregs; static void -ob_interrupt_init(uint64_t base, unsigned long offset) +ob_interrupt_init(uint64_t base, unsigned long offset, int ncpu) { int i; ob_new_obio_device("interrupt", NULL); - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH(0); fword("encode-int"); if (i != 0) fword("encode+"); @@ -353,7 +345,7 @@ intregs->clear = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH((unsigned long)&intregs->cpu_intregs[i]); fword("encode-int"); if (i != 0) @@ -491,7 +483,7 @@ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, - unsigned long aux1_offset, unsigned long aux2_offset, + int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, unsigned long mem_size) { @@ -523,9 +515,9 @@ if (aux2_offset != (unsigned long) -1) ob_aux2_reset_init(slavio_base, aux2_offset, AUXIO2_INTR); - ob_counter_init(slavio_base, counter_offset); + ob_counter_init(slavio_base, counter_offset, intr_ncpu); - ob_interrupt_init(slavio_base, intr_offset); + ob_interrupt_init(slavio_base, intr_offset, intr_ncpu); ob_smp_init(mem_size); Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Fri Feb 7 19:12:41 2014 (r1260) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Feb 16 17:26:19 2014 (r1261) @@ -63,7 +63,7 @@ /* drivers/obio.c */ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, - unsigned long aux1_offset, unsigned long aux2_offset, + int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, unsigned long mem_size); int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu);

1 0

[PATCH] Tick counter
by Olivier Danet 11 Feb '14

11 Feb '14

romvec.pvtime is a pointer to an 'uptime' counter, calibrated in millisecond. We use the [1st] CPU timer, running at 100Hz, to increment (+10) the counter. This counter is used by NextStep to measure the 10 seconds delay during boot, when asking about boot options. Signed-off-by: Olivier Danet <odanet(a)caramail.com> --------------------------------------------------------------- diff a/arch/sparc32/romvec.c b/arch/sparc32/romvec.c --- a/arch/sparc32/romvec.c 2014-02-07 18:23:59.761220839 +0100 +++ b/arch/sparc32/romvec.c 2014-02-07 18:39:38.728186578 +0100 @@ -479,6 +479,7 @@ init_openprom(void) romvec0.pv_reboot = obp_reboot_handler; romvec0.pv_printf = obp_printf_handler; romvec0.pv_abort = obp_abort_handler; + romvec0.pv_ticks = &obp_ticks; romvec0.pv_halt = obp_halt_handler; romvec0.pv_synchook = &sync_hook; romvec0.pv_v0bootargs = &obp_argp; diff -rup a/arch/sparc32/vectors.S b/arch/sparc32/vectors.S --- a/arch/sparc32/vectors.S 2014-02-07 18:22:20.063224477 +0100 +++ b/arch/sparc32/vectors.S 2014-02-07 18:40:44.161184191 +0100 @@ -207,6 +207,10 @@ irq_entry14: sethi %hi(counter_regs), %l7 ld [%l7 + %lo(counter_regs)], %l7 ld [%l7], %g0 + sethi %hi(obp_ticks), %l7 + ld [%l7 + %lo(obp_ticks)], %l6 + add %l6, 10, %l6 + st %l6, [%l7 + %lo(obp_ticks)] jmp %l1 rett %l2 diff a/drivers/obio.c b/drivers/obio.c --- a/drivers/obio.c 2014-02-07 18:25:08.050218348 +0100 +++ b/drivers/obio.c 2014-02-07 18:56:54.126148798 +0100 @@ -253,6 +253,8 @@ ob_aux2_reset_init(uint64_t base, uint64 volatile struct sun4m_timer_regs *counter_regs; +volatile int32_t obp_ticks; + static void ob_counter_init(uint64_t base, unsigned long offset, int ncpu) { @@ -287,7 +289,7 @@ ob_counter_init(uint64_t base, unsigned counter_regs = (struct sun4m_timer_regs *)ofmem_map_io(base + (uint64_t)offset, sizeof(*counter_regs)); - counter_regs->cfg = 0xffffffff; + counter_regs->cfg = 0xfffffffe; counter_regs->l10_timer_limit = 0; counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; @@ -304,6 +306,8 @@ ob_counter_init(uint64_t base, unsigned push_str("address"); fword("property"); + obp_ticks = 0; + fword("finish-device"); } diff a/drivers/obio.h b/drivers/obio.h --- a/drivers/obio.h 2014-02-07 18:22:20.276224469 +0100 +++ b/drivers/obio.h 2014-02-07 18:45:46.417173162 +0100 @@ -88,7 +88,7 @@ struct sun4m_timer_regs { * Registers of hardware timer in sun4m. */ struct sun4m_timer_percpu { - volatile unsigned int l14_timer_limit; /* Initial value is 0x009c4000 */ + volatile unsigned int l14_timer_limit; /* Initial value is 0x009c4000 = 10ms period*/ volatile unsigned int l14_cur_count; }; diff a/include/drivers/drivers.h b/include/drivers/drivers.h --- a/include/drivers/drivers.h 2014-02-07 18:25:08.053218348 +0100 +++ b/include/drivers/drivers.h 2014-02-07 18:43:25.598178300 +0100 @@ -81,6 +81,7 @@ extern uint16_t graphic_depth; extern volatile unsigned char *power_reg; extern volatile unsigned int *reset_reg; extern volatile struct sun4m_timer_regs *counter_regs; +extern volatile int32_t obp_ticks; void ob_new_obio_device(const char *name, const char *type); unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map); ---------------------------------------------------------------

2 4

[PATCH] OBP Memory allocation
by Olivier Danet 10 Feb '14

10 Feb '14

When called with a null base address, char *obp_memalloc(va,size,align) shall provide the address itself. (and remove some trailing whitespaces) Signed-off-by : Olivier Danet <odanet(a)caramail.com> Index: arch/sparc32/lib.c =================================================================== --- arch/sparc32/lib.c (révision 1257) +++ arch/sparc32/lib.c (copie de travail) @@ -212,13 +212,19 @@ phys_addr_t phys; ucell virt; - DPRINTF("obp_memalloc: virta 0x%x, sz %d, align %d\n", (unsigned int)va, size, align); - + DPRINTF("obp_memalloc: virta 0x%x, sz %d, align %d\n", (unsigned int)va, size, align); + + /* Round to page size */ + size = (size + 0xfff) & 0xFFFFF000; + /* Claim physical memory */ phys = ofmem_claim_phys(-1, size, align); /* Claim virtual memory */ - virt = ofmem_claim_virt(pointer2cell(va), size, 0); + if (va) + virt = ofmem_claim_virt(pointer2cell(va), size, 0); + else + virt = ofmem_claim_virt(0, size, 0x1000); /* Map the memory */ ofmem_map(phys, virt, size, ofmem_arch_default_translation_mode(phys)); @@ -230,7 +236,7 @@ { unsigned long align = size; - DPRINTF("obp_dumb_memalloc: virta 0x%x, sz %d\n", (unsigned int)va, size); + DPRINTF("obp_dumb_memalloc: virta 0x%x, sz %d\n", (unsigned int)va, size); /* Solaris seems to assume that the returned value is physically aligned to size. e.g. it is used for setting up page tables. Fortunately this is now handled by ===================================================================

2 1

[PATCH] a.out header copy
by Olivier Danet 10 Feb '14

10 Feb '14

NextSTEP's bootloader for Sparc32 expects that the 32 bytes a.out header is copied just before the start address. Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- libopenbios/aout_load.c (révision 1257) +++ libopenbios/aout_load.c (copie de travail) @@ -139,6 +139,8 @@ goto out; } } + seek_io(fd, offset); + read_io(fd, (char *)(start-0x20), 0x20); debug("Loaded %lu bytes\n", size); debug("entry point is %#lx\n", start); ===================================================================

2 5

[PATCH] Interrupt/Timer property
by Olivier Danet 07 Feb '14

07 Feb '14

SparcStation 5 has 1 timer and 1 per-cpu interrupt controller. SparcStation 10/20 has 4 timers and 4 per-cpu interrupt controllers, independently from the number of CPUs installed. Timer and interrupt controller properties are set accordingly. This is what Sun's OpenBOOT does and having only 1 timer/interrupt declared on SS5 is necessary for NextSTEP. Signed-off-by: Olivier Danet <odanet(a)caramail.com> =================================================================== --- arch/sparc32/openbios.c (révision 1257) +++ arch/sparc32/openbios.c (copie de travail) @@ -41,6 +41,7 @@ unsigned long aux1_offset, aux2_offset; uint64_t dma_base, esp_base, le_base; uint64_t tcx_base; + int intr_ncpu; int mid_offset; int machine_id_low, machine_id_high; }; @@ -57,6 +58,7 @@ .fd_offset = 0x00400000, .counter_offset = 0x00d00000, .intr_offset = 0x00e00000, + .intr_ncpu = 1, .aux1_offset = 0x00900000, .aux2_offset = 0x00910000, .dma_base = 0x78400000, @@ -66,7 +68,7 @@ .machine_id_low = 32, .machine_id_high = 63, }, - /* SS-10 */ + /* SS-10, SS-20 */ { .iommu_base = 0xfe0000000ULL, .tcx_base = 0xe20000000ULL, @@ -77,6 +79,7 @@ .fd_offset = 0x00700000, // 0xff1700000ULL, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .intr_ncpu = 4, .aux1_offset = 0x00800000, // 0xff1800000ULL, .aux2_offset = 0x00a01000, // 0xff1a01000ULL, .dma_base = 0xef0400000ULL, @@ -97,6 +100,7 @@ .fd_offset = -1, .counter_offset = 0x00300000, // 0xff1300000ULL, .intr_offset = 0x00400000, // 0xff1400000ULL, + .intr_ncpu = 4, .aux1_offset = 0x00800000, // 0xff1800000ULL, .aux2_offset = 0x00a01000, // 0xff1a01000ULL, XXX should not exist .dma_base = 0xef0081000ULL, @@ -837,7 +841,7 @@ #ifdef CONFIG_DRIVER_OBIO mem_size = fw_cfg_read_i32(FW_CFG_RAM_SIZE); ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, - hwdef->counter_offset, hwdef->intr_offset, + hwdef->counter_offset, hwdef->intr_offset, hwdef->intr_ncpu, hwdef->aux1_offset, hwdef->aux2_offset, mem_size); =================================================================== --- include/drivers/drivers.h (révision 1257) +++ include/drivers/drivers.h (copie de travail) @@ -63,7 +63,7 @@ /* drivers/obio.c */ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, - unsigned long aux1_offset, unsigned long aux2_offset, + int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, unsigned long mem_size); int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu); =================================================================== --- drivers/obio.c (révision 1257) +++ drivers/obio.c (copie de travail) @@ -26,14 +26,6 @@ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ -/* "NCPU" is an historical name that's now a bit of a misnomer. The sun4m - * architecture registers NCPU CPU-specific interrupts along with one - * system-wide interrupt, regardless of the number of actual CPUs installed. - * See the comment on "NCPU" at <http://stuff.mit.edu/afs/athena/astaff/ - * project/opssrc/sys.sunos/sun4m/devaddr.h>. - */ -#define SUN4M_NCPU 4 - /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); @@ -262,13 +254,13 @@ volatile struct sun4m_timer_regs *counter_regs; static void -ob_counter_init(uint64_t base, unsigned long offset) +ob_counter_init(uint64_t base, unsigned long offset, int ncpu) { int i; ob_new_obio_device("counter", NULL); - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH(0); fword("encode-int"); if (i != 0) fword("encode+"); @@ -300,7 +292,7 @@ counter_regs->cpu_timers[0].l14_timer_limit = 0x9c4000; /* see comment in obio.h */ counter_regs->cpu_timers[0].cntrl = 1; - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH((unsigned long)&counter_regs->cpu_timers[i]); fword("encode-int"); if (i != 0) @@ -318,13 +310,13 @@ static volatile struct sun4m_intregs *intregs; static void -ob_interrupt_init(uint64_t base, unsigned long offset) +ob_interrupt_init(uint64_t base, unsigned long offset, int ncpu) { int i; ob_new_obio_device("interrupt", NULL); - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH(0); fword("encode-int"); if (i != 0) fword("encode+"); @@ -353,7 +345,7 @@ intregs->clear = ~SUN4M_INT_MASKALL; intregs->cpu_intregs[0].clear = ~0x17fff; - for (i = 0; i < SUN4M_NCPU; i++) { + for (i = 0; i < ncpu; i++) { PUSH((unsigned long)&intregs->cpu_intregs[i]); fword("encode-int"); if (i != 0) @@ -491,7 +483,7 @@ int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, unsigned long counter_offset, unsigned long intr_offset, - unsigned long aux1_offset, unsigned long aux2_offset, + int intr_ncpu, unsigned long aux1_offset, unsigned long aux2_offset, unsigned long mem_size) { @@ -523,9 +515,9 @@ if (aux2_offset != (unsigned long) -1) ob_aux2_reset_init(slavio_base, aux2_offset, AUXIO2_INTR); - ob_counter_init(slavio_base, counter_offset); + ob_counter_init(slavio_base, counter_offset, intr_ncpu); - ob_interrupt_init(slavio_base, intr_offset); + ob_interrupt_init(slavio_base, intr_offset, intr_ncpu); ob_smp_init(mem_size); ===================================================================

2 4

[commit] r1260 - trunk/openbios-devel/kernel
by repository service 07 Feb '14

07 Feb '14

Author: mcayland Date: Fri Feb 7 19:12:41 2014 New Revision: 1260 URL: http://tracker.coreboot.org/trac/openbios/changeset/1260 Log: bootstrap.c: replace name -> fil Because name does not exist! Signed-off-by: Olivier Danet <odanet(a)caramail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/kernel/bootstrap.c Modified: trunk/openbios-devel/kernel/bootstrap.c ============================================================================== --- trunk/openbios-devel/kernel/bootstrap.c Fri Feb 7 19:12:34 2014 (r1259) +++ trunk/openbios-devel/kernel/bootstrap.c Fri Feb 7 19:12:41 2014 (r1260) @@ -513,11 +513,11 @@ if (ret != NULL) { #ifdef CONFIG_DEBUG_INTERPRETER - printk("Including '%s'\n", name ); + printk("Including '%s'\n", fil); #endif - srcfilenames[cursrc] = strdup(fil); - srclines [ cursrc ] = 1; - srcfiles [ cursrc++ ] = ret; + srcfilenames[cursrc] = strdup(fil); + srclines[cursrc] = 1; + srcfiles[cursrc++] = ret; if (depfile) { fprintf(depfile, " %s", fullpath);

1 0

[commit] r1259 - trunk/openbios-devel/drivers
by repository service 07 Feb '14

07 Feb '14

Author: mcayland Date: Fri Feb 7 19:12:34 2014 New Revision: 1259 URL: http://tracker.coreboot.org/trac/openbios/changeset/1259 Log: SPARC32: SparcStation 10/20 mode fix * SS10/20 use 36bits addresses. When mapping peripherals, bits [35:32] are not always tied to 0. * The probe-set-sbus forth word expects hex numbers for slots. SS5 uses slots 0 to 5, whereas SS10/20 uses the slot 0xF, and triggers the bug. Signed-off-by: Olivier Danet <odanet(a)caramail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/iommu.c trunk/openbios-devel/drivers/sbus.c Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Fri Feb 7 19:12:30 2014 (r1258) +++ trunk/openbios-devel/drivers/iommu.c Fri Feb 7 19:12:34 2014 (r1259) @@ -158,8 +158,8 @@ ucell size, virt; size = POP(); - POP(); phys = POP(); + phys = (phys << 32) + POP(); virt = ofmem_map_io(phys, size); Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Fri Feb 7 19:12:30 2014 (r1258) +++ trunk/openbios-devel/drivers/sbus.c Fri Feb 7 19:12:34 2014 (r1259) @@ -153,7 +153,7 @@ fword("new-device"); PUSH(0); PUSH(0); - snprintf(buf, 6, "%d,0", slot); + snprintf(buf, 6, "%x,0", slot); push_str(buf); fword("set-args"); feval("['] tcx-driver-fcode 2 cells + 1 byte-load"); @@ -268,7 +268,7 @@ PUSH(0); PUSH(0); - snprintf(buf, 6, "%d,%ld", slot, offset); + snprintf(buf, 6, "%x,%lx", slot, offset); push_str(buf); fword("2dup"); fword("probe-self-sbus");

1 0

[commit] r1258 - trunk/openbios-devel/drivers
by repository service 07 Feb '14

07 Feb '14

Author: mcayland Date: Fri Feb 7 19:12:30 2014 New Revision: 1258 URL: http://tracker.coreboot.org/trac/openbios/changeset/1258 Log: escc: fix keyboard property for SPARC32 The keyboard property should be empty. NetBSD accesses the keyboard property in 'kernel/arch/sparc/dev/zs.c' and checks this : (prom_getproplen(zsc->zsc_node, "keyboard") == 0) ...which is true only when the property exists but has no value. It matches Sun's OpenBOOT behavior. Signed-off-by: Olivier Danet <odanet(a)caramail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/escc.c Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Mon Jan 13 10:47:06 2014 (r1257) +++ trunk/openbios-devel/drivers/escc.c Fri Feb 7 19:12:30 2014 (r1258) @@ -329,13 +329,13 @@ fword("property"); if (keyboard) { - PUSH(-1); - fword("encode-int"); + PUSH(0); + PUSH(0); push_str("keyboard"); fword("property"); - PUSH(-1); - fword("encode-int"); + PUSH(0); + PUSH(0); push_str("mouse"); fword("property"); }

1 0

Fwd: Re: [PATCH] next-property
by Olivier Danet 05 Feb '14

05 Feb '14

On 03/02/2014 23:12, Olivier Danet wrote: > On 03/02/2014 15:21, Artyom Tarasenko wrote: >> On Sat, Feb 1, 2014 at 9:54 PM, Olivier Danet <odanet(a)caramail.com> >> wrote: >>> obp_nextprop(node,name) calls the Forth word "next-property" then >>> pops the >>> result. "next-property" should therefore always return something : >>> * A string when the property provided is not the last one of the >>> node. >>> * Zero when the property provided is the last one of the node. >>> * Zero when the property provided does not exist in the current node. >>> >>> Previously, next-property returned nothing when the property didn't >>> exist. >>> >>> "next-property" behavior with last and nonexistant properties differs >>> between implementations of OF. >> Right. As discussed before, the current behavior matches the OBP >> behavior on >> sun4u machines. >> >> It would be nice to keep the comatibility with OBP. Can the C function >> obp_nextprop(node,name) be modified instead? >> >> Artyom >> >>> This problem was found with NetBSD on Sparc32. It ennumerates >>> peripherals >>> when starting X11 and asks for the "name" and "device_type" property >>> of many >>> nodes, including some which have neither "name" nor "device_type" >>> properties. >>> >>> Signed-off-by: Olivier Danet <odanet(a)caramail.com> >>> =================================================================== >>> --- forth/device/property.fs (révision 1257) >>> +++ forth/device/property.fs (copie de travail) >>> @@ -70,7 +70,7 @@ >>> 2drop r> >dn.properties @ >>> else >>> r> find-property dup if @ then >>> - ?dup if >prop.next @ then >>> + dup if >prop.next @ then >>> then >>> >>> ?dup if >>> =================================================================== >>> >>> -- >>> OpenBIOS http://openbios.org/ >>> Mailinglist: http://lists.openbios.org/mailman/listinfo >>> Free your System - May the Forth be with you >> >> > > OpenBIOS's current behavior does not match any other ! > > For "next-property" we have 3 cases : > a) The property is not the last > b) The property is the last > c) The property does not exist > > Current OpenBIOS : a) -1 "string" b) 0 c) nothing > Standard : a) true "string" b) false c) false > Sun Ultra10 : a) -1 "string" b) nothing c) nothing > PowerPC iBook : a) -1 "string" b) -1 0 0 c) 0 > Previous patch : a) -1 "string" b) 0 c) 0 > > Here is a patch adhering to the Ultra10's behavior, maybe other > Sun4u computers do differently : > > =================================================================== > --- arch/sparc32/romvec.c (révision 1257) > +++ arch/sparc32/romvec.c (copie de travail) > @@ -173,8 +173,9 @@ > > const char *obp_nextprop(int node, const char *name) > { > - int found; > + int stackcnt; > > + stackcnt = dstackcnt; > if (!name || *name == '\0') { > // NULL name means get first property > push_str(""); > @@ -184,14 +185,13 @@ > } > PUSH(node); > fword("next-property"); > - found = POP(); > - if (!found) { > + if (dstackcnt == stackcnt) { > DPRINTF("obp_nextprop(0x%x, %s) (not found)\n", node, name); > > return ""; > } else { > char *str; > - > + POP(); /* true */ > POP(); /* len */ > str = (char *) POP(); > > =================================================================== > --- forth/device/property.fs (révision 1257) > +++ forth/device/property.fs (copie de travail) > @@ -70,14 +70,12 @@ > 2drop r> >dn.properties @ > else > r> find-property dup if @ then > - ?dup if >prop.next @ then > + dup if >prop.next @ then > then > > ?dup if > >prop.name @ dup cstrlen true > ( phandle name-str name-len true ) > - else > - false > then > ; > > =================================================================== > > The 'standard' way makes next-property more useable as > a Forth word, but, really, I don't care. > > Olivier > > Oh, sorry, please forget this patch. It breaks things elsewhere (".properties" ...)

2 1