- OpenBIOS - mail.coreboot.org

[commit] r935 - trunk/openbios-devel/arch/ppc/qemu
by repository service 31 Oct '10

31 Oct '10

Author: afaerber Date: Sun Oct 31 10:59:12 2010 New Revision: 935 URL: http://tracker.coreboot.org/trac/openbios/changeset/935 Log: ppc: Typo fix It's Old World vs. New World Macs. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 00:49:20 2010 (r934) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 10:59:12 2010 (r935) @@ -646,7 +646,7 @@ fword("find-device"); switch(machine_id) { - case ARCH_HEATHROW: /* OldWord */ + case ARCH_HEATHROW: /* OldWorld */ /* model */

3 2

[commit] r937 - trunk/openbios-devel/arch/ppc/qemu
by repository service 31 Oct '10

31 Oct '10

Author: afaerber Date: Sun Oct 31 11:30:22 2010 New Revision: 937 URL: http://tracker.coreboot.org/trac/openbios/changeset/937 Log: ppc: Add RTAS rtas-version property The CHRP 1.0 spec defines it as 1, which matches the IBM JS20. Macs appear to have it as 0x41 though. v2: * Authentically set it to 0x41 for Apple machines. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 11:21:50 2010 (r936) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 11:30:22 2010 (r937) @@ -764,6 +764,7 @@ while (size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start) size *= 2; set_property(ph, "rtas-size", (char*)&size, sizeof(size)); + set_int_property(ph, "rtas-version", is_apple() ? 0x41 : 1); } break; }

1 0

[commit] r936 - trunk/openbios-devel/arch/ppc/qemu
by repository service 31 Oct '10

31 Oct '10

Author: afaerber Date: Sun Oct 31 11:21:50 2010 New Revision: 936 URL: http://tracker.coreboot.org/trac/openbios/changeset/936 Log: ppc: Don't set up RTAS for OldWorld Macs According to historical device trees, pre-iMac Macs do not seem to have the /rtas node. Make /rtas conditional to NewWorld Macs for now, while allowing to extend this to future CHRP machines. This means that the ppc-softmmu would by default not have it, except when using -M mac99. ppc64-softmmu would get it by default. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 10:59:12 2010 (r935) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 11:21:50 2010 (r936) @@ -753,13 +753,19 @@ node_methods_init(buf); #ifdef CONFIG_RTAS - if( !(ph=find_dev("/rtas")) ) - printk("Warning: No /rtas node\n"); - else { - unsigned long size = 0x1000; - while( size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start ) - size *= 2; - set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); + /* OldWorld Macs don't have an /rtas node. */ + switch (machine_id) { + case ARCH_MAC99: + case ARCH_MAC99_U3: + if (!(ph = find_dev("/rtas"))) { + printk("Warning: No /rtas node\n"); + } else { + unsigned long size = 0x1000; + while (size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start) + size *= 2; + set_property(ph, "rtas-size", (char*)&size, sizeof(size)); + } + break; } #endif Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Oct 31 10:59:12 2010 (r935) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Oct 31 11:21:50 2010 (r936) @@ -304,7 +304,9 @@ { phandle_t chosen, ph; #ifdef CONFIG_RTAS - REGISTER_NODE( rtas ); + if (is_newworld()) { + REGISTER_NODE( rtas ); + } #endif REGISTER_NODE( ciface ); REGISTER_NODE( memory );

1 0

[commit] r934 - trunk/openbios-devel/arch/ppc/qemu
by repository service 31 Oct '10

31 Oct '10

Author: afaerber Date: Sun Oct 31 00:49:20 2010 New Revision: 934 URL: http://tracker.coreboot.org/trac/openbios/changeset/934 Log: ppc: Add support for -cpu 970 The 970fx is supported, which happens to be the default CPU for -M mac99. The IBM JS20 had a dual 970 though, and -cpu 970 leads to a busy loop: >> Unknown cpu (pvr 390000), freezing! Add a definition for the 970. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 30 18:26:02 2010 (r933) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Oct 31 00:49:20 2010 (r934) @@ -472,6 +472,18 @@ .clock_frequency = 0x1dcd6500, .initfn = cpu_g4_init, }, + { + .iu_version = 0x00390000, + .name = "PowerPC,970", + .icache_size = 0x10000, + .dcache_size = 0x8000, + .icache_sets = 0x200, + .dcache_sets = 0x80, + .icache_block_size = 0x80, + .dcache_block_size = 0x80, + .clock_frequency = 0x5f5e1000, + .initfn = cpu_970_init, + }, { // XXX find out real values .iu_version = 0x003C0000, .name = "PowerPC,970FX",

1 0

[commit] r933 - in trunk/openbios-devel: drivers include/arch/ppc include/drivers
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 18:26:02 2010 New Revision: 933 URL: http://tracker.coreboot.org/trac/openbios/changeset/933 Log: Don't make assumptions about device address size Prefer phys_addr_t for physical addresses. Resort to uintptr_t where a conversion to pointer occurs, since the physical address may be larger (e.g., sparc32). v2: * Use phys_addr_t. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/drivers/cuda.c trunk/openbios-devel/drivers/cuda.h trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/escc.h trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/macio.h trunk/openbios-devel/include/arch/ppc/io.h trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/drivers/cuda.c ============================================================================== --- trunk/openbios-devel/drivers/cuda.c Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/cuda.c Sat Oct 30 18:26:02 2010 (r933) @@ -369,7 +369,7 @@ } -cuda_t *cuda_init (const char *path, uint32_t base) +cuda_t *cuda_init (const char *path, phys_addr_t base) { cuda_t *cuda; char buf[64]; Modified: trunk/openbios-devel/drivers/cuda.h ============================================================================== --- trunk/openbios-devel/drivers/cuda.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/cuda.h Sat Oct 30 18:26:02 2010 (r933) @@ -1,7 +1,7 @@ #include "adb_bus.h" struct cuda_t { - uint32_t base; + phys_addr_t base; adb_bus_t *adb_bus; }; typedef struct cuda_t cuda_t; @@ -14,4 +14,4 @@ CHARDEV_LAST, }; -cuda_t *cuda_init (const char *path, uint32_t base); +cuda_t *cuda_init (const char *path, phys_addr_t base); Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/escc.c Sat Oct 30 18:26:02 2010 (r933) @@ -13,11 +13,11 @@ static volatile unsigned char *serial_dev; -#define CTRL(addr) (*(volatile unsigned char *)(addr)) +#define CTRL(addr) (*(volatile unsigned char *)(uintptr_t)(addr)) #ifdef CONFIG_DRIVER_ESCC_SUN -#define DATA(addr) (*(volatile unsigned char *)(addr + 2)) +#define DATA(addr) (*(volatile unsigned char *)(uintptr_t)(addr + 2)) #else -#define DATA(addr) (*(volatile unsigned char *)(addr + 16)) +#define DATA(addr) (*(volatile unsigned char *)(uintptr_t)(addr + 16)) #endif /* Conversion routines to/from brg time constants from/to bits @@ -54,19 +54,19 @@ #define Rx_CH_AV 0x1 /* Rx Character Available */ #define Tx_BUF_EMP 0x4 /* Tx Buffer empty */ -int uart_charav(int port) +int uart_charav(uintptr_t port) { return (CTRL(port) & Rx_CH_AV) != 0; } -char uart_getchar(int port) +char uart_getchar(uintptr_t port) { while (!uart_charav(port)) ; return DATA(port) & 0177; } -static void uart_putchar(int port, unsigned char c) +static void uart_putchar(uintptr_t port, unsigned char c) { if (!serial_dev) return; @@ -102,13 +102,13 @@ } -int uart_init(uint64_t port, unsigned long speed) +int uart_init(phys_addr_t port, unsigned long speed) { #ifdef CONFIG_DRIVER_ESCC_SUN serial_dev = map_io(port & ~7ULL, ZS_REGS); serial_dev += port & 7ULL; #else - serial_dev = (unsigned char *)(unsigned long)port; + serial_dev = (unsigned char *)(uintptr_t)port; #endif uart_init_line(serial_dev, speed); return -1; @@ -116,7 +116,7 @@ void serial_putchar(int c) { - uart_putchar((int)serial_dev, (unsigned char) (c & 0xff)); + uart_putchar((uintptr_t)serial_dev, (unsigned char) (c & 0xff)); } void serial_cls(void) @@ -131,7 +131,7 @@ /* ( addr len -- actual ) */ static void -escc_read(unsigned long *address) +escc_read(phys_addr_t *address) { char *addr; int len; @@ -140,7 +140,7 @@ addr = (char *)cell2pointer(POP()); if (len < 1) - printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); + printk("escc_read: bad len, addr %p len %x\n", addr, len); if (uart_charav(*address)) { *addr = (char)uart_getchar(*address); @@ -152,7 +152,7 @@ /* ( addr len -- actual ) */ static void -escc_write(unsigned long *address) +escc_write(phys_addr_t *address) { unsigned char *addr; int i, len; @@ -172,7 +172,7 @@ } static void -escc_open(unsigned long *address) +escc_open(phys_addr_t *address) { #ifdef CONFIG_DRIVER_ESCC_SUN int len; @@ -199,7 +199,7 @@ RET ( -1 ); } -DECLARE_UNNAMED_NODE(escc, INSTALL_OPEN, sizeof(unsigned long)); +DECLARE_UNNAMED_NODE(escc, INSTALL_OPEN, sizeof(phys_addr_t)); NODE_METHODS(escc) = { { "open", escc_open }, @@ -211,7 +211,7 @@ #ifdef CONFIG_DRIVER_ESCC_SUN static volatile unsigned char *kbd_dev; -void kbd_init(uint64_t base) +void kbd_init(phys_addr_t base) { kbd_dev = map_io(base, 2 * 4); kbd_dev += 4; @@ -295,7 +295,7 @@ addr = (unsigned char *)POP(); if (len < 1) - printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); + printk("escc_read: bad len, addr %p len %x\n", addr, len); if (keyboard_dataready()) { *addr = keyboard_readdata(); @@ -305,7 +305,7 @@ } } -DECLARE_UNNAMED_NODE(escc_keyboard, INSTALL_OPEN, sizeof(unsigned long)); +DECLARE_UNNAMED_NODE(escc_keyboard, INSTALL_OPEN, sizeof(phys_addr_t)); NODE_METHODS(escc_keyboard) = { { "open", escc_open }, @@ -314,7 +314,7 @@ }; void -ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, int keyboard) +ob_zs_init(phys_addr_t base, uint64_t offset, int intr, int slave, int keyboard) { char nodebuff[256]; phandle_t aliases; @@ -369,7 +369,7 @@ #else static void -escc_add_channel(const char *path, const char *node, uint32_t addr, +escc_add_channel(const char *path, const char *node, phys_addr_t addr, uint32_t offset) { char buf[64], tty[32]; @@ -430,7 +430,7 @@ } void -escc_init(const char *path, unsigned long addr) +escc_init(const char *path, phys_addr_t addr) { char buf[64]; int props[2]; Modified: trunk/openbios-devel/drivers/escc.h ============================================================================== --- trunk/openbios-devel/drivers/escc.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/escc.h Sat Oct 30 18:26:02 2010 (r933) @@ -4,6 +4,6 @@ #define ZS_REGS 8 -void escc_init(const char *path, unsigned long addr); -void ob_zs_init(uint64_t base, uint64_t offset, int intr, int slave, +void escc_init(const char *path, phys_addr_t addr); +void ob_zs_init(phys_addr_t base, uint64_t offset, int intr, int slave, int keyboard); Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/macio.c Sat Oct 30 18:26:02 2010 (r933) @@ -43,7 +43,7 @@ return NW_IO_NVRAM_SIZE >> NW_IO_NVRAM_SHIFT; } -void macio_nvram_init(const char *path, uint32_t addr) +void macio_nvram_init(const char *path, phys_addr_t addr) { phandle_t chosen, aliases; phandle_t dnode; @@ -145,7 +145,7 @@ } static void -openpic_init(const char *path, uint32_t addr) +openpic_init(const char *path, phys_addr_t addr) { phandle_t target_node; phandle_t dnode; @@ -238,7 +238,7 @@ }; void -ob_macio_heathrow_init(const char *path, uint32_t addr) +ob_macio_heathrow_init(const char *path, phys_addr_t addr) { phandle_t aliases; @@ -253,7 +253,7 @@ } void -ob_macio_keylargo_init(const char *path, uint32_t addr) +ob_macio_keylargo_init(const char *path, phys_addr_t addr) { phandle_t aliases; Modified: trunk/openbios-devel/drivers/macio.h ============================================================================== --- trunk/openbios-devel/drivers/macio.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/drivers/macio.h Sat Oct 30 18:26:02 2010 (r933) @@ -1,5 +1,5 @@ extern phandle_t pic_handle; -void ob_macio_heathrow_init(const char *path, uint32_t addr); -void ob_macio_keylargo_init(const char *path, uint32_t addr); -void macio_nvram_init(const char *path, uint32_t addr); +void ob_macio_heathrow_init(const char *path, phys_addr_t addr); +void ob_macio_keylargo_init(const char *path, phys_addr_t addr); +void macio_nvram_init(const char *path, phys_addr_t addr); Modified: trunk/openbios-devel/include/arch/ppc/io.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/io.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/include/arch/ppc/io.h Sat Oct 30 18:26:02 2010 (r933) @@ -22,15 +22,15 @@ * are arrays of bytes, and byte-swapping is not appropriate in * that case. - paulus */ -#define insw(port, buf, ns) _insw((uint16_t *)((port)+isa_io_base), (buf), (ns)) -#define outsw(port, buf, ns) _outsw((uint16_t *)((port)+isa_io_base), (buf), (ns)) +#define insw(port, buf, ns) _insw((uint16_t *)(uintptr_t)((port)+isa_io_base), (buf), (ns)) +#define outsw(port, buf, ns) _outsw((uint16_t *)(uintptr_t)((port)+isa_io_base), (buf), (ns)) -#define inb(port) in_8((uint8_t *)((port)+isa_io_base)) -#define outb(val, port) out_8((uint8_t *)((port)+isa_io_base), (val)) -#define inw(port) in_le16((uint16_t *)((port)+isa_io_base)) -#define outw(val, port) out_le16((uint16_t *)((port)+isa_io_base), (val)) -#define inl(port) in_le32((uint32_t *)((port)+isa_io_base)) -#define outl(val, port) out_le32((uint32_t *)((port)+isa_io_base), (val)) +#define inb(port) in_8((uint8_t *)(uintptr_t)((port)+isa_io_base)) +#define outb(val, port) out_8((uint8_t *)(uintptr_t)((port)+isa_io_base), (val)) +#define inw(port) in_le16((uint16_t *)(uintptr_t)((port)+isa_io_base)) +#define outw(val, port) out_le16((uint16_t *)(uintptr_t)((port)+isa_io_base), (val)) +#define inl(port) in_le32((uint32_t *)(uintptr_t)((port)+isa_io_base)) +#define outl(val, port) out_le32((uint32_t *)(uintptr_t)((port)+isa_io_base), (val)) /* * 8, 16 and 32 bit, big and little endian I/O operations, with barrier. Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Sat Oct 30 18:18:08 2010 (r932) +++ trunk/openbios-devel/include/drivers/drivers.h Sat Oct 30 18:26:02 2010 (r933) @@ -113,9 +113,9 @@ void serial_putchar(int c); #endif #ifdef CONFIG_DRIVER_ESCC -int uart_init(uint64_t port, unsigned long speed); -int uart_charav(int port); -char uart_getchar(int port); +int uart_init(phys_addr_t port, unsigned long speed); +int uart_charav(uintptr_t port); +char uart_getchar(uintptr_t port); void serial_putchar(int c); void serial_cls(void); #ifdef CONFIG_DRIVER_ESCC_SUN

1 0

[commit] r932 - in trunk/openbios-devel/include/arch: amd64 ia64 ppc sparc32 sparc64 x86
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 18:18:08 2010 New Revision: 932 URL: http://tracker.coreboot.org/trac/openbios/changeset/932 Log: Introduce physical address type Define phys_addr_t type for all architectures. v2: * Add comment on PAE for x86, pointed out by Blue. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/amd64/types.h trunk/openbios-devel/include/arch/ia64/types.h trunk/openbios-devel/include/arch/ppc/types.h trunk/openbios-devel/include/arch/sparc32/types.h trunk/openbios-devel/include/arch/sparc64/types.h trunk/openbios-devel/include/arch/x86/types.h Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/amd64/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -16,6 +16,9 @@ /* endianess */ #include "autoconf.h" +/* physical address */ +typedef uint64_t phys_addr_t; + /* cell based types */ typedef long long cell; Modified: trunk/openbios-devel/include/arch/ia64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ia64/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/ia64/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -17,6 +17,9 @@ #include <endian.h> +/* physical address */ +typedef uint64_t phys_addr_t; + /* cell based types */ typedef int64_t cell; Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/ppc/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -30,6 +30,13 @@ /* endianess */ #include "autoconf.h" +/* physical address */ +#if defined(__powerpc64__) +typedef uint64_t phys_addr_t; +#else +typedef uint32_t phys_addr_t; +#endif + /* cell based types */ typedef int32_t cell; Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -30,6 +30,9 @@ /* endianess */ #include "autoconf.h" +/* physical address: 36 bits */ +typedef uint64_t phys_addr_t; + /* cell based types */ typedef int32_t cell; Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -30,6 +30,9 @@ /* endianess */ #include "autoconf.h" +/* physical address */ +typedef uint64_t phys_addr_t; + /* cell based types */ typedef long long cell; typedef unsigned long long ucell; Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sat Oct 30 18:15:17 2010 (r931) +++ trunk/openbios-devel/include/arch/x86/types.h Sat Oct 30 18:18:08 2010 (r932) @@ -17,6 +17,9 @@ #include "autoconf.h" +/* physical address: XXX theoretically 36 bits for PAE */ +typedef uint32_t phys_addr_t; + /* cell based types */ typedef int32_t cell;

1 0

[commit] r931 - trunk/openbios-devel/include/kernel
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 18:15:17 2010 New Revision: 931 URL: http://tracker.coreboot.org/trac/openbios/changeset/931 Log: ppc64: Quickfix for pointer2cell() and cell2pointer() Add a uintptr_t cast as an interim solution to resolve errors for ppc64, where pointer size is larger than cell size. v2: * Add comment on potential better fix. Postpone potential conversion to inline function until investigated. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/kernel/stack.h Modified: trunk/openbios-devel/include/kernel/stack.h ============================================================================== --- trunk/openbios-devel/include/kernel/stack.h Sat Oct 30 17:44:08 2010 (r930) +++ trunk/openbios-devel/include/kernel/stack.h Sat Oct 30 18:15:17 2010 (r931) @@ -31,8 +31,9 @@ #ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -#define pointer2cell(x) ((ucell)(x)) -#define cell2pointer(x) ((u8 *)(x)) +// XXX Check whether we can take the larger-than code path for ppc64 instead. +#define pointer2cell(x) ((ucell)(uintptr_t)(x)) +#define cell2pointer(x) ((u8 *)(uintptr_t)(x)) #endif #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH #define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address))

1 0

[commit] r930 - trunk/openbios-devel/kernel
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 17:44:08 2010 New Revision: 930 URL: http://tracker.coreboot.org/trac/openbios/changeset/930 Log: Don't assume that pointer and cell size are identical, part 2 Do the double-dereference in two cell2pointer steps to avoid garbage in the high 32 address bits on ppc64. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/kernel/internal.c Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Sat Oct 30 17:33:11 2010 (r929) +++ trunk/openbios-devel/kernel/internal.c Sat Oct 30 17:44:08 2010 (r930) @@ -329,10 +329,11 @@ #ifndef FCOMPILER static ucell get_myself(void) { - static ucell **myself = NULL; - if( !myself ) - myself = (ucell**)findword("my-self") + 1; - return (*myself && **myself) ? (ucell)**myself : 0; + static ucell *myselfptr = NULL; + if (myselfptr == NULL) + myselfptr = (ucell*)cell2pointer(findword("my-self")) + 1; + ucell *myself = (ucell*)cell2pointer(*myselfptr); + return (myself != NULL) ? *myself : 0; } static void doivar(void)

1 0

[PATCH] switch-arch: Fix recognition of x86_64 target as 64-bit
by Andreas Färber 30 Oct '10

30 Oct '10

The comparison would've always been false due to missing $. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- config/scripts/switch-arch | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index 8b6563d..60782e9 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -48,7 +48,7 @@ crosscflags() # target long bits test if test "$target" = "sparc64" -o "$target" = "ia64" \ - -o "$target" = "amd64" -o "target" = "x86_64" \ + -o "$target" = "amd64" -o "$target" = "x86_64" \ -o "$target" = "alpha"; then targetlongbits="64" else -- 1.7.3

3 8

[commit] r929 - in trunk/openbios-devel/arch: ppc ppc64 ppc64/qemu
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 17:33:11 2010 New Revision: 929 URL: http://tracker.coreboot.org/trac/openbios/changeset/929 Log: ppc: Don't hardcode "ppc" arch for openbios-qemu.elf Use $(ARCH) to allow using a different linker script for ppc64. v2: * Add ppc64/qemu/ldscript, derived from ppc/qemu/ldscript. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Added: trunk/openbios-devel/arch/ppc64/ trunk/openbios-devel/arch/ppc64/qemu/ trunk/openbios-devel/arch/ppc64/qemu/ldscript - copied, changed from r928, trunk/openbios-devel/arch/ppc/qemu/ldscript Modified: trunk/openbios-devel/arch/ppc/build.xml Modified: trunk/openbios-devel/arch/ppc/build.xml ============================================================================== --- trunk/openbios-devel/arch/ppc/build.xml Sat Oct 30 17:19:58 2010 (r928) +++ trunk/openbios-devel/arch/ppc/build.xml Sat Oct 30 17:33:11 2010 (r929) @@ -178,7 +178,7 @@ <executable name="openbios-qemu.elf" target="target" condition="QEMU"> <rule> - $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/ppc/qemu/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") + $(call quiet-command,$(LD) --warn-common -N -T $(SRCDIR)/arch/$(ARCH)/qemu/ldscript -o $@.nostrip --whole-archive $^," LINK $(TARGET_DIR)$@") $(call quiet-command,$(NM) $@.nostrip | sort > $(ODIR)/openbios-qemu.syms," GEN $(TARGET_DIR)$@.syms") $(call quiet-command,$(STRIP) $@.nostrip -o $@," STRIP $(TARGET_DIR)$@")</rule> <object source="qemu/start.S"/> Copied and modified: trunk/openbios-devel/arch/ppc64/qemu/ldscript (from r928, trunk/openbios-devel/arch/ppc/qemu/ldscript) ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ldscript Sat Oct 30 17:19:58 2010 (r928, copy source) +++ trunk/openbios-devel/arch/ppc64/qemu/ldscript Sat Oct 30 17:33:11 2010 (r929) @@ -1,5 +1,5 @@ -OUTPUT_FORMAT(elf32-powerpc) -OUTPUT_ARCH(powerpc) +OUTPUT_FORMAT(elf64-powerpc) +OUTPUT_ARCH(powerpc:common64) /* Initial load address */

1 0

[commit] r928 - trunk/openbios-devel/config/scripts
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 17:19:58 2010 New Revision: 928 URL: http://tracker.coreboot.org/trac/openbios/changeset/928 Log: switch-arch: Whitelist targets that need int128_t ppc64 doesn't use int128_t and thus fails to build when NEED_FAKE_INT128_T gets defined, due to its use in include/kernel/stack.h. Continue to use it for all other targets for which "$targetlongbits" = "64". Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Oct 30 17:17:37 2010 (r927) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Oct 30 17:19:58 2010 (r928) @@ -74,10 +74,14 @@ cflags="$cflags -DNATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH" fi - if test "$host" = "x86" -a "$targetlongbits" = "64"; then - cflags="$cflags -DNEED_FAKE_INT128_T" - elif test "$host" = "ppc" -a "$targetlongbits" = "64" -a `uname -s` = "Darwin"; then - cflags="$cflags -DNEED_FAKE_INT128_T" + if test "$target" = "sparc64" -o "$target" = "ia64" \ + -o "$target" = "amd64" -o "$target" = "x86_64" \ + -o "$target" = "alpha"; then + if test "$host" = "x86"; then + cflags="$cflags -DNEED_FAKE_INT128_T" + elif test "$host" = "ppc" -a `uname -s` = "Darwin"; then + cflags="$cflags -DNEED_FAKE_INT128_T" + fi fi CROSSCFLAGS=$cflags

1 0

[commit] r927 - in trunk/openbios-devel/config: examples scripts
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 17:17:37 2010 New Revision: 927 URL: http://tracker.coreboot.org/trac/openbios/changeset/927 Log: switch-arch: Prepare ppc64 support Detect ppc64 as Big Endian and 64-bit. Reuse arch/ppc/ wherever possible. v3: * Split off int128_t fix. * Rebase to HEAD, add support for qemu-ppc64 target. * Rename $INCLUDEARCH to $BASEARCH and initialize it earlier. * Set both CONFIG_$BASEARCH and CONFIG_$ARCH if they differ. * Use -fno-builtin. * Add ppc64 config, copied from ppc. v2: * Use powerpc64 prefix. * Disable fake int128_t for everything but sparc64. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Added: trunk/openbios-devel/config/examples/ppc64_config.xml - copied unchanged from r926, trunk/openbios-devel/config/examples/ppc_config.xml Modified: trunk/openbios-devel/config/scripts/switch-arch Copied: trunk/openbios-devel/config/examples/ppc64_config.xml (from r926, trunk/openbios-devel/config/examples/ppc_config.xml) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/config/examples/ppc64_config.xml Sat Oct 30 17:17:37 2010 (r927, copy of r926, trunk/openbios-devel/config/examples/ppc_config.xml) @@ -0,0 +1,77 @@ +  + <option name="CONFIG_DEBUG" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_DSTACK" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_RSTACK" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_DICTIONARY" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_INTERNAL" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_INTERPRETER" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_CONSOLE" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_CONSOLE_SERIAL" type="boolean" value="true"/> + <option name="CONFIG_SERIAL_PORT" type="integer" value="0"/> + <option name="CONFIG_SERIAL_SPEED" type="integer" value="115200"/> + <option name="CONFIG_DEBUG_CONSOLE_VGA" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_OFMEM" type="boolean" value="false"/> + + +  + <option name="CONFIG_CMDLINE" type="boolean" value="true"/> + <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> + <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_OFMEM" type="boolean" value="true"/> + <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="4"/> + <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> + <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> + <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> + <option name="CONFIG_LOADER_AOUT" type="boolean" value="false"/> + <option name="CONFIG_LOADER_BOOTINFO" type="boolean" value="true"/> + <option name="CONFIG_LOADER_ELF" type="boolean" value="true"/> + <option name="CONFIG_LOADER_FCODE" type="boolean" value="false"/> + <option name="CONFIG_LOADER_FORTH" type="boolean" value="false"/> + <option name="CONFIG_LOADER_XCOFF" type="boolean" value="true"/> + +  + <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> + <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> + <option name="CONFIG_MAC_PARTS" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> + <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> + <option name="CONFIG_HFS" type="boolean" value="true"/> + <option name="CONFIG_HFSP" type="boolean" value="true"/> + <option name="CONFIG_ISO9660" type="boolean" value="true"/> + <option name="CONFIG_EXT2" type="boolean" value="true"/> + <option name="CONFIG_GRUBFS" type="boolean" value="true"/> + <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> + <option name="CONFIG_FSYS_JFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_MINIX" type="boolean" value="false"/> + <option name="CONFIG_FSYS_REISERFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_XFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_UFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_ISO9660" type="boolean" value="false"/> + <option name="CONFIG_FSYS_FFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_VSTAFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_NTFS" type="boolean" value="false"/> + <option name="CONFIG_FSYS_AFFS" type="boolean" value="false"/> + <option name="CONFIG_DEBUG_FS" type="boolean" value="false"/> + +  + <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> + <option name="CONFIG_RTAS" type="boolean" value="false"/> + +  + <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> + <option name="CONFIG_DEBUG_PCI" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> + <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="2"/> + <option name="CONFIG_IDE_FIRST_UNIT" type="integer" value="1"/> + <option name="CONFIG_IDE_DEV_NAME" type="string" value="ata-%d"/> + <option name="CONFIG_IDE_DEV_TYPE" type="string" value="ata"/> + <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> + <option name="CONFIG_DRIVER_ADB" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_MACIO" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> + <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> + <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Oct 30 15:35:07 2010 (r926) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Oct 30 17:17:37 2010 (r927) @@ -12,7 +12,7 @@ printf "Add \"unix-\" prefix to compile openbios-unix executable (native only)\n" printf "Add \"builtin-\" prefix to compile openbios-builtin executables\n\n" printf "Without prefixes, builtin and unix targets are selected\n\n" - printf "Special targets: mol-ppc briq-ppc pearpc-ppc qemu-ppc xbox-x86\n\n" + printf "Special targets: mol-ppc briq-ppc pearpc-ppc qemu-ppc qemu-ppc64 xbox-x86\n\n" printf "Example: $0 builtin-sparc32 unix-amd64 builtin-amd64\n" exit 0 fi @@ -41,6 +41,7 @@ fi if test "$target" = "powerpc" -o "$target" = "ppc" \ + -o "$target" = "powerpc64" -o "$target" = "ppc64" \ -o "$target" = "mips" -o "$target" = "s390" \ -o "$target" = "sparc32" -o "$target" = "sparc64" \ -o "$target" = "m68k" -o "$target" = "armv4b"; then @@ -52,6 +53,7 @@ # target long bits test if test "$target" = "sparc64" -o "$target" = "ia64" \ -o "$target" = "amd64" -o "$target" = "x86_64" \ + -o "$target" = "powerpc64" -o "$target" = "ppc64" \ -o "$target" = "alpha"; then targetlongbits="64" else @@ -132,7 +134,7 @@ target_list="" for target in $*; do case $target in - unix-*|builtin-*|plain-*|mol-ppc|briq-ppc|pearpc-ppc|qemu-ppc|xbox-x86) + unix-*|builtin-*|plain-*|mol-ppc|briq-ppc|pearpc-ppc|qemu-ppc|qemu-ppc64|xbox-x86) target_list="$target_list $target" ;; cross-*) @@ -189,7 +191,7 @@ pearpc-ppc) pearpc="yes" ;; - builtin-ppc|qemu-ppc) + builtin-ppc|qemu-ppc|builtin-ppc64|qemu-ppc64) qemu="yes" ;; xbox-x86) @@ -215,6 +217,7 @@ esac done + BASEARCH=$ARCH case $ARCH in amd64) select_prefix x86_64 @@ -232,6 +235,13 @@ AS_FLAGS= ;; + ppc64) + select_prefix powerpc64 + CFLAGS="-Wa,-a64 -m64 -msoft-float -fno-builtin" + AS_FLAGS="-Wa,-a64" + BASEARCH=ppc + ;; + sparc32) select_prefix sparc CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" @@ -279,7 +289,7 @@ mkdir -p $OBJDIR/host/include mkdir -p $OBJDIR/host/kernel mkdir -p $OBJDIR/forth - ln -s ../../../include/arch/$ARCH $OBJDIR/target/include/asm + ln -s ../../../include/arch/$BASEARCH $OBJDIR/target/include/asm #compile the host binary with target settings instead #ln -s ../../../include/arch/$HOSTARCH $OBJDIR/host/include/asm if [ "$mol" = "yes" ]; then @@ -328,6 +338,9 @@ echo "<?xml version=\"1.0\"?><config>" > $ODIR/config.xml # Generic config_set_boolean CONFIG_$ARCH >> $ODIR/config.xml + if [ "$BASEARCH" != "$ARCH" ]; then + config_set_boolean CONFIG_$BASEARCH >> $ODIR/config.xml + fi if [ "$mol" = "yes" ]; then config_set_boolean CONFIG_MOL >> $ODIR/config.xml fi

1 0

[commit] r926 - trunk/openbios-devel/config/scripts
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 15:35:07 2010 New Revision: 926 URL: http://tracker.coreboot.org/trac/openbios/changeset/926 Log: switch-arch: Force cross-compilation on Mac OS X host r879 broke ppc cross-compilation from Darwin/ppc host. Symptom is that the assembler chokes on arch/ppc/qemu/start.S. Always use a cross-compiler on Darwin host since *-apple-darwin*-{gcc,ld} would produce Mach-O binaries. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Oct 30 15:18:31 2010 (r925) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Oct 30 15:35:07 2010 (r926) @@ -250,7 +250,7 @@ AS_FLAGS="-Wa,-32" ;; esac - if [ "$ARCH" != "$HOSTARCH" ]; then + if [ "$ARCH" != "$HOSTARCH" -o `uname -s` = "Darwin" ]; then cross="yes" fi crosscflags $HOSTARCH $ARCH

1 0

[commit] r925 - trunk/openbios-devel/arch/sparc32
by repository service 30 Oct '10

30 Oct '10

Author: mcayland Date: Sat Oct 30 15:18:31 2010 New Revision: 925 URL: http://tracker.coreboot.org/trac/openbios/changeset/925 Log: Alter SPARC32 memory routines so that they also update the relevant /memory and /virtual-memory properties. The existing routines hard-coded the initial values into the device tree at startup, and then didn't update them which could allow the romvec memory lists and the device tree memory properties to become out of sync. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sat Oct 30 14:22:06 2010 (r924) +++ trunk/openbios-devel/arch/sparc32/lib.c Sat Oct 30 15:18:31 2010 (r925) @@ -61,6 +61,12 @@ 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; + static struct linux_mlist_v0 totphys[1]; static struct linux_mlist_v0 totmap[1]; static struct linux_mlist_v0 totavail[1]; @@ -407,6 +413,24 @@ } static void +update_memory_properties(void) +{ + /* Update the device tree memory properties from the master + totphys, totmap and totavail romvec arrays */ + mem_reg[0] = 0; + mem_reg[1] = pointer2cell(totphys[0].start_adr); + mem_reg[2] = totphys[0].num_bytes; + + virt_avail[0] = 0; + virt_avail[1] = 0; + virt_avail[2] = pointer2cell(totmap[0].start_adr); + + mem_avail[0] = 0; + mem_avail[1] = pointer2cell(totavail[0].start_adr); + mem_avail[2] = totavail[0].num_bytes; +} + +static void init_romvec_mem(void) { ptphys = totphys; @@ -428,6 +452,13 @@ totmap[0].start_adr = &_start; totmap[0].num_bytes = (unsigned long) &_iomem - (unsigned long) &_start + PAGE_SIZE; + + /* Pointers to device tree memory properties */ + mem_reg = malloc(sizeof(ucell) * 3); + mem_avail = malloc(sizeof(ucell) * 3); + virt_avail = malloc(sizeof(ucell) * 3); + + update_memory_properties(); } char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, @@ -447,8 +478,6 @@ char *obp_dumb_memalloc(char *va, unsigned int size) { - static unsigned int next_free_address = 0xFFEDA000; - size = (size + 7) & ~7; // XXX should use normal memory alloc totavail[0].num_bytes -= size; @@ -461,14 +490,16 @@ // ROM. if (va == NULL) { - // XXX should register virtual memory allocation - va = (char *)(next_free_address - size); - next_free_address -= size; + va = (char *)(totmap[0].start_adr - size); + totmap[0].start_adr -= size; + totmap[0].num_bytes += size; DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); } map_pages((unsigned long)va, totavail[0].num_bytes, 0, size); + update_memory_properties(); + return va; } @@ -481,62 +512,51 @@ void ob_init_mmu(void) { + init_romvec_mem(); + + /* Find the phandles for the /memory and /virtual-memory nodes */ push_str("/memory"); - fword("find-device"); + fword("find-package"); + POP(); + s_phandle_memory = POP(); - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(qemu_mem_size); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); + push_str("/virtual-memory"); + fword("find-package"); + POP(); + s_phandle_mmu = POP(); - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(va2pa((unsigned long)&_start) - PAGE_SIZE); - fword("encode-int"); - fword("encode+"); - push_str("available"); - fword("property"); + /* Setup /memory:reg (totphys) property */ + push_str("/memory"); + fword("find-device"); + PUSH(pointer2cell(mem_reg)); + PUSH(3 * sizeof(ucell)); + push_str("reg"); + PUSH_ph(s_phandle_memory); + fword("encode-property"); + /* Setup /virtual-memory:avail (totmap) property */ push_str("/virtual-memory"); fword("find-device"); + PUSH(pointer2cell(virt_avail)); + PUSH(3 * sizeof(ucell)); + push_str("available"); + PUSH_ph(s_phandle_mmu); + fword("encode-property"); - PUSH(0); - fword("encode-int"); - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH((unsigned long)&_start - PAGE_SIZE); - fword("encode-int"); - fword("encode+"); - - PUSH(0); - fword("encode-int"); - fword("encode+"); - PUSH(va2pa((unsigned long)&_iomem)); - fword("encode-int"); - fword("encode+"); - PUSH(-va2pa((unsigned long)&_iomem)); - fword("encode-int"); - fword("encode+"); + /* Setup /memory:avail (totavail) property */ + push_str("/memory"); + fword("find-device"); + PUSH(pointer2cell(mem_avail)); + PUSH(3 * sizeof(ucell)); push_str("available"); - fword("property"); + PUSH_ph(s_phandle_memory); + fword("encode-property"); PUSH(0); fword("active-package!"); bind_func("pgmap@", pgmap_fetch); bind_func("pgmap!", pgmap_store); bind_func("map-pages", ob_map_pages); - - init_romvec_mem(); } /*

1 0

[commit] r924 - trunk/openbios-devel/drivers
by repository service 30 Oct '10

30 Oct '10

Author: afaerber Date: Sat Oct 30 14:22:06 2010 New Revision: 924 URL: http://tracker.coreboot.org/trac/openbios/changeset/924 Log: adb: Don't assume that pointers fit in 32 bits The adb_dev_t state field is used to store a adb_kbd_t pointer. It is unused in the mouse driver. v2: * Change field type from uint32_t to void* to avoid uintptr_t casts in keyboard driver. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Acked-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/adb_bus.h trunk/openbios-devel/drivers/adb_kbd.c Modified: trunk/openbios-devel/drivers/adb_bus.h ============================================================================== --- trunk/openbios-devel/drivers/adb_bus.h Thu Oct 28 22:53:58 2010 (r923) +++ trunk/openbios-devel/drivers/adb_bus.h Sat Oct 30 14:22:06 2010 (r924) @@ -32,7 +32,7 @@ adb_bus_t *bus; uint8_t addr; uint8_t type; - uint32_t state; + void *state; }; #define ADB_BUF_SIZE 8 Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Thu Oct 28 22:53:58 2010 (r923) +++ trunk/openbios-devel/drivers/adb_kbd.c Sat Oct 30 14:22:06 2010 (r924) @@ -483,7 +483,7 @@ int key; int ret; - kbd = (void *)dev->state; + kbd = dev->state; if (kbd->len > 0) { ret = kbd->sequence[kbd->len-- - 1]; @@ -531,7 +531,7 @@ ADB_kbd_us, ADB_sequences); kbd->next_key = -1; kbd->len = 0; - dev->state = (int32_t)kbd; + dev->state = kbd; my_adb_dev = dev; }

1 0

[commit] r923 - trunk/openbios-devel/arch/sparc32
by repository service 28 Oct '10

28 Oct '10

Author: mcayland Date: Thu Oct 28 22:53:58 2010 New Revision: 923 URL: http://tracker.coreboot.org/trac/openbios/changeset/923 Log: Change SPARC32 memory allocator to allocate memory starting from just below the OpenBIOS image downwards. The existing code appeared to be allocating memory from the wrong property (map rather than avail) and so rather than allocating memory starting from just below the OpenBIOS image downwards, it was simply reducing the reported size of the OpenBIOS image. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/lib.c Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Mon Oct 25 22:48:45 2010 (r922) +++ trunk/openbios-devel/arch/sparc32/lib.c Thu Oct 28 22:53:58 2010 (r923) @@ -451,9 +451,9 @@ size = (size + 7) & ~7; // XXX should use normal memory alloc - totmap[0].num_bytes -= size; + totavail[0].num_bytes -= size; DPRINTF("obp_dumb_memalloc va 0x%p size %x at 0x%x\n", va, size, - totmap[0].num_bytes); + totavail[0].num_bytes); // If va is null, the allocator is supposed to pick a "suitable" address. // (See OpenSolaric prom_alloc.c) There's not any real guidance as @@ -467,7 +467,7 @@ DPRINTF("obp_dumb_memalloc req null -> 0x%p\n", va); } - map_pages((unsigned long)va, totmap[0].num_bytes, 0, size); + map_pages((unsigned long)va, totavail[0].num_bytes, 0, size); return va; }

1 0

SPARC32: Trying to increase machine memory and failing
by Mark Cave-Ayland 26 Oct '10

26 Oct '10

Hi all, As it still seems there are some memory issues with SPARC32 (even with the new patches), I've just tried increasing the memory for the Forth machine from 128K to 256K by making the following change in arch/sparc32/openbios.c: --- arch/sparc32/openbios.c (revision 918) +++ arch/sparc32/openbios.c (working copy) @@ -26,7 +26,7 @@ #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -#define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ +#define MEMORY_SIZE (256*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" #define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) However, with this change in place OpenBIOS just freezes on boot after emitting "Configuration device id QEMU version 1 machine id 32". Does anyone know anything about the SPARC32 memory code to know why changing this constant doesn't just work? 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 4

[commit] r922 - in trunk/openbios-devel: arch/ppc/qemu drivers fs/ext2 fs/grubfs fs/hfs fs/hfsplus fs/iso9660 kernel libc libopenbios packages
by repository service 25 Oct '10

25 Oct '10

Author: afaerber Date: Mon Oct 25 22:48:45 2010 New Revision: 922 URL: http://tracker.coreboot.org/trac/openbios/changeset/922 Log: Don't assume that pointer and cell size are identical, part 1 On ppc64, cell size is 32 bits but pointers are 64-bit. Thus, direct casts result in warnings, treated as errors. Use [u]intptr_t cast or cell2pointer and pointer2cell macros as necessary. v2: * Drop changes related to physical addresses since physical addresses may be wider than pointers (e.g., 36 bits on sparc32, as pointed out by Blue). * Drop changes to cell2pointer() and pointer2cell() for now. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/drivers/adb_kbd.c trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/kernel/internal.c trunk/openbios-devel/libc/diskio.c trunk/openbios-devel/libc/extra.c trunk/openbios-devel/libopenbios/bindings.c trunk/openbios-devel/libopenbios/bootinfo_load.c trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/libopenbios/initprogram.c trunk/openbios-devel/libopenbios/ofmem_common.c trunk/openbios-devel/libopenbios/xcoff_load.c trunk/openbios-devel/packages/deblocker.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/nvram.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.c Mon Oct 25 22:48:45 2010 (r922) @@ -40,13 +40,13 @@ { ucell addr = 0xdeadbeef; - if( PC >= (ucell) dict && PC <= (ucell) dict + dicthead ) - addr = *(ucell *) PC; + if( PC >= pointer2cell(dict) && PC <= pointer2cell(dict) + dicthead ) + addr = *(ucell *)cell2pointer(PC); - printk("panic: segmentation violation at %x\n", (int)segv_addr); - printk("dict=0x%x here=0x%x(dict+0x%x) pc=0x%x(dict+0x%x)\n", - (int)dict, (int)(dict + dicthead), dicthead, - PC, PC - (ucell) dict); + printk("panic: segmentation violation at 0x%p\n", segv_addr); + printk("dict=0x%p here=0x%p(dict+0x%x) pc=0x%x(dict+0x%x)\n", + dict, (char*)dict + dicthead, dicthead, + PC, PC - pointer2cell(dict)); printk("dstackcnt=%d rstackcnt=%d instruction=%x\n", dstackcnt, rstackcnt, addr); @@ -75,8 +75,8 @@ * to initialize the memory allocator */ - PUSH( (ucell)memory ); - PUSH( (ucell)memory + MEMORY_SIZE ); + PUSH( pointer2cell(memory) ); + PUSH( pointer2cell(memory) + MEMORY_SIZE ); } int Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Mon Oct 25 22:48:45 2010 (r922) @@ -183,7 +183,7 @@ kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); if (kernel_size) { kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR); - kernel_cmdline = (const char *) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE); + kernel_cmdline = (const char *)(uintptr_t) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE); initrd_image = fw_cfg_read_i32(FW_CFG_INITRD_ADDR); initrd_size = fw_cfg_read_i32(FW_CFG_INITRD_SIZE); printk("[ppc] Kernel already loaded (0x%8.8lx + 0x%8.8lx) " Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Mon Oct 25 22:48:45 2010 (r922) @@ -71,7 +71,7 @@ tty_read( void ) { int ch, len = POP(); - char *p = (char*)POP(); + char *p = (char*)cell2pointer(POP()); int ret=0; if( len > 0 ) { @@ -91,7 +91,7 @@ tty_write( void ) { int i, len = POP(); - char *p = (char*)POP(); + char *p = (char*)cell2pointer(POP()); for( i=0; i<len; i++ ) putchar( *p++ ); RET( len ); Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Mon Oct 25 22:48:45 2010 (r922) @@ -105,7 +105,7 @@ ofmem_t* ofmem_arch_get_private(void) { - return (ofmem_t*)(get_heap_top() - OFMEM_SIZE); + return (ofmem_t*)cell2pointer(get_heap_top() - OFMEM_SIZE); } void* ofmem_arch_get_malloc_base(void) Modified: trunk/openbios-devel/drivers/adb_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/adb_kbd.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/drivers/adb_kbd.c Mon Oct 25 22:48:45 2010 (r922) @@ -556,7 +556,7 @@ char *addr; int len, key, i; len=POP(); - addr=(char *)POP(); + addr=(char *)cell2pointer(POP()); for (i = 0; i < len; i++) { key = adb_kbd_read(my_adb_dev); Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/drivers/escc.c Mon Oct 25 22:48:45 2010 (r922) @@ -137,7 +137,7 @@ int len; len = POP(); - addr = (char *)POP(); + addr = (char *)cell2pointer(POP()); if (len < 1) printk("escc_read: bad len, addr %x len %x\n", (unsigned int)addr, len); @@ -158,7 +158,7 @@ int i, len; len = POP(); - addr = (unsigned char *)POP(); + addr = (unsigned char *)cell2pointer(POP()); for (i = 0; i < len; i++) { uart_putchar(*address, addr[i]); Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/drivers/ide.c Mon Oct 25 22:48:45 2010 (r922) @@ -1190,7 +1190,7 @@ { cell n = POP(), cnt=n; ucell blk = POP(); - unsigned char *dest = (unsigned char *)POP(); + unsigned char *dest = (unsigned char *)cell2pointer(POP()); struct ide_drive *drive = *(struct ide_drive **)idx; IDE_DPRINTF("ob_ide_read_blocks %lx block=%ld n=%ld\n", Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Mon Oct 25 22:48:45 2010 (r922) @@ -144,7 +144,7 @@ ext2_files_read( ext2_info_t *mi ) { int count = POP(); - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); ext2_COMMON *common = mi->common; if (common->type != FILE) @@ -177,7 +177,7 @@ static void ext2_files_load( ext2_info_t *mi ) { - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); int count; ext2_COMMON *common = mi->common; @@ -201,14 +201,14 @@ if (common->type != FILE) RET( 0 ); - RET( (ucell) strdup(common->file->path) ); + RET( pointer2cell(strdup(common->file->path)) ); } /* ( -- cstr ) */ static void ext2_files_get_fstype( ext2_info_t *mi ) { - PUSH( (ucell)strdup("ext2") ); + PUSH( pointer2cell(strdup("ext2")) ); } /* static method, ( pathstr len ihandle -- ) */ Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Mon Oct 25 22:48:45 2010 (r922) @@ -238,7 +238,7 @@ grubfs_files_read( grubfs_info_t *mi ) { int count = POP(); - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); grubfile_t *file = mi->gfs->fd; int ret; @@ -295,7 +295,7 @@ static void grubfs_files_load( grubfs_info_t *mi ) { - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); int count, ret; grubfile_t *file = mi->gfs->fd; @@ -314,7 +314,7 @@ grubfile_t *file = mi->gfs->fd; const char *path = file->path; - RET( (ucell) strdup(path) ); + RET( pointer2cell(strdup(path)) ); } /* ( -- cstr ) */ @@ -323,7 +323,7 @@ { grubfs_t *gfs = mi->gfs; - PUSH( (ucell)strdup(gfs->fsys->name) ); + PUSH( pointer2cell(strdup(gfs->fsys->name)) ); } Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Mon Oct 25 22:48:45 2010 (r922) @@ -359,7 +359,7 @@ hfs_files_read( hfs_info_t *mi ) { int count = POP(); - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); hfscommon *common = mi->common; if (common->type != FILE) @@ -402,7 +402,7 @@ static void hfs_files_load( hfs_info_t *mi ) { - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); int count; hfscommon *common = mi->common; @@ -461,14 +461,14 @@ if( strlen(buf) >= sizeof(buf) ) RET( 0 ); - RET( (ucell) strdup(buf+start) ); + RET( pointer2cell(strdup(buf+start)) ); } /* ( -- cstr ) */ static void hfs_files_get_fstype( hfs_info_t *mi ) { - PUSH( (ucell)strdup("HFS") ); + PUSH( pointer2cell(strdup("HFS")) ); } /* ( -- cstr|0 ) */ @@ -486,7 +486,7 @@ volname[0] = '\0'; } - PUSH ((ucell)volname); + PUSH(pointer2cell(volname)); } /* static method, ( pathstr len ihandle -- ) */ Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Mon Oct 25 22:48:45 2010 (r922) @@ -264,7 +264,7 @@ hfsp_files_read( hfsp_info_t *mi ) { int count = POP(); - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); hfsp_file_t *t = mi->hfspfile; volume *vol = t->rec.tree->vol; @@ -350,7 +350,7 @@ static void hfsp_files_load( hfsp_info_t *mi ) { - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); hfsp_file_t *t = mi->hfspfile; volume *vol = t->rec.tree->vol; @@ -388,7 +388,7 @@ static void hfsp_files_get_fstype( hfsp_info_t *mi ) { - PUSH( (ucell)strdup("HFS+") ); + PUSH( pointer2cell(strdup("HFS+")) ); } /* ( -- cstr ) */ @@ -405,7 +405,7 @@ strncpy( buf, t->path, strlen(t->path) ); buf[strlen(t->path)] = 0; - PUSH ((ucell)buf); + PUSH(pointer2cell(buf)); } /* ( -- success? ) */ @@ -434,7 +434,7 @@ volname[0] = '\0'; } - PUSH ((ucell)volname); + PUSH(pointer2cell(volname)); } /* static method, ( pathstr len ihandle -- ) */ Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Mon Oct 25 22:48:45 2010 (r922) @@ -90,7 +90,7 @@ iso9660_files_read( iso9660_info_t *mi ) { int count = POP(); - char *buf = (char *)POP(); + char *buf = (char *)cell2pointer(POP()); int ret; if ( mi->common->type != FILE ) @@ -137,7 +137,7 @@ static void iso9660_files_load( iso9660_info_t *mi) { - char *buf = (char*)POP(); + char *buf = (char*)cell2pointer(POP()); int ret, size; if ( mi->common->type != FILE ) Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/kernel/internal.c Mon Oct 25 22:48:45 2010 (r922) @@ -208,7 +208,7 @@ exit(1); #else void (*funcptr) (void); - funcptr=(void *)POP(); + funcptr=(void *)cell2pointer(POP()); dbg_interp_printk("call: %x", funcptr); funcptr(); #endif @@ -329,7 +329,7 @@ #ifndef FCOMPILER static ucell get_myself(void) { - static ucell **myself = NULL; + static ucell **myself = NULL; if( !myself ) myself = (ucell**)findword("my-self") + 1; return (*myself && **myself) ? (ucell)**myself : 0; @@ -337,35 +337,35 @@ static void doivar(void) { - ucell r, *p = (ucell *)(*(ucell *) PC + sizeof(ucell)); + ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); ucell ibase = get_myself(); dbg_interp_printk("ivar, offset: %d size: %d (ibase %d)\n", p[0], p[1], ibase ); - r = ibase ? ibase + p[0] : (ucell)&p[2]; + r = ibase ? ibase + p[0] : pointer2cell(&p[2]); PUSH( r ); } static void doival(void) { - ucell r, *p = (ucell *)(*(ucell *) PC + sizeof(ucell)); + ucell r, *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); ucell ibase = get_myself(); dbg_interp_printk("ivar, offset: %d size: %d\n", p[0], p[1] ); - r = ibase ? ibase + p[0] : (ucell)&p[2]; - PUSH( *(ucell *)r ); + r = ibase ? ibase + p[0] : pointer2cell(&p[2]); + PUSH( *(ucell *)cell2pointer(r) ); } static void doidefer(void) { - ucell *p = (ucell *)(*(ucell *) PC + sizeof(ucell)); + ucell *p = (ucell *)(*(ucell *) cell2pointer(PC) + sizeof(ucell)); ucell ibase = get_myself(); dbg_interp_printk("doidefer, offset: %d size: %d\n", p[0], p[1] ); PUSHR(PC); - PC = ibase ? ibase + p[0] : (ucell)&p[2]; + PC = ibase ? ibase + p[0] : pointer2cell(&p[2]); PC -= sizeof(ucell); } #else Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/libc/diskio.c Mon Oct 25 22:48:45 2010 (r922) @@ -150,7 +150,7 @@ if( lookup_xt(fdp->ih, "get-path", &fdp->get_path_xt) ) return NULL; call_package( fdp->get_path_xt, fdp->ih ); - return (char*)POP(); + return (char*)cell2pointer(POP()); } const char * @@ -160,7 +160,7 @@ if( lookup_xt(fdp->ih, "volume-name", &fdp->volume_name_xt) ) return NULL; call_package( fdp->volume_name_xt, fdp->ih ); - return (char*)POP(); + return (char*)cell2pointer(POP()); } const char * @@ -170,7 +170,7 @@ if( lookup_xt(fdp->ih, "get-fstype", &fdp->get_fstype_xt) ) return NULL; call_package( fdp->get_fstype_xt, fdp->ih ); - return (char*)POP(); + return (char*)cell2pointer(POP()); } int @@ -183,7 +183,7 @@ if (fd != -1) { fdp = file_descriptors[fd]; - PUSH( (ucell)buf ); + PUSH( pointer2cell(buf) ); PUSH( cnt ); call_package( fdp->read_xt, fdp->ih ); ret = POP(); Modified: trunk/openbios-devel/libc/extra.c ============================================================================== --- trunk/openbios-devel/libc/extra.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/libc/extra.c Mon Oct 25 22:48:45 2010 (r922) @@ -39,7 +39,7 @@ i = vsnprintf(buf, sizeof(buf), fmt, args); va_end(args); - PUSH((ucell)buf); + PUSH(pointer2cell(buf)); PUSH(i); fword("type"); Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/libopenbios/bindings.c Mon Oct 25 22:48:45 2010 (r922) @@ -28,7 +28,7 @@ void push_str( const char *str ) { - PUSH( (ucell)str ); + PUSH( pointer2cell(str) ); PUSH( str ? strlen(str) : 0 ); } @@ -101,7 +101,7 @@ void bind_func( const char *name, void (*func)(void) ) { - PUSH( (ucell)func ); + PUSH( pointer2cell(func) ); push_str( name ); fword("is-cfunc"); } @@ -111,7 +111,7 @@ { PUSH_xt( xt ); PUSH( arg ); - PUSH( (cell)func ); + PUSH( pointer2cell(func) ); push_str( name ); fword("is-xt-cfunc"); } @@ -119,7 +119,7 @@ xt_t bind_noname_func( void (*func)(void) ) { - PUSH( (ucell)func ); + PUSH( pointer2cell(func) ); fword("is-noname-cfunc"); return POP_xt(); } @@ -249,7 +249,7 @@ pop_fstr_copy( void ) { int len = POP(); - char *str, *p = (char*)POP(); + char *str, *p = (char*)cell2pointer(POP()); if( !len ) return NULL; str = malloc( len + 1 ); @@ -279,7 +279,7 @@ printk("set_property: NULL phandle\n"); return; } - PUSH((ucell)buf); + PUSH(pointer2cell(buf)); PUSH(len); push_str( name ); PUSH_ph(ph); @@ -309,7 +309,7 @@ len = POP(); if( retlen ) *retlen = len; - return (char*)POP(); + return (char*)cell2pointer(POP()); } u32 @@ -426,7 +426,7 @@ call1_func( void ) { void (*func)(cell v); - func = (void*)POP(); + func = (void*)cell2pointer(POP()); (*func)( POP() ); } @@ -455,7 +455,7 @@ char *buf = NULL; if( xt ) { enterforth( xt ); - buf = (char*)POP(); + buf = (char*)cell2pointer(POP()); } (*(initfunc)methods[i].func)( buf ); continue; @@ -463,7 +463,7 @@ if( !size ) bind_func( methods[i].name, methods[i].func ); else - bind_xtfunc( methods[i].name, xt, (ucell)methods[i].func, + bind_xtfunc( methods[i].name, xt, pointer2cell(methods[i].func), &call1_func ); } Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/bootinfo_load.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/libopenbios/bootinfo_load.c Mon Oct 25 22:48:45 2010 (r922) @@ -156,7 +156,7 @@ filename = get_filename(bootpath, &directory); feval("load-base"); - base = (char*)POP(); + base = (char*)cell2pointer(POP()); feval("load-size"); size = POP(); Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/libopenbios/elf_load.c Mon Oct 25 22:48:45 2010 (r922) @@ -478,12 +478,12 @@ Elf_phdr *phdr; size_t size, total_size = 0; char *addr; - cell tmp; + uintptr_t tmp; /* TODO: manage ELF notes section */ feval("0 state-valid !"); feval("load-base"); - base = (char*)POP(); + base = (char*)cell2pointer(POP()); ehdr = (Elf_ehdr *)base; Modified: trunk/openbios-devel/libopenbios/initprogram.c ============================================================================== --- trunk/openbios-devel/libopenbios/initprogram.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/libopenbios/initprogram.c Mon Oct 25 22:48:45 2010 (r922) @@ -41,42 +41,42 @@ addr = POP(); #ifdef CONFIG_LOADER_AOUT - if (is_aout((struct exec *)addr)) { + if (is_aout((struct exec *)cell2pointer(addr))) { aout_init_program(); return; } #endif #ifdef CONFIG_LOADER_BOOTINFO - if (is_bootinfo((char *)addr)) { + if (is_bootinfo((char *)cell2pointer(addr))) { bootinfo_init_program(); return; } #endif #ifdef CONFIG_LOADER_ELF - if (is_elf((Elf_ehdr *)addr)) { + if (is_elf((Elf_ehdr *)cell2pointer(addr))) { elf_init_program(); return; } #endif #ifdef CONFIG_LOADER_FCODE - if (is_fcode((unsigned char *)addr)) { + if (is_fcode((unsigned char *)cell2pointer(addr))) { fcode_init_program(); return; } #endif #ifdef CONFIG_LOADER_FORTH - if (is_forth((char *)addr)) { + if (is_forth((char *)cell2pointer(addr))) { forth_init_program(); return; } #endif #ifdef CONFIG_LOADER_XCOFF - if (is_xcoff((COFF_filehdr_t *)addr)) { + if (is_xcoff((COFF_filehdr_t *)cell2pointer(addr))) { xcoff_init_program(); return; } Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Mon Oct 25 22:48:45 2010 (r922) @@ -110,7 +110,7 @@ top = ofmem_arch_get_heap_top(); - if( (ucell)ofmem->next_malloc + size > top ) { + if( pointer2cell(ofmem->next_malloc) + size > top ) { printk("out of malloc memory (%x)!\n", size ); return NULL; } @@ -183,10 +183,9 @@ printk("ofmem_set_property: NULL phandle\n"); return; } - PUSH((ucell)buf); + PUSH(pointer2cell(buf)); PUSH(len); - PUSH((ucell)name); - PUSH(strlen(name)); + push_str(name); PUSH_ph(ph); fword("encode-property"); } Modified: trunk/openbios-devel/libopenbios/xcoff_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/xcoff_load.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/libopenbios/xcoff_load.c Mon Oct 25 22:48:45 2010 (r922) @@ -64,7 +64,7 @@ feval("0 state-valid !"); feval("load-base"); - base = (char*)POP(); + base = (char*)cell2pointer(POP()); fhdr = (COFF_filehdr_t*)base; @@ -111,22 +111,22 @@ if (strcmp(shdr->s_name, ".text") == 0) { - memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, + memcpy((char*)(uintptr_t)shdr->s_vaddr, base + shdr->s_scnptr, shdr->s_size); total_size += shdr->s_size; #ifdef CONFIG_PPC - flush_icache_range((char*)shdr->s_vaddr, - (char*)(shdr->s_vaddr + shdr->s_size)); + flush_icache_range((char*)(uintptr_t)shdr->s_vaddr, + (char*)(uintptr_t)(shdr->s_vaddr + shdr->s_size)); #endif } else if (strcmp(shdr->s_name, ".data") == 0) { - memcpy((char*)shdr->s_vaddr, base + shdr->s_scnptr, + memcpy((char*)(uintptr_t)shdr->s_vaddr, base + shdr->s_scnptr, shdr->s_size); total_size += shdr->s_size; } else if (strcmp(shdr->s_name, ".bss") == 0) { - memset((void *)shdr->s_vaddr, 0, shdr->s_size); + memset((void *)(uintptr_t)shdr->s_vaddr, 0, shdr->s_size); total_size += shdr->s_size; } else { DPRINTF(" Skip '%s' section\n", shdr->s_name); @@ -137,7 +137,7 @@ DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); // Initialise saved-program-state - PUSH(*(uint32_t*)ahdr->entry); + PUSH(*(uint32_t*)(uintptr_t)ahdr->entry); feval("saved-program-state >sps.entry !"); PUSH(total_size); feval("saved-program-state >sps.file-size !"); Modified: trunk/openbios-devel/packages/deblocker.c ============================================================================== --- trunk/openbios-devel/packages/deblocker.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/packages/deblocker.c Mon Oct 25 22:48:45 2010 (r922) @@ -96,7 +96,7 @@ #define DO_IO( xt, buf, blk, n ) \ - ({ PUSH3((ucell)(buf), blk, n); call_parent(xt); POP(); }) + ({ PUSH3(pointer2cell(buf), blk, n); call_parent(xt); POP(); }) typedef struct { /* block operation */ @@ -141,7 +141,7 @@ do_readwrite( deblk_info_t *di, int is_write, xt_t xt ) { int blk, i, n, len = POP(); - char *dest = (char*)POP(); + char *dest = (char*)cell2pointer(POP()); int last=0, retlen=0; work_t w[3]; ducell mark = ((ducell)di->mark_hi << BITS) | di->mark_lo; Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/packages/disk-label.c Mon Oct 25 22:48:45 2010 (r922) @@ -80,7 +80,7 @@ call_package(di->parent_seek_xt, my_parent()); POP(); - PUSH((ucell)block0); + PUSH(pointer2cell(block0)); PUSH(sizeof(block0)); call_package(di->parent_read_xt, my_parent()); status = POP(); @@ -88,7 +88,7 @@ goto out; /* Find partition handler */ - PUSH( (ucell)block0 ); + PUSH( pointer2cell(block0) ); selfword("find-part-handler"); ph = POP_ph(); if( ph ) { Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/packages/mac-parts.c Mon Oct 25 22:48:45 2010 (r922) @@ -42,7 +42,7 @@ DECLARE_NODE( macparts, INSTALL_OPEN, sizeof(macparts_info_t), "+/packages/mac-parts" ); #define SEEK( pos ) ({ DPUSH(pos); call_parent(di->seek_xt); POP(); }) -#define READ( buf, size ) ({ PUSH((ucell)buf); PUSH(size); call_parent(di->read_xt); POP(); }) +#define READ( buf, size ) ({ PUSH(pointer2cell(buf)); PUSH(size); call_parent(di->read_xt); POP(); }) /* ( open -- flag ) */ static void @@ -267,7 +267,7 @@ static void macparts_probe( macparts_info_t *dummy ) { - desc_map_t *dmap = (desc_map_t*)POP(); + desc_map_t *dmap = (desc_map_t*)cell2pointer(POP()); DPRINTF("macparts_probe %x ?= %x\n", dmap->sbSig, DESC_MAP_SIGNATURE); if( __be16_to_cpu(dmap->sbSig) != DESC_MAP_SIGNATURE ) Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/packages/nvram.c Mon Oct 25 22:48:45 2010 (r922) @@ -167,7 +167,7 @@ void update_nvram( void ) { - PUSH( (ucell)nvram.config->data ); + PUSH( pointer2cell(nvram.config->data) ); PUSH( nvram.config_size ); fword("nvram-store-configs"); arch_nvram_put( nvram.data ); @@ -202,7 +202,7 @@ nvram.config_size = nvpart_size(p) - 0x10; if( !once++ ) { - PUSH( (ucell)p->data ); + PUSH( pointer2cell(p->data) ); PUSH( nvram.config_size ); fword("nvram-load-configs"); } @@ -256,7 +256,7 @@ nvram_read( nvram_ibuf_t *nd ) { int len = POP(); - char *p = (char*)POP(); + char *p = (char*)cell2pointer(POP()); int n=0; while( nd->mark_lo < nvram.size && n < len ) { @@ -272,7 +272,7 @@ nvram_write( nvram_ibuf_t *nd ) { int len = POP(); - char *p = (char*)POP(); + char *p = (char*)cell2pointer(POP()); int n=0; while( nd->mark_lo < nvram.size && n < len ) { Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/packages/pc-parts.c Mon Oct 25 22:48:45 2010 (r922) @@ -38,7 +38,7 @@ DECLARE_NODE( pcparts, INSTALL_OPEN, sizeof(pcparts_info_t), "+/packages/pc-parts" ); #define SEEK( pos ) ({ DPUSH(pos); call_parent(di->seek_xt); POP(); }) -#define READ( buf, size ) ({ PUSH((ucell)buf); PUSH(size); call_parent(di->read_xt); POP(); }) +#define READ( buf, size ) ({ PUSH(pointer2cell(buf)); PUSH(size); call_parent(di->read_xt); POP(); }) /* three helper functions */ @@ -294,7 +294,7 @@ static void pcparts_probe( pcparts_info_t *dummy ) { - unsigned char *buf = (unsigned char *)POP(); + unsigned char *buf = (unsigned char *)cell2pointer(POP()); DPRINTF("probing for PC partitions\n"); Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Mon Oct 25 21:26:40 2010 (r921) +++ trunk/openbios-devel/packages/video.c Mon Oct 25 22:48:45 2010 (r922) @@ -244,7 +244,7 @@ { int count = POP(); int start = POP(); - unsigned char *p = (unsigned char*)POP(); + unsigned char *p = (unsigned char*)cell2pointer(POP()); int i; for( i=0; i<count; i++, p+=3 ) { @@ -289,7 +289,7 @@ int len; len = POP(); - addr = (char *)POP(); + addr = (char *)cell2pointer(POP()); console_draw_fstr(addr, len); PUSH(len);

1 0

[PATCH] CIF: Fix trace output for claim and release
by Andreas Färber 25 Oct '10

25 Oct '10

A misplaced digit 8 made it look as if some signedness issue was present somewhere between libopenbios/client.c:of_client_interface() and arch/ppc/qemu/methods.c:ciface_claim(). This is not the case; despite unsigned long -> ucell -> cell -> ucell conversions, PUSH'ing 0x81234567 and POP'ing works as expected. Fix the format string to avoid such confusion. Add zero-padding while at it. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- libopenbios/client.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libopenbios/client.c b/libopenbios/client.c index a93d8a3..d8a9fdf 100644 --- a/libopenbios/client.c +++ b/libopenbios/client.c @@ -132,10 +132,10 @@ static void dump_service(prom_args_t *pb) pb->args[0], pb->args[1], pb->args[2]); #endif } else if (strcmp(pb->service, "claim") == 0) { - printk("claim(0x8%lx, %ld, %ld) = ", + printk("claim(0x%08lx, %ld, %ld) = ", pb->args[0], pb->args[1], pb->args[2]); } else if (strcmp(pb->service, "release") == 0) { - printk("release(0x8%lx, %ld)\n", + printk("release(0x%08lx, %ld)\n", pb->args[0], pb->args[1]); } else if (strcmp(pb->service, "boot") == 0) { printk("boot \"%s\"\n", (char*)pb->args[0]); -- 1.7.3

1 1

[commit] r921 - trunk/openbios-devel/libopenbios
by repository service 25 Oct '10

25 Oct '10

Author: afaerber Date: Mon Oct 25 21:26:40 2010 New Revision: 921 URL: http://tracker.coreboot.org/trac/openbios/changeset/921 Log: CIF: Fix trace output for claim and release A misplaced digit 8 made it look as if some signedness issue was present somewhere between libopenbios/client.c:of_client_interface() and arch/ppc/qemu/methods.c:ciface_claim(). This is not the case; despite unsigned long -> ucell -> cell -> ucell conversions, PUSH'ing 0x81234567 and POP'ing works as expected. Fix the format string to avoid such confusion. Add zero-padding while at it. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Oct 24 23:34:21 2010 (r920) +++ trunk/openbios-devel/libopenbios/client.c Mon Oct 25 21:26:40 2010 (r921) @@ -132,10 +132,10 @@ pb->args[0], pb->args[1], pb->args[2]); #endif } else if (strcmp(pb->service, "claim") == 0) { - printk("claim(0x8%lx, %ld, %ld) = ", + printk("claim(0x%08lx, %ld, %ld) = ", pb->args[0], pb->args[1], pb->args[2]); } else if (strcmp(pb->service, "release") == 0) { - printk("release(0x8%lx, %ld)\n", + printk("release(0x%08lx, %ld)\n", pb->args[0], pb->args[1]); } else if (strcmp(pb->service, "boot") == 0) { printk("boot \"%s\"\n", (char*)pb->args[0]);

1 0

[commit] r920 - trunk/openbios-devel/arch/sparc32
by repository service 24 Oct '10

24 Oct '10

Author: mcayland Date: Sun Oct 24 23:34:21 2010 New Revision: 920 URL: http://tracker.coreboot.org/trac/openbios/changeset/920 Log: Reduce SPARC32 stack space since otherwise compiling with -O0 results in a 'rom: requested regions overlap (rom /home/build/rel-qemu-git/share/qemu/openbios-sparc32. free=0x0000000070101000, addr=0x0000000070000000) rom loading failed' error when starting qemu. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/context.c Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Oct 24 22:20:14 2010 (r919) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Oct 24 23:34:21 2010 (r920) @@ -11,7 +11,7 @@ #include "openbios.h" #define MAIN_STACK_SIZE 16384 -#define IMAGE_STACK_SIZE 4096*4 +#define IMAGE_STACK_SIZE 4096*2 #define debug printk

1 0

[commit] r919 - trunk/openbios-devel/arch/sparc32
by repository service 24 Oct '10

24 Oct '10

Author: mcayland Date: Sun Oct 24 22:20:14 2010 New Revision: 919 URL: http://tracker.coreboot.org/trac/openbios/changeset/919 Log: Commit more readable version of obp_fortheval_v2 as posted to the mailing list, plus increase the default client image stack size on SPARC32 to help Solaris 8 boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Oct 24 21:55:27 2010 (r918) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Oct 24 22:20:14 2010 (r919) @@ -11,7 +11,7 @@ #include "openbios.h" #define MAIN_STACK_SIZE 16384 -#define IMAGE_STACK_SIZE 4096*2 +#define IMAGE_STACK_SIZE 4096*4 #define debug printk Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 24 21:55:27 2010 (r918) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 24 22:20:14 2010 (r919) @@ -424,41 +424,30 @@ void obp_fortheval_v2(char *str, int arg0, int arg1, int arg2, int arg3, int arg4) { - int pusharg = 0; + int dstacktmp = 0; // It seems Solaris passes up to 5 arguments which should be pushed onto the Forth - // stack for execution. However the API doesn't provide for a way to pass the number - // of arguments actually passed. Hence we start at arg4 and then starting from the - // first non-zero argument, we push all subsequent arguments onto the stack down to - // arg0. - - if (arg4) { - PUSH(arg4); - pusharg = 1; - } - - if (arg3 || pusharg == 1 ) { - PUSH(arg3); - pusharg = 1; - } - - if (arg2 || pusharg == 1) { - PUSH(arg2); - pusharg = 1; - } - - if (arg1 || pusharg == 1 ) { - PUSH(arg1); - pusharg = 1; - } - - if (arg0 || pusharg == 1) { - PUSH(arg0); - } + // stack for execution. However the API doesn't provide for a way to specify the number + // of arguments actually being passed. Hence we preserve the state of the Forth stack + // before, push all the arguments, execute the Forth, then restore the stack to its + // previous state. This enables us to have a variable number of arguments and still + // preserve stack state between subsequent calls. + + // Preserve stack state + dstacktmp = dstackcnt; + + PUSH(arg4); + PUSH(arg3); + PUSH(arg2); + PUSH(arg1); + PUSH(arg0); DPRINTF("obp_fortheval_v2(%s)\n", str); push_str(str); fword("eval"); + + // Restore stack state + dstackcnt = dstacktmp; } void *

1 0

[commit] r918 - trunk/openbios-devel/arch/sparc32
by repository service 24 Oct '10

24 Oct '10

Author: mcayland Date: Sun Oct 24 21:55:27 2010 New Revision: 918 URL: http://tracker.coreboot.org/trac/openbios/changeset/918 Log: Use wrappers around all romvec functions on SPARC32 to flush register window and preserve global registers. This appears to resolve issues with OpenBIOS crashing when calling OBP functions through the romvec interface due to stack/register issues. Note that this patch also implements pv_printf() and pv_putstr() which appears to fix issues with displaying error messages during Solaris 8 boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Added: trunk/openbios-devel/arch/sparc32/call-romvec.S trunk/openbios-devel/arch/sparc32/romvec.h Modified: trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/build.xml trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/lib.c trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Oct 24 20:55:59 2010 (r917) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Oct 24 21:55:27 2010 (r918) @@ -13,9 +13,6 @@ extern struct context *__context; unsigned int start_elf(unsigned long entry_point, unsigned long param); -// romvec.c -void *init_openprom(void); - // boot.c extern const char *bootpath; extern void boot(void); @@ -45,10 +42,3 @@ void ob_init_mmu(void); void init_mmu_swift(void); -char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, - unsigned int size); -void obp_dumb_munmap(__attribute__((unused)) char *va, - __attribute__((unused)) unsigned int size); -char *obp_dumb_memalloc(char *va, unsigned int size); -void obp_dumb_memfree(__attribute__((unused))char *va, - __attribute__((unused))unsigned sz); Modified: trunk/openbios-devel/arch/sparc32/build.xml ============================================================================== --- trunk/openbios-devel/arch/sparc32/build.xml Sun Oct 24 20:55:59 2010 (r917) +++ trunk/openbios-devel/arch/sparc32/build.xml Sun Oct 24 21:55:27 2010 (r918) @@ -16,6 +16,7 @@ <object source="linux_load.c"/> <object source="sys_info.c"/> <object source="romvec.c"/> + <object source="call-romvec.S"/> <object source="entry.S"/> <object source="vectors.S"/> </library> Added: trunk/openbios-devel/arch/sparc32/call-romvec.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/arch/sparc32/call-romvec.S Sun Oct 24 21:55:27 2010 (r918) @@ -0,0 +1,92 @@ +#include "psr.h" +#include "asm/asi.h" + + .text + .align 4 + +#define STACKFRAME_SZ 0x60 + +/* These are just handy. */ +#define _SV save %sp, -STACKFRAME_SZ, %sp +#define _RS restore + +#define FLUSH_ALL_KERNEL_WINDOWS \ + _SV; _SV; _SV; _SV; _SV; _SV; _SV; \ + _RS; _RS; _RS; _RS; _RS; _RS; _RS; + +/* Macro for romvec handlers */ +#define ROMVEC_HANDLER(type) \ + \ + .globl type##_handler; \ + \ +type##_handler: \ + \ + FLUSH_ALL_KERNEL_WINDOWS; \ + \ + save %sp, -STACKFRAME_SZ - 0x20, %sp; \ + \ + st %g1, [ %sp + STACKFRAME_SZ + 0x0]; \ + st %g2, [ %sp + STACKFRAME_SZ + 0x4]; \ + st %g3, [ %sp + STACKFRAME_SZ + 0x8]; \ + st %g4, [ %sp + STACKFRAME_SZ + 0xc]; \ + st %g5, [ %sp + STACKFRAME_SZ + 0x10]; \ + st %g6, [ %sp + STACKFRAME_SZ + 0x14]; \ + st %g7, [ %sp + STACKFRAME_SZ + 0x18]; \ + \ + mov %i0, %o0; \ + mov %i1, %o1; \ + mov %i2, %o2; \ + mov %i3, %o3; \ + mov %i4, %o4; \ + mov %i5, %o5; \ + \ + call type; \ + nop; \ + \ + mov %o0, %i0; \ + \ + ld [ %sp + STACKFRAME_SZ + 0x0], %g1; \ + ld [ %sp + STACKFRAME_SZ + 0x4], %g2; \ + ld [ %sp + STACKFRAME_SZ + 0x8], %g3; \ + ld [ %sp + STACKFRAME_SZ + 0xc], %g4; \ + ld [ %sp + STACKFRAME_SZ + 0x10], %g5; \ + ld [ %sp + STACKFRAME_SZ + 0x14], %g6; \ + ld [ %sp + STACKFRAME_SZ + 0x18], %g7; \ + \ + ret; \ + restore; \ + + +/* Generate handlers which are proxy functions to the + real C functions that correctly save the globals + and stack */ +ROMVEC_HANDLER(obp_devopen) +ROMVEC_HANDLER(obp_devclose) +ROMVEC_HANDLER(obp_rdblkdev) +ROMVEC_HANDLER(obp_nbgetchar) +ROMVEC_HANDLER(obp_nbputchar) +ROMVEC_HANDLER(obp_putstr) +ROMVEC_HANDLER(obp_printf) +ROMVEC_HANDLER(obp_reboot) +ROMVEC_HANDLER(obp_abort) +ROMVEC_HANDLER(obp_halt) +ROMVEC_HANDLER(obp_fortheval_v2) +ROMVEC_HANDLER(obp_inst2pkg) +ROMVEC_HANDLER(obp_dumb_memalloc) +ROMVEC_HANDLER(obp_dumb_memfree) +ROMVEC_HANDLER(obp_dumb_mmap) +ROMVEC_HANDLER(obp_dumb_munmap) +ROMVEC_HANDLER(obp_devread) +ROMVEC_HANDLER(obp_devwrite) +ROMVEC_HANDLER(obp_devseek) +ROMVEC_HANDLER(obp_cpustart) +ROMVEC_HANDLER(obp_cpustop) +ROMVEC_HANDLER(obp_cpuidle) +ROMVEC_HANDLER(obp_cpuresume) +ROMVEC_HANDLER(obp_nextnode) +ROMVEC_HANDLER(obp_child) +ROMVEC_HANDLER(obp_proplen) +ROMVEC_HANDLER(obp_getprop) +ROMVEC_HANDLER(obp_setprop) +ROMVEC_HANDLER(obp_nextprop) + Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Oct 24 20:55:59 2010 (r917) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Oct 24 21:55:27 2010 (r918) @@ -11,7 +11,7 @@ #include "openbios.h" #define MAIN_STACK_SIZE 16384 -#define IMAGE_STACK_SIZE 4096 +#define IMAGE_STACK_SIZE 4096*2 #define debug printk Modified: trunk/openbios-devel/arch/sparc32/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/lib.c Sun Oct 24 20:55:59 2010 (r917) +++ trunk/openbios-devel/arch/sparc32/lib.c Sun Oct 24 21:55:27 2010 (r918) @@ -15,6 +15,7 @@ #include "openprom.h" #include "libopenbios/sys_info.h" #include "boot.h" +#include "romvec.h" #define NCTX_SWIFT 0x100 #define LOWMEMSZ 32 * 1024 * 1024 Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Oct 24 20:55:59 2010 (r917) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Oct 24 21:55:27 2010 (r918) @@ -20,6 +20,7 @@ #include "libopenbios/sys_info.h" #include "openbios.h" #include "boot.h" +#include "romvec.h" #include "openprom.h" #include "packages/video.h" #define NO_QEMU_PROTOS Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 24 20:55:59 2010 (r917) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 24 21:55:27 2010 (r918) @@ -7,12 +7,15 @@ * Public License version 2 or later */ +#include <stdarg.h> + #include "openprom.h" #include "config.h" #include "libopenbios/bindings.h" #include "drivers/drivers.h" #include "libopenbios/sys_info.h" #include "boot.h" +#include "romvec.h" #ifdef CONFIG_DEBUG_OBP #define DPRINTF(fmt, args...) \ @@ -25,15 +28,6 @@ static int obp_fd_stdin, obp_fd_stdout; const char *obp_stdin_path, *obp_stdout_path; -static int obp_nextnode(int node); -static int obp_child(int node); -static int obp_proplen(int node, const char *name); -static int obp_getprop(int node, const char *name, char *val); -static int obp_setprop(int node, const char *name, char *val, int len); -static const char *obp_nextprop(int node, const char *name); -static int obp_devread(int dev_desc, char *buf, int nbytes); -static int obp_devseek(int dev_desc, int hi, int lo); - struct linux_arguments_v0 obp_arg; const char *bootpath; static const struct linux_arguments_v0 * const obp_argp = &obp_arg; @@ -47,7 +41,7 @@ { } -static int obp_nextnode(int node) +int obp_nextnode(int node) { int peer; @@ -59,7 +53,7 @@ return peer; } -static int obp_child(int node) +int obp_child(int node) { int child; @@ -71,7 +65,7 @@ return child; } -static int obp_proplen(int node, const char *name) +int obp_proplen(int node, const char *name) { int notfound; @@ -115,7 +109,7 @@ } #endif -static int obp_getprop(int node, const char *name, char *value) +int obp_getprop(int node, const char *name, char *value) { int notfound, found; int len; @@ -178,7 +172,7 @@ } } -static const char *obp_nextprop(int node, const char *name) +const char *obp_nextprop(int node, const char *name) { int found; @@ -208,7 +202,7 @@ } } -static int obp_setprop(__attribute__((unused)) int node, +int obp_setprop(__attribute__((unused)) int node, __attribute__((unused)) const char *name, __attribute__((unused)) char *value, __attribute__((unused)) int len) @@ -219,28 +213,44 @@ } static const struct linux_nodeops nodeops0 = { - obp_nextnode, /* int (*no_nextnode)(int node); */ - obp_child, /* int (*no_child)(int node); */ - obp_proplen, /* int (*no_proplen)(int node, char *name); */ - obp_getprop, /* int (*no_getprop)(int node,char *name,char *val); */ - obp_setprop, /* int (*no_setprop)(int node, char *name, - char *val, int len); */ - obp_nextprop /* char * (*no_nextprop)(int node, char *name); */ + obp_nextnode_handler, /* int (*no_nextnode)(int node); */ + obp_child_handler, /* int (*no_child)(int node); */ + obp_proplen_handler, /* int (*no_proplen)(int node, char *name); */ + obp_getprop_handler, /* int (*no_getprop)(int node,char *name,char *val); */ + obp_setprop_handler, /* int (*no_setprop)(int node, char *name, + char *val, int len); */ + obp_nextprop_handler /* char * (*no_nextprop)(int node, char *name); */ }; -static int obp_nbgetchar(void) +int obp_nbgetchar(void) { return getchar(); } -static int obp_nbputchar(int ch) +int obp_nbputchar(int ch) { putchar(ch); return 0; } -static void obp_reboot(char *str) +void obp_putstr(char *str, int len) +{ + PUSH(pointer2cell(str)); + PUSH(len); + fword("type"); +} + +void obp_printf(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + printk(fmt, ap); + va_end(ap); +} + +void obp_reboot(char *str) { printk("rebooting (%s)\n", str); *reset_reg = 1; @@ -248,7 +258,7 @@ for (;;) {} } -static void obp_abort(void) +void obp_abort(void) { printk("abort, power off\n"); *power_reg = 1; @@ -256,7 +266,7 @@ for (;;) {} } -static void obp_halt(void) +void obp_halt(void) { printk("halt, power off\n"); *power_reg = 1; @@ -264,7 +274,7 @@ for (;;) {} } -static int obp_devopen(char *str) +int obp_devopen(char *str) { int ret; @@ -276,7 +286,7 @@ return ret; } -static int obp_devclose(int dev_desc) +int obp_devclose(int dev_desc) { int ret = 1; @@ -288,7 +298,7 @@ return ret; } -static int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf) +int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf) { int ret, hi, lo, bs; @@ -305,7 +315,7 @@ return ret; } -static int obp_devread(int dev_desc, char *buf, int nbytes) +int obp_devread(int dev_desc, char *buf, int nbytes) { int ret; @@ -321,7 +331,7 @@ return ret; } -static int obp_devwrite(int dev_desc, char *buf, int nbytes) +int obp_devwrite(int dev_desc, char *buf, int nbytes) { #ifdef CONFIG_DEBUG_OBP_DEVWRITE /* disabled, makes too much noise */ int ret; @@ -342,7 +352,7 @@ return nbytes; } -static int obp_devseek(int dev_desc, int hi, int lo) +int obp_devseek(int dev_desc, int hi, int lo) { int ret; @@ -358,7 +368,7 @@ return ret; } -static int obp_inst2pkg(int dev_desc) +int obp_inst2pkg(int dev_desc) { int ret; @@ -371,7 +381,7 @@ return ret; } -static int obp_cpustart(__attribute__((unused))unsigned int whichcpu, +int obp_cpustart(__attribute__((unused))unsigned int whichcpu, __attribute__((unused))int ctxtbl_ptr, __attribute__((unused))int thiscontext, __attribute__((unused))char *prog_counter) @@ -391,28 +401,28 @@ thiscontext, cpu); } -static int obp_cpustop(__attribute__((unused)) unsigned int whichcpu) +int obp_cpustop(__attribute__((unused)) unsigned int whichcpu) { DPRINTF("obp_cpustop: cpu %d\n", whichcpu); return 0; } -static int obp_cpuidle(__attribute__((unused)) unsigned int whichcpu) +int obp_cpuidle(__attribute__((unused)) unsigned int whichcpu) { DPRINTF("obp_cpuidle: cpu %d\n", whichcpu); return 0; } -static int obp_cpuresume(__attribute__((unused)) unsigned int whichcpu) +int obp_cpuresume(__attribute__((unused)) unsigned int whichcpu) { DPRINTF("obp_cpuresume: cpu %d\n", whichcpu); return 0; } -static void obp_fortheval_v2(char *str, int arg0, int arg1, int arg2, int arg3, int arg4) +void obp_fortheval_v2(char *str, int arg0, int arg1, int arg2, int arg3, int arg4) { int pusharg = 0; @@ -454,6 +464,10 @@ void * init_openprom(void) { + /* Setup the openprom vector. Note that all functions should be invoked + via their handler (see call-romvec.S) which acts as a proxy to save + the globals and setup the stack correctly */ + // Linux wants a R/W romvec table romvec0.pv_magic_cookie = LINUX_OPPROM_MAGIC; romvec0.pv_romvers = 3; @@ -464,32 +478,33 @@ romvec0.pv_v0mem.v0_available = &ptavail; romvec0.pv_nodeops = &nodeops0; romvec0.pv_bootstr = (void *)doublewalk; - romvec0.pv_v0devops.v0_devopen = &obp_devopen; - romvec0.pv_v0devops.v0_devclose = &obp_devclose; - romvec0.pv_v0devops.v0_rdblkdev = &obp_rdblkdev; + romvec0.pv_v0devops.v0_devopen = &obp_devopen_handler; + romvec0.pv_v0devops.v0_devclose = &obp_devclose_handler; + romvec0.pv_v0devops.v0_rdblkdev = &obp_rdblkdev_handler; romvec0.pv_stdin = &obp_stdin; romvec0.pv_stdout = &obp_stdout; - romvec0.pv_getchar = obp_nbgetchar; - romvec0.pv_putchar = (void (*)(int))obp_nbputchar; - romvec0.pv_nbgetchar = obp_nbgetchar; - romvec0.pv_nbputchar = obp_nbputchar; - romvec0.pv_reboot = obp_reboot; - romvec0.pv_printf = (void (*)(const char *fmt, ...))printk; - romvec0.pv_abort = obp_abort; - romvec0.pv_halt = obp_halt; + romvec0.pv_getchar = obp_nbgetchar_handler; + romvec0.pv_putchar = (void (*)(int))obp_nbputchar_handler; + romvec0.pv_nbgetchar = obp_nbgetchar_handler; + romvec0.pv_nbputchar = obp_nbputchar_handler; + romvec0.pv_putstr = obp_putstr_handler; + romvec0.pv_reboot = obp_reboot_handler; + romvec0.pv_printf = obp_printf_handler; + romvec0.pv_abort = obp_abort_handler; + romvec0.pv_halt = obp_halt_handler; romvec0.pv_synchook = &sync_hook; romvec0.pv_v0bootargs = &obp_argp; - romvec0.pv_fortheval.v2_eval = obp_fortheval_v2; - romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg; - romvec0.pv_v2devops.v2_dumb_mem_alloc = obp_dumb_memalloc; - romvec0.pv_v2devops.v2_dumb_mem_free = obp_dumb_memfree; - romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap; - romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap; - romvec0.pv_v2devops.v2_dev_open = obp_devopen; - romvec0.pv_v2devops.v2_dev_close = (void (*)(int))obp_devclose; - romvec0.pv_v2devops.v2_dev_read = obp_devread; - romvec0.pv_v2devops.v2_dev_write = obp_devwrite; - romvec0.pv_v2devops.v2_dev_seek = obp_devseek; + romvec0.pv_fortheval.v2_eval = obp_fortheval_v2_handler; + romvec0.pv_v2devops.v2_inst2pkg = obp_inst2pkg_handler; + romvec0.pv_v2devops.v2_dumb_mem_alloc = obp_dumb_memalloc_handler; + romvec0.pv_v2devops.v2_dumb_mem_free = obp_dumb_memfree_handler; + romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap_handler; + romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap_handler; + romvec0.pv_v2devops.v2_dev_open = obp_devopen_handler; + romvec0.pv_v2devops.v2_dev_close = (void (*)(int))obp_devclose_handler; + romvec0.pv_v2devops.v2_dev_read = obp_devread_handler; + romvec0.pv_v2devops.v2_dev_write = obp_devwrite_handler; + romvec0.pv_v2devops.v2_dev_seek = obp_devseek_handler; romvec0.pv_v2bootargs.bootpath = &bootpath; @@ -504,10 +519,10 @@ fword("open-dev"); obp_fd_stdout = POP(); - romvec0.v3_cpustart = obp_cpustart; - romvec0.v3_cpustop = obp_cpustop; - romvec0.v3_cpuidle = obp_cpuidle; - romvec0.v3_cpuresume = obp_cpuresume; + romvec0.v3_cpustart = obp_cpustart_handler; + romvec0.v3_cpustop = obp_cpustop_handler; + romvec0.v3_cpuidle = obp_cpuidle_handler; + romvec0.v3_cpuresume = obp_cpuresume_handler; return &romvec0; } Added: trunk/openbios-devel/arch/sparc32/romvec.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/arch/sparc32/romvec.h Sun Oct 24 21:55:27 2010 (r918) @@ -0,0 +1,76 @@ +/* + * romvec main C function and handler declarations + */ + +void *init_openprom(void); + +int obp_devopen(char *str); +int obp_devopen_handler(char *str); +int obp_devclose(int dev_desc); +int obp_devclose_handler(int dev_desc); +int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf); +int obp_rdblkdev_handler(int dev_desc, int num_blks, int offset, char *buf); +int obp_nbgetchar(void); +int obp_nbgetchar_handler(void); +int obp_nbputchar(int ch); +int obp_nbputchar_handler(int ch); +void obp_putstr(char *str, int len); +void obp_putstr_handler(char *str, int len); +void obp_printf(__const__ char *fmt, ...); +void obp_printf_handler(__const__ char *fmt, ...); +void obp_reboot(char *str); +void obp_reboot_handler(char *str); +void obp_abort(void); +void obp_abort_handler(void); +void obp_halt(void); +void obp_halt_handler(void); +void obp_fortheval_v2(char *str, int arg0, int arg1, int arg2, int arg3, int arg4); +void obp_fortheval_v2_handler(char *str, int arg0, int arg1, int arg2, int arg3, int arg4); +int obp_inst2pkg(int dev_desc); +int obp_inst2pkg_handler(int dev_desc); +char *obp_dumb_memalloc(char *va, unsigned int size); +char *obp_dumb_memalloc_handler(char *va, unsigned int size); +void obp_dumb_memfree(__attribute__((unused))char *va, __attribute__((unused))unsigned sz); +void obp_dumb_memfree_handler(__attribute__((unused))char *va, __attribute__((unused))unsigned sz); +char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, unsigned int size); +char *obp_dumb_mmap_handler(char *va, int which_io, unsigned int pa, unsigned int size); +void obp_dumb_munmap(__attribute__((unused)) char *va, __attribute__((unused)) unsigned int size); +void obp_dumb_munmap_handler(__attribute__((unused)) char *va, __attribute__((unused)) unsigned int size); +int obp_devread(int dev_desc, char *buf, int nbytes); +int obp_devread_handler(int dev_desc, char *buf, int nbytes); +int obp_devwrite(int dev_desc, char *buf, int nbytes); +int obp_devwrite_handler(int dev_desc, char *buf, int nbytes); +int obp_devseek(int dev_desc, int hi, int lo); +int obp_devseek_handler(int dev_desc, int hi, int lo); +int obp_cpustart(__attribute__((unused))unsigned int whichcpu, + __attribute__((unused))int ctxtbl_ptr, + __attribute__((unused))int thiscontext, + __attribute__((unused))char *prog_counter); +int obp_cpustart_handler(__attribute__((unused))unsigned int whichcpu, + __attribute__((unused))int ctxtbl_ptr, + __attribute__((unused))int thiscontext, + __attribute__((unused))char *prog_counter); +int obp_cpustop(__attribute__((unused)) unsigned int whichcpu); +int obp_cpustop_handler(__attribute__((unused)) unsigned int whichcpu); +int obp_cpuidle(__attribute__((unused)) unsigned int whichcpu); +int obp_cpuidle_handler(__attribute__((unused)) unsigned int whichcpu); +int obp_cpuresume(__attribute__((unused)) unsigned int whichcpu); +int obp_cpuresume_handler(__attribute__((unused)) unsigned int whichcpu); +int obp_nextnode(int node); +int obp_nextnode_handler(int node); +int obp_child(int node); +int obp_child_handler(int node); +int obp_proplen(int node, const char *name); +int obp_proplen_handler(int node, const char *name); +int obp_getprop(int node, const char *name, char *value); +int obp_getprop_handler(int node, const char *name, char *value); +int obp_setprop(__attribute__((unused)) int node, + __attribute__((unused)) const char *name, + __attribute__((unused)) char *value, + __attribute__((unused)) int len); +int obp_setprop_handler(__attribute__((unused)) int node, + __attribute__((unused)) const char *name, + __attribute__((unused)) char *value, + __attribute__((unused)) int len); +const char *obp_nextprop(int node, const char *name); +const char *obp_nextprop_handler(int node, const char *name);

1 0

[commit] r917 - in trunk/openbios-devel: include/kernel kernel
by repository service 24 Oct '10

24 Oct '10

Author: afaerber Date: Sun Oct 24 20:55:59 2010 New Revision: 917 URL: http://tracker.coreboot.org/trac/openbios/changeset/917 Log: Move cell2pointer and pointer2cell macros These will be needed elsewhere for ppc64. Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/kernel/stack.h trunk/openbios-devel/kernel/cross.h Modified: trunk/openbios-devel/include/kernel/stack.h ============================================================================== --- trunk/openbios-devel/include/kernel/stack.h Sun Oct 24 20:48:18 2010 (r916) +++ trunk/openbios-devel/include/kernel/stack.h Sun Oct 24 20:55:59 2010 (r917) @@ -30,6 +30,18 @@ +#ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH +#define pointer2cell(x) ((ucell)(x)) +#define cell2pointer(x) ((u8 *)(x)) +#endif +#ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH +#define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address)) +#define cell2pointer(x) ((u8 *)(((unsigned long)(x))+base_address)) +#endif +#ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH +#define pointer2cell(x) ((ucell)(unsigned long)(x)) +#define cell2pointer(x) ((u8 *)((unsigned long)(x)&0xFFFFFFFFUL)) +#endif static inline void PUSH(ucell value) { dstack[++dstackcnt] = (value); Modified: trunk/openbios-devel/kernel/cross.h ============================================================================== --- trunk/openbios-devel/kernel/cross.h Sun Oct 24 20:48:18 2010 (r916) +++ trunk/openbios-devel/kernel/cross.h Sun Oct 24 20:55:59 2010 (r917) @@ -103,8 +103,6 @@ /* bit width handling */ #ifdef NATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -#define pointer2cell(x) ((ucell)(x)) -#define cell2pointer(x) ((u8 *)(x)) #if BITS==32 #define FMT_CELL_x "x" #define FMT_CELL_d "d" @@ -116,15 +114,11 @@ #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH extern unsigned long base_address; -#define pointer2cell(x) ((ucell)(((unsigned long)(x))-base_address)) -#define cell2pointer(x) ((u8 *)(((unsigned long)(x))+base_address)) #define FMT_CELL_x "x" #define FMT_CELL_d "d" #endif #ifdef NATIVE_BITWIDTH_LARGER_THAN_HOST_BITWIDTH -#define pointer2cell(x) ((ucell)(unsigned long)(x)) -#define cell2pointer(x) ((u8 *)((unsigned long)(x)&0xFFFFFFFFUL)) #define FMT_CELL_x "llx" #define FMT_CELL_d "lld" #endif

1 0

[commit] r916 - in trunk/openbios-devel/include/arch: ppc sparc32 sparc64
by repository service 24 Oct '10

24 Oct '10

Author: afaerber Date: Sun Oct 24 20:48:18 2010 New Revision: 916 URL: http://tracker.coreboot.org/trac/openbios/changeset/916 Log: Introduce [u]intptr_t type Cc: Blue Swirl <blauwirbel(a)gmail.com> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/ppc/types.h trunk/openbios-devel/include/arch/sparc32/types.h trunk/openbios-devel/include/arch/sparc64/types.h Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Mon Oct 18 21:32:16 2010 (r915) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Oct 24 20:48:18 2010 (r916) @@ -18,11 +18,13 @@ typedef unsigned short uint16_t; typedef unsigned int uint32_t; typedef unsigned long long uint64_t; +typedef unsigned long uintptr_t; typedef signed char int8_t; typedef short int16_t; typedef int int32_t; typedef long long int64_t; +typedef long intptr_t; #endif /* endianess */ Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Mon Oct 18 21:32:16 2010 (r915) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Oct 24 20:48:18 2010 (r916) @@ -18,11 +18,13 @@ typedef unsigned short uint16_t; typedef unsigned int uint32_t; typedef unsigned long long uint64_t; +typedef unsigned long uintptr_t; typedef signed char int8_t; typedef short int16_t; typedef int int32_t; typedef long long int64_t; +typedef long intptr_t; #endif /* endianess */ Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Mon Oct 18 21:32:16 2010 (r915) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Oct 24 20:48:18 2010 (r916) @@ -18,11 +18,13 @@ typedef unsigned short uint16_t; typedef unsigned int uint32_t; typedef unsigned long long uint64_t; +typedef unsigned long uintptr_t; typedef signed char int8_t; typedef short int16_t; typedef int int32_t; typedef long long int64_t; +typedef long intptr_t; #endif /* endianess */

1 0

Dell M1730 support
by X3lectric 23 Oct '10

23 Oct '10

Hi Maybe this has been asked or answered, but searching around I could not find a compatibility list, so I apologise in advance for the numbness of the brain. Please could anyone let me know if the Dell laptops in specific the M1730 is supported by the openbios and if there are any binaries ready to be flashed for this machine. Thx in advance.

2 1

sun4u ebus (was: Change ofmem_common.c)
by Artyom Tarasenko 22 Oct '10

22 Oct '10

On Fri, Oct 15, 2010 at 7:57 PM, Blue Swirl <blauwirbel(a)gmail.com> wrote: > Actually, while mc146818rtc is linked in, it's not used (there are > some machines that have similar device, so that's why it still hangs > around). m48t59 is on ebus. Btw, can you explain how the physical address of an ebus device can be calculated? Looks like they are relative to the ebus beginning and then to PCI, but what constants define the offsets? info qtree doesn't show the physical addresses either. > Is Netra-T1 OK? Wanted to check whether the current ebus mappings match Netra-T1 or U5, but haven't succeeded. -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

3 3

[commit] r915 - trunk/openbios-devel/arch/sparc32
by repository service 19 Oct '10

19 Oct '10

Author: mcayland Date: Mon Oct 18 21:32:16 2010 New Revision: 915 URL: http://tracker.coreboot.org/trac/openbios/changeset/915 Log: Fix the placing of Forth arguments on the stack when calling obp_fortheval_v2() via romvec on SPARC32. The extra stack arguments are actually placed within %o1-%o5 but unfortunately there doesn't seem to be a way of passing the number of parameters using the romvec API. Hence we go through the argument list and start pushing arguments onto the Forth stack from the first non-zero argument before executing the Forth string. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/openprom.h trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/openprom.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/openprom.h Sun Oct 17 14:15:44 2010 (r914) +++ trunk/openbios-devel/arch/sparc32/openprom.h Mon Oct 18 21:32:16 2010 (r915) @@ -124,7 +124,7 @@ /* Evaluate a forth string, not different proto for V0 and V2->up. */ union { void (*v0_eval)(int len, char *str); - void (*v2_eval)(char *str); + void (*v2_eval)(char *str, int arg0, int arg1, int arg2, int arg3, int arg4); } pv_fortheval; const struct linux_arguments_v0 * const *pv_v0bootargs; Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 17 14:15:44 2010 (r914) +++ trunk/openbios-devel/arch/sparc32/romvec.c Mon Oct 18 21:32:16 2010 (r915) @@ -412,15 +412,39 @@ return 0; } -static void obp_fortheval_v2(char *str) +static void obp_fortheval_v2(char *str, int arg0, int arg1, int arg2, int arg3, int arg4) { - // for now, move something to the stack so we - // don't get a stack underrun. - // - // FIXME: find out why solaris doesnt put its stuff on the stack - // - fword("0"); - fword("0"); + int pusharg = 0; + + // It seems Solaris passes up to 5 arguments which should be pushed onto the Forth + // stack for execution. However the API doesn't provide for a way to pass the number + // of arguments actually passed. Hence we start at arg4 and then starting from the + // first non-zero argument, we push all subsequent arguments onto the stack down to + // arg0. + + if (arg4) { + PUSH(arg4); + pusharg = 1; + } + + if (arg3 || pusharg == 1 ) { + PUSH(arg3); + pusharg = 1; + } + + if (arg2 || pusharg == 1) { + PUSH(arg2); + pusharg = 1; + } + + if (arg1 || pusharg == 1 ) { + PUSH(arg1); + pusharg = 1; + } + + if (arg0 || pusharg == 1) { + PUSH(arg0); + } DPRINTF("obp_fortheval_v2(%s)\n", str); push_str(str);

4 9

[commit] r898 - trunk/openbios-devel/arch/sparc64
by repository service 19 Oct '10

19 Oct '10

Author: mcayland Date: Sat Oct 16 17:09:18 2010 New Revision: 898 URL: http://tracker.coreboot.org/trac/openbios/changeset/898 Log: When booting from disk, an explicit :a slice is required in order for the Fcode bootloader to execute correctly. 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 Sat Oct 16 16:13:15 2010 (r897) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sat Oct 16 17:09:18 2010 (r898) @@ -476,7 +476,7 @@ push_str("/obio/SUNW,fdtwo"); break; case 'c': - push_str("disk"); + push_str("disk:a"); break; default: case 'd':

2 1

starting
by G 3 18 Oct '10

18 Oct '10

I have begun doing work with OpenBIOS. I was wondering if it is possible to compile OpenBIOS for PowerPC on Mac OS X? If not, what Linux distro should I use? Any advice would really help.

6 17

[commit] r911 - trunk/openbios-devel/forth/bootstrap
by repository service 18 Oct '10

18 Oct '10

Author: mcayland Date: Sun Oct 17 00:37:31 2010 New Revision: 911 URL: http://tracker.coreboot.org/trac/openbios/changeset/911 Log: Add Forth words 2>r, 2r> and 2r@ as described in the ANSI Forth core extensions as they are required for OpenSolaris. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 17 00:21:51 2010 (r910) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 17 00:37:31 2010 (r911) @@ -404,6 +404,17 @@ : 2rot >r >r 2swap r> r> 2swap ; +\ +\ 7.3.1.4 - return stack +\ + +\ Note: these words are not part of the official OF specification, however +\ they are part of the ANSI DPANS94 core extensions (see section 6.2) and +\ so this seems an appropriate place for them. +: 2>r swap >r >r ; +: 2r> r> r> swap ; +: 2r@ r> r> 2dup >r >r swap ; + \ \ 7.3.2.1 - single precision integer arithmetic (part 1) \

3 2

do anyone have self-study free book of Forth?
by kim.jin 18 Oct '10

18 Oct '10

hi, do you have any book for me to self-study? Best Regards! Kim King 2010-10-14

2 2

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

17 Oct '10

Author: agraf Date: Sun Oct 17 14:15:44 2010 New Revision: 914 URL: http://tracker.coreboot.org/trac/openbios/changeset/914 Log: ppc: Move noreturn attribute Otherwise GCC 4.2.4 complains that panic() marked noreturn does return. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.h trunk/openbios-devel/arch/ppc/qemu/qemu.c Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.h ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.h Sun Oct 17 11:13:14 2010 (r913) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.h Sun Oct 17 14:15:44 2010 (r914) @@ -17,7 +17,7 @@ /* misc.c */ extern void fatal_error( const char *str ); -extern void exit( int status ); +extern void exit( int status ) __attribute__ ((noreturn)); /* start.S */ extern void flush_icache_range( char *start, char *stop ); Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Oct 17 11:13:14 2010 (r913) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.c Sun Oct 17 14:15:44 2010 (r914) @@ -35,7 +35,7 @@ exit( int status __attribute__ ((unused))) { for (;;); -} __attribute__ ((noreturn)) +} void fatal_error( const char *err )

1 0

[commit] r913 - trunk/openbios-devel/libopenbios
by repository service 17 Oct '10

17 Oct '10

Author: mcayland Date: Sun Oct 17 11:13:14 2010 New Revision: 913 URL: http://tracker.coreboot.org/trac/openbios/changeset/913 Log: Fix comment typo from r896 as pointed out by Andreas. 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 Sun Oct 17 11:10:09 2010 (r912) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Oct 17 11:13:14 2010 (r913) @@ -211,7 +211,7 @@ if (prop_used > trans_prop_size) { - /* The property doesn't fix within the existing space, so keep doubling it + /* The property doesn't fit within the existing space, so keep doubling it until it does */ prop_size = trans_prop_size; while (prop_size < prop_used) { @@ -262,7 +262,7 @@ if (prop_used > *mem_prop_size) { - /* The property doesn't fix within the existing space, so keep doubling it + /* The property doesn't fit within the existing space, so keep doubling it until it does */ prop_size = *mem_prop_size; while (prop_size < prop_used) {

1 0

[commit] r912 - trunk/openbios-devel/forth/bootstrap
by repository service 17 Oct '10

17 Oct '10

Author: mcayland Date: Sun Oct 17 11:10:09 2010 New Revision: 912 URL: http://tracker.coreboot.org/trac/openbios/changeset/912 Log: Fix up the new 2>r, 2r> and 2r@ words. As pointed out by Tarl, since these are called as separate words (and not inline), we need to preserve the top-most R stack item as this is return address of the word itself. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 17 00:37:31 2010 (r911) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 17 11:10:09 2010 (r912) @@ -411,9 +411,9 @@ \ Note: these words are not part of the official OF specification, however \ they are part of the ANSI DPANS94 core extensions (see section 6.2) and \ so this seems an appropriate place for them. -: 2>r swap >r >r ; -: 2r> r> r> swap ; -: 2r@ r> r> 2dup >r >r swap ; +: 2>r r> -rot swap >r >r >r ; +: 2r> r> r> r> rot >r swap ; +: 2r@ r> r> r> 2dup >r >r rot >r swap ; \ \ 7.3.2.1 - single precision integer arithmetic (part 1)

1 0

[commit] r910 - trunk/openbios-devel/forth/system
by repository service 17 Oct '10

17 Oct '10

Author: mcayland Date: Sun Oct 17 00:21:51 2010 New Revision: 910 URL: http://tracker.coreboot.org/trac/openbios/changeset/910 Log: Force any errors in the CIF interpret word to reset the Forth engine back to the Forth interpret state. This fixes various errors being caused by previous calls to CIF interpret throwing exceptions whilst in the Forth compile state. Without this fix, subsequent calls to CIF interpret could be executed erroneusly in Forth compile state rather than the Forth interpret state causing hard-to-detect Forth errors. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Sat Oct 16 19:36:22 2010 (r909) +++ trunk/openbios-devel/forth/system/ciface.fs Sun Oct 17 00:21:51 2010 (r910) @@ -273,6 +273,10 @@ ['] evaluate catch dup if \ this is not necessary an error... ." interpret: exception " dup . ." caught" cr + + \ Force back to interpret state on error, otherwise the next call to + \ interpret gets confused if the error occurred in compile mode + 0 state ! then \ ." --- " cr ;

1 0

[PATCH] ppc: Use config file to enable RTAS
by Andreas Färber 16 Oct '10

16 Oct '10

RTAS had to be enabled via EXTRACFLAGS=-DUSE_RTAS. Use the config file instead. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/briq/init.c | 4 ++-- arch/ppc/briq/methods.c | 4 ++-- arch/ppc/pearpc/init.c | 4 ++-- arch/ppc/pearpc/methods.c | 4 ++-- arch/ppc/qemu/init.c | 4 ++-- arch/ppc/qemu/methods.c | 4 ++-- config/examples/ppc_config.xml | 1 + 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/ppc/briq/init.c b/arch/ppc/briq/init.c index 14abe96..0b2b3b9 100644 --- a/arch/ppc/briq/init.c +++ b/arch/ppc/briq/init.c @@ -85,7 +85,7 @@ setenv( char *env, char *value ) void arch_of_init( void ) { -#if USE_RTAS +#if CONFIG_RTAS phandle_t ph; #endif int autoboot; @@ -98,7 +98,7 @@ arch_of_init( void ) ob_pci_init(); #endif -#if USE_RTAS +#if CONFIG_RTAS if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { diff --git a/arch/ppc/briq/methods.c b/arch/ppc/briq/methods.c index 9978f04..649e9ba 100644 --- a/arch/ppc/briq/methods.c +++ b/arch/ppc/briq/methods.c @@ -28,7 +28,7 @@ /* RTAS (run-time abstraction services) */ /************************************************************************/ -#ifdef USE_RTAS +#ifdef CONFIG_RTAS DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" ); /* ( physbase -- rtas_callback ) */ @@ -321,7 +321,7 @@ NODE_METHODS( mmu_ciface ) = { void node_methods_init( void ) { -#ifdef USE_RTAS +#ifdef CONFIG_RTAS REGISTER_NODE( rtas ); #endif REGISTER_NODE( vfd_stdout ); diff --git a/arch/ppc/pearpc/init.c b/arch/ppc/pearpc/init.c index 55b3aae..b2c11c9 100644 --- a/arch/ppc/pearpc/init.c +++ b/arch/ppc/pearpc/init.c @@ -88,7 +88,7 @@ setenv( char *env, char *value ) void arch_of_init( void ) { -#if USE_RTAS +#if CONFIG_RTAS phandle_t ph; #endif int autoboot; @@ -104,7 +104,7 @@ arch_of_init( void ) node_methods_init(); init_video(); -#if USE_RTAS +#if CONFIG_RTAS if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { diff --git a/arch/ppc/pearpc/methods.c b/arch/ppc/pearpc/methods.c index ae3ab44..f505b6c 100644 --- a/arch/ppc/pearpc/methods.c +++ b/arch/ppc/pearpc/methods.c @@ -28,7 +28,7 @@ /* RTAS (run-time abstraction services) */ /************************************************************************/ -#ifdef USE_RTAS +#ifdef CONFIG_RTAS DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" ); /* ( physbase -- rtas_callback ) */ @@ -317,7 +317,7 @@ NODE_METHODS( mmu_ciface ) = { void node_methods_init( void ) { -#ifdef USE_RTAS +#ifdef CONFIG_RTAS REGISTER_NODE( rtas ); #endif REGISTER_NODE( video_stdout ); diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 0d0db3a..3979f5d 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -572,7 +572,7 @@ static void kvm_of_init(void) void arch_of_init( void ) { -#ifdef USE_RTAS +#ifdef CONFIG_RTAS phandle_t ph; #endif uint64_t ram_size; @@ -730,7 +730,7 @@ arch_of_init( void ) ofmem_register(find_dev("/memory"), find_dev(buf)); node_methods_init(buf); -#ifdef USE_RTAS +#ifdef CONFIG_RTAS if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { diff --git a/arch/ppc/qemu/methods.c b/arch/ppc/qemu/methods.c index cf307f9..71a364f 100644 --- a/arch/ppc/qemu/methods.c +++ b/arch/ppc/qemu/methods.c @@ -30,7 +30,7 @@ /* RTAS (run-time abstraction services) */ /************************************************************************/ -#ifdef USE_RTAS +#ifdef CONFIG_RTAS DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" ); /* ( physbase -- rtas_callback ) */ @@ -303,7 +303,7 @@ void node_methods_init( const char *cpuname ) { phandle_t chosen, ph; -#ifdef USE_RTAS +#ifdef CONFIG_RTAS REGISTER_NODE( rtas ); #endif REGISTER_NODE( ciface ); diff --git a/config/examples/ppc_config.xml b/config/examples/ppc_config.xml index cfe57e1..5f79c21 100644 --- a/config/examples/ppc_config.xml +++ b/config/examples/ppc_config.xml @@ -58,6 +58,7 @@  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> + <option name="CONFIG_RTAS" type="boolean" value="false"/>  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/> -- 1.7.3

2 1

Q: qemu ppc ofmem memory layout
by Andreas Färber 16 Oct '10

16 Oct '10

Hello, In arch/ppc/qemu/ofmem.c, ofmem appears to be located at OFMEM == 0x05400000 == 84 MiB, with OF_MALLOC_BASE at OFMEM + sizeof(ofmem_t) 4- byte aligned. The upper limit from libopenbios/ofmem_common.c seems to be ofmem_arch_get_heap_top() == "hash base minus fixed value" though, with the hash base being relative to top of RAM. This means, the malloc zone has a fixed lower limit and grows absolutely with the amount of RAM assigned to QEMU. Is this really intended? The code comment in ofmem.c rather looks like the fixed OFMEM value was taken from a 96 MB memory layout, where it would seem relative to top of RAM with fixed size. Even worse, like any other memory on ppc this hugeish part of memory is never claimed... I tried to move ofmem to RAM size - 0x100000 - 64 * 1024 - (32 + 64 + 64) * 1024 - 0x200000, but OpenBIOS just busy-looped and never reached the banner. Has anyone looked into this before? Any ideas what might be going wrong? I tried carefully not to include a call to ofmem_arch_get_private() inside setup_mmu(). Regards, Andreas

4 23

[commit] r909 - in trunk/openbios-devel: arch/ppc/briq arch/ppc/pearpc arch/ppc/qemu config/examples
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:36:22 2010 New Revision: 909 URL: http://tracker.coreboot.org/trac/openbios/changeset/909 Log: ppc: Use config file to enable RTAS RTAS had to be enabled via EXTRACFLAGS=-DUSE_RTAS. Use the config file instead. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/config/examples/ppc_config.xml Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sat Oct 16 19:36:18 2010 (r908) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sat Oct 16 19:36:22 2010 (r909) @@ -85,7 +85,7 @@ void arch_of_init( void ) { -#if USE_RTAS +#if CONFIG_RTAS phandle_t ph; #endif int autoboot; @@ -98,7 +98,7 @@ ob_pci_init(); #endif -#if USE_RTAS +#if CONFIG_RTAS if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { Modified: trunk/openbios-devel/arch/ppc/briq/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c Sat Oct 16 19:36:18 2010 (r908) +++ trunk/openbios-devel/arch/ppc/briq/methods.c Sat Oct 16 19:36:22 2010 (r909) @@ -28,7 +28,7 @@ /* RTAS (run-time abstraction services) */ /************************************************************************/ -#ifdef USE_RTAS +#ifdef CONFIG_RTAS DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" ); /* ( physbase -- rtas_callback ) */ @@ -321,7 +321,7 @@ void node_methods_init( void ) { -#ifdef USE_RTAS +#ifdef CONFIG_RTAS REGISTER_NODE( rtas ); #endif REGISTER_NODE( vfd_stdout ); Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sat Oct 16 19:36:18 2010 (r908) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sat Oct 16 19:36:22 2010 (r909) @@ -88,7 +88,7 @@ void arch_of_init( void ) { -#if USE_RTAS +#if CONFIG_RTAS phandle_t ph; #endif int autoboot; @@ -104,7 +104,7 @@ node_methods_init(); init_video(); -#if USE_RTAS +#if CONFIG_RTAS if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sat Oct 16 19:36:18 2010 (r908) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sat Oct 16 19:36:22 2010 (r909) @@ -28,7 +28,7 @@ /* RTAS (run-time abstraction services) */ /************************************************************************/ -#ifdef USE_RTAS +#ifdef CONFIG_RTAS DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" ); /* ( physbase -- rtas_callback ) */ @@ -317,7 +317,7 @@ void node_methods_init( void ) { -#ifdef USE_RTAS +#ifdef CONFIG_RTAS REGISTER_NODE( rtas ); #endif REGISTER_NODE( video_stdout ); Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 16 19:36:18 2010 (r908) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 16 19:36:22 2010 (r909) @@ -582,7 +582,7 @@ void arch_of_init( void ) { -#ifdef USE_RTAS +#ifdef CONFIG_RTAS phandle_t ph; #endif uint64_t ram_size; @@ -740,7 +740,7 @@ ofmem_register(find_dev("/memory"), find_dev(buf)); node_methods_init(buf); -#ifdef USE_RTAS +#ifdef CONFIG_RTAS if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sat Oct 16 19:36:18 2010 (r908) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sat Oct 16 19:36:22 2010 (r909) @@ -30,7 +30,7 @@ /* RTAS (run-time abstraction services) */ /************************************************************************/ -#ifdef USE_RTAS +#ifdef CONFIG_RTAS DECLARE_NODE( rtas, INSTALL_OPEN, 0, "+/rtas" ); /* ( physbase -- rtas_callback ) */ @@ -303,7 +303,7 @@ node_methods_init( const char *cpuname ) { phandle_t chosen, ph; -#ifdef USE_RTAS +#ifdef CONFIG_RTAS REGISTER_NODE( rtas ); #endif REGISTER_NODE( ciface ); Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sat Oct 16 19:36:18 2010 (r908) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sat Oct 16 19:36:22 2010 (r909) @@ -58,6 +58,7 @@  <option name="CONFIG_LINUXBIOS" type="boolean" value="false"/> + <option name="CONFIG_RTAS" type="boolean" value="false"/>  <option name="CONFIG_DRIVER_PCI" type="boolean" value="true"/>

1 0

[commit] r908 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:36:18 2010 New Revision: 908 URL: http://tracker.coreboot.org/trac/openbios/changeset/908 Log: ppc: Fix client stack setup The client stack was set up 96 * 64 KiB below the hash table. Should be 96 KiB instead. v2: * Initial. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 19:36:15 2010 (r907) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 16 19:36:18 2010 (r908) @@ -379,7 +379,8 @@ addi r8,r8,LO(saved_stack) // save our stack pointer stw r1,0(r8) mfsdr1 r1 - addis r1, r1, -96 + addi r1, r1, -32768 /* - 32 KiB exception stack */ + addis r1, r1, -1 /* - 64 KiB stack */ lis r5,HA(of_client_callback) addi r5,r5,LO(of_client_callback) // r5 = callback li r6,0 // r6 = address of client program arguments (unused)

1 0

[commit] r907 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:36:15 2010 New Revision: 907 URL: http://tracker.coreboot.org/trac/openbios/changeset/907 Log: ppc: Fix stack setup The exception stack was always set up 64 KiB below the ROM, ignoring hash table alignment. Align the stack pointer appropriately. v2: * Drop buggy distinction based on PVR value since the previous patch unifies alignment. Suggested by Segher Boessenkool. Cc: Alexander Graf <agraf(a)suse.de> Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 19:36:12 2010 (r906) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 16 19:36:15 2010 (r907) @@ -334,9 +334,13 @@ addis r1, r3, -16 /* ramsize - 1MB */ - /* setup exception stack */ + /* setup hash table */ addis r1, r1, -1 /* - 64 kB */ + clrrwi r1, r1, 5*4 /* & ~0xfffff */ + + /* setup exception stack */ + mtsprg0 r1 /* setup stack */

1 0

[commit] r906 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:36:12 2010 New Revision: 906 URL: http://tracker.coreboot.org/trac/openbios/changeset/906 Log: ppc: Move hash table To avoid complications with ppc64, always use the ppc64 alignment. v2: * Initial. Suggested by Segher Boessenkool. Cc: Segher Boessenkool <segher(a)kernel.crashing.org> Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 19:36:08 2010 (r905) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:12 2010 (r906) @@ -389,14 +389,11 @@ ofmem_t *ofmem; unsigned long sdr1, sr_base, msr; unsigned long hash_base; - unsigned long hash_mask = 0xffff0000; + unsigned long hash_mask = 0xfff00000; /* alignment for ppc64 */ int i; /* SDR1: Storage Description Register 1 */ - if(is_ppc64()) - hash_mask = 0xfff00000; - hash_base = (ramsize - 0x00100000 - HASH_SIZE) & hash_mask; memset((void *)hash_base, 0, HASH_SIZE); sdr1 = hash_base | ((HASH_SIZE-1) >> 16);

1 0

[commit] r905 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:36:08 2010 New Revision: 905 URL: http://tracker.coreboot.org/trac/openbios/changeset/905 Log: ppc: Move malloc zone ofmem was fixed at 0x05400000, followed by the malloc zone. The latter was bounded by the stack (now client stack), relative to the top of RAM. An increase of RAM would therefore only enlarge the malloc zone. Move the malloc zone below the client stack, with a fixed size of 2 MiB. The size is derived from the memory map depicted in ofmem.c; having a fixed size leaves room for memory claim'ed by clients and by OpenBIOS. v2: * Through the preceding patch the malloc zone goes below the client stack rather than below the stack. Adjust and prettify the illustration. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:04 2010 (r904) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:08 2010 (r905) @@ -47,11 +47,9 @@ #define FREE_BASE 0x00004000 #define OF_CODE_START 0xfff00000UL #define IO_BASE 0x80000000 -#define OFMEM ((ofmem_t*)0x05400000) - -#define OF_MALLOC_BASE ((char*)OFMEM + ((sizeof(ofmem_t) + 3) & ~3)) #define HASH_SIZE (2 << 15) +#define OFMEM_SIZE (2 * 1024 * 1024) #define SEGR_USER BIT(2) #define SEGR_BASE 0x0400 @@ -86,7 +84,7 @@ unsigned long get_ram_top( void ) { - return get_hash_base() - (32 + 64 + 64) * 1024; + return get_hash_base() - (32 + 64 + 64) * 1024 - OFMEM_SIZE; } unsigned long @@ -107,12 +105,12 @@ ofmem_t* ofmem_arch_get_private(void) { - return OFMEM; + return (ofmem_t*)(get_heap_top() - OFMEM_SIZE); } void* ofmem_arch_get_malloc_base(void) { - return OF_MALLOC_BASE; + return (char*)ofmem_arch_get_private() + ALIGN_SIZE(sizeof(ofmem_t), 4); } ucell ofmem_arch_get_heap_top(void) @@ -388,15 +386,12 @@ void setup_mmu( unsigned long ramsize ) { - ofmem_t *ofmem = OFMEM; + ofmem_t *ofmem; unsigned long sdr1, sr_base, msr; unsigned long hash_base; unsigned long hash_mask = 0xffff0000; int i; - memset(ofmem, 0, sizeof(ofmem_t)); - ofmem->ramsize = ramsize; - /* SDR1: Storage Description Register 1 */ if(is_ppc64()) @@ -415,6 +410,10 @@ asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); } + ofmem = ofmem_arch_get_private(); + memset(ofmem, 0, sizeof(ofmem_t)); + ofmem->ramsize = ramsize; + memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); /* Enable MMU */ Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 16 19:36:04 2010 (r904) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 16 19:36:08 2010 (r905) @@ -313,17 +313,21 @@ * | | * +-------------------------+ * | | - * | Exception Stack (32 kB) + * | Exception Stack (32 kB) | * | | * +-------------------------+ * | | - * | Stack (64 kB) + * | Stack (64 kB) | * | | * +-------------------------+ * | | * | Client Stack (64 kB) | * | | * +-------------------------+ + * | | + * | Malloc Zone (2 MiB) | + * | | + * +-------------------------+ * : : * Bottom */

1 0

[commit] r904 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:36:04 2010 New Revision: 904 URL: http://tracker.coreboot.org/trac/openbios/changeset/904 Log: ppc: Claim memory used by OpenBIOS OpenBIOS kept getting overwritten in RAM by clients such as Haiku. Make sure memory used by OpenBIOS cannot accidentally be claimed by someone else. This also sets up the "available" property as expected. Note that we avoid ofmem_claim() as it would map the pages using a default mode, followed by a remap with the desired mode. v2: * Reordered. * Added spacing. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 19:36:00 2010 (r903) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:04 2010 (r904) @@ -429,6 +429,11 @@ { ofmem_t *ofmem = ofmem_arch_get_private(); + ofmem_claim_phys(0, get_ram_bottom(), 0); + ofmem_claim_virt(0, get_ram_bottom(), 0); ofmem_map( 0, 0, get_ram_bottom(), 0 ); + + ofmem_claim_phys(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); + ofmem_claim_virt(get_ram_top(), ofmem->ramsize - get_ram_top(), 0); ofmem_map( get_ram_top(), get_ram_top(), ofmem->ramsize - get_ram_top(), 0); }

1 0

[commit] r903 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:36:00 2010 New Revision: 903 URL: http://tracker.coreboot.org/trac/openbios/changeset/903 Log: ppc: Fix heap top Don't let the client stack and the heap overlap. v2: * Initial. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 19:35:56 2010 (r902) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:36:00 2010 (r903) @@ -97,7 +97,7 @@ static ucell get_heap_top( void ) { - return get_hash_base() - (32 + 64) * 1024; + return get_hash_base() - (32 + 64 + 64) * 1024; } static inline size_t ALIGN_SIZE(size_t x, size_t a)

1 0

[commit] r902 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:35:56 2010 New Revision: 902 URL: http://tracker.coreboot.org/trac/openbios/changeset/902 Log: ppc: Fix RAM top (2/2) The hash base is not get_rom_base() - HASH_SIZE. It gets rounded down, depending on the PVR, so read its true value from SDR1. v2: * Split up. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 19:35:53 2010 (r901) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:35:56 2010 (r902) @@ -86,7 +86,7 @@ unsigned long get_ram_top( void ) { - return get_rom_base() - HASH_SIZE - (32 + 64 + 64) * 1024; + return get_hash_base() - (32 + 64 + 64) * 1024; } unsigned long

1 0

[commit] r901 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:35:53 2010 New Revision: 901 URL: http://tracker.coreboot.org/trac/openbios/changeset/901 Log: ppc: Fix RAM top (1/2) According to the illustration in start.S, the stack size is supposed to be 64 KiB. v2: * Split up. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 19:35:51 2010 (r900) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:35:53 2010 (r901) @@ -86,7 +86,7 @@ unsigned long get_ram_top( void ) { - return get_rom_base() - HASH_SIZE - (32 + 32 + 64) * 1024; + return get_rom_base() - HASH_SIZE - (32 + 64 + 64) * 1024; } unsigned long

1 0

[commit] r900 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:35:51 2010 New Revision: 900 URL: http://tracker.coreboot.org/trac/openbios/changeset/900 Log: ppc: Remove bogus return ofmem_free() has no return value and neither does free(). Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 19:35:49 2010 (r899) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:35:51 2010 (r900) @@ -178,7 +178,7 @@ void free( void *ptr ) { - return ofmem_free(ptr); + ofmem_free(ptr); } void *

1 0

[commit] r899 - trunk/openbios-devel/arch/ppc/qemu
by repository service 16 Oct '10

16 Oct '10

Author: blueswirl Date: Sat Oct 16 19:35:49 2010 New Revision: 899 URL: http://tracker.coreboot.org/trac/openbios/changeset/899 Log: ppc: Use symbolic OpenBIOS origin address This will simplify moving OpenBIOS around in memory. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 16 17:09:18 2010 (r898) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sat Oct 16 19:35:49 2010 (r899) @@ -415,7 +415,7 @@ asm volatile("mtsrin %0,%1" :: "r" (sr_base + i), "r" (j) ); } - memcpy((void *)get_rom_base(), (void *)0xfff00000, 0x00100000); + memcpy((void *)get_rom_base(), (void *)OF_CODE_START, 0x00100000); /* Enable MMU */

1 0

libgcc problem
by Blue Swirl 16 Oct '10

16 Oct '10

Hi, I finally found out the cause of the problem that prevented us to remove our copy of libgcc. The problem was that when switching to the libgcc provided by GCC, there would be strange crashes. The cause of these crashes is that the libgcc shipped with GCC is compiled with default options, in Sparc64 case the machine model is 'embmedany'. This makes memory accesses use %g4 as base register and since we don't initialize it (because other code uses machine model 'medany'), there will be crashes due to random base with some memory accesses in libgcc. It's clear that the default machine model for Sparc64 is not compatible with OpenBIOS, as is any libgcc compiled with this model. I also found out how to make GCC compile and use separate libgccs ('multilib') for each machine model. This is enabled for sparc64-elf target case with the following patch (applies to gcc-4.6-20100925). --- gcc/config/sparc/t-crtfm.orig 2002-06-20 18:00:02.000000000 +0000 +++ gcc/config/sparc/t-crtfm 2010-10-03 14:45:31.000000000 +0000 @@ -1,4 +1,11 @@ EXTRA_PARTS += crtfastmath.o +MULTILIB_OPTIONS = mcmodel=medany/mcmodel=medmid/mcmodel=medlow +MULTILIB_DIRNAMES = medany medmid medlow +MULTILIB_MATCHES = + +LIBGCC = stmp-multilib +INSTALL_LIBGCC = install-multilib + $(T)crtfastmath.o: $(srcdir)/config/sparc/crtfastmath.c $(GCC_PASSES) $(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) $(LIBGCC2_CFLAGS) -c -o $(T)crtfastmath.o $(srcdir)/config/sparc/crtfastmath.c The correct configuration can be seen with this command: $ sparc64-elf-gcc --print-multi-lib .; medany;@mcmodel=medany medmid;@mcmodel=medmid medlow;@mcmodel=medlow $ sparc64-elf-gcc -v Using built-in specs. COLLECT_GCC=sparc64-elf-gcc COLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/sparc64-elf/4.6.0/lto-wrapper Target: sparc64-elf Configured with: ../configure --target=sparc64-elf --enable-targets=sparc64-elf --disable-nls --disable-threads --enable-languages=c --disable-shared --disable-libssp --enable-multilib Thread model: single gcc version 4.6.0 20100925 (experimental) (GCC) With this version, openbios-sparc64 without our local libgcc works as well as the old version. It may also be possible to change the default machine model, but I didn't try that. This way may be easier if the GCC is not new enough to support multilib. Now the big question is, should we still aim for removal? I'm not sure if libgccs shipped with native GCCs are compatible. Requiring a specifically patched GCC does not seem so attractive, though most people probably make a cross compiler anyway.

2 3

[commit] r897 - trunk/openbios-devel/arch/sparc64
by repository service 16 Oct '10

16 Oct '10

Author: mcayland Date: Sat Oct 16 16:13:15 2010 New Revision: 897 URL: http://tracker.coreboot.org/trac/openbios/changeset/897 Log: Replace hardcoded value with the correct constant from spitfire.h. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/lib.c Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sat Oct 16 16:02:18 2010 (r896) +++ trunk/openbios-devel/arch/sparc64/lib.c Sat Oct 16 16:13:15 2010 (r897) @@ -154,7 +154,7 @@ if (va >= t->virt && va < (t->virt + t->size)) { /* valid tte, 8k size */ - tte_data = 0x8000000000000000UL; + tte_data = SPITFIRE_TTE_VALID; /* mix in phys address mode */ tte_data |= t->mode;

1 0

[commit] r896 - trunk/openbios-devel/libopenbios
by repository service 16 Oct '10

16 Oct '10

Author: mcayland Date: Sat Oct 16 16:02:18 2010 New Revision: 896 URL: http://tracker.coreboot.org/trac/openbios/changeset/896 Log: Change OFMEM so that the generated available, physical and virtual properties are passed by reference into Forth. The previous code used the standard set_property() function which copies the new property into the dictionary each time the property is set. During OpenSolaris boot, this would cause OpenBIOS to run out of memory due to large number of changes to the memory regions. Now for each property we have a static buffer allocated within OpenBIOS which starts from 2K and doubles in size everytime the memory region is exhausted, and set the address directly to the relevant buffer. This saves a great deal of memory and prevents the dictionary and internal memory regions from being exhausted during OpenSolaris boot. 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 Wed Oct 13 16:01:51 2010 (r895) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sat Oct 16 16:02:18 2010 (r896) @@ -1,5 +1,5 @@ /* - * <ofmem_sparc64.c> + * <ofmem_common.c> * * OF Memory manager * @@ -16,6 +16,9 @@ #include "libopenbios/bindings.h" #include "libopenbios/ofmem.h" +/* Default size of memory allocated for each of the MMU properties (in bytes) */ +#define OFMEM_DEFAULT_PROP_SIZE 2048 + /* * define OFMEM_FILL_RANGE to claim any unclaimed virtual and * physical memory in the range for ofmem_map @@ -166,6 +169,28 @@ /* "translations" and "available" property tracking */ /************************************************************************/ +static int trans_prop_size = 0, phys_range_prop_size = 0, virt_range_prop_size = 0; +static int trans_prop_used = 0, phys_range_prop_used = 0, virt_range_prop_used = 0; +static ucell *trans_prop, *phys_range_prop, *virt_range_prop; + +static void +ofmem_set_property( phandle_t ph, const char *name, const char *buf, int len ) +{ + /* This is very similar to set_property() in libopenbios/bindings.c but allows + us to set the property pointer directly, rather than having to copy it + into the Forth dictonary every time we update the memory properties */ + if( !ph ) { + printk("ofmem_set_property: NULL phandle\n"); + return; + } + PUSH((ucell)buf); + PUSH(len); + PUSH((ucell)name); + PUSH(strlen(name)); + PUSH_ph(ph); + fword("encode-property"); +} + static phandle_t s_phandle_memory = 0; static phandle_t s_phandle_mmu = 0; @@ -173,8 +198,7 @@ { ofmem_t *ofmem = ofmem_arch_get_private(); translation_t *t; - int ncells; - ucell *props; + int ncells, prop_used, prop_size; if (s_phandle_mmu == 0) return; @@ -182,31 +206,49 @@ for( t = ofmem->trans, ncells = 0; t ; t=t->next, ncells++ ) { } - props = malloc(ncells * sizeof(ucell) * ofmem_arch_get_translation_entry_size()); + /* Get the current number of bytes required for the MMU translation property */ + prop_used = ncells * sizeof(ucell) * ofmem_arch_get_translation_entry_size(); + + if (prop_used > trans_prop_size) { + + /* The property doesn't fix within the existing space, so keep doubling it + until it does */ + prop_size = trans_prop_size; + while (prop_size < prop_used) { + prop_size *= 2; + } + + /* Allocate the new memory and copy all of the existing information across */ + trans_prop = realloc(trans_prop, prop_size); + trans_prop_size = prop_size; + trans_prop_used = prop_used; + } - if (props == NULL) + if (trans_prop == NULL) { + /* out of memory! */ + printk("Unable to allocate memory for translations property!\n"); return; + } /* Call architecture-specific routines to generate translation entries */ for( t = ofmem->trans, ncells = 0 ; t ; t=t->next ) { - ofmem_arch_create_translation_entry(&props[ncells], t); + ofmem_arch_create_translation_entry(&trans_prop[ncells], t); ncells += ofmem_arch_get_translation_entry_size(); } - set_property(s_phandle_mmu, "translations", - (char*)props, ncells * sizeof(props[0])); + ofmem_set_property(s_phandle_mmu, "translations", + (char*)trans_prop, ncells * sizeof(trans_prop[0])); - free(props); } + static void ofmem_update_memory_available( phandle_t ph, range_t *range, - u64 top_address ) + ucell **mem_prop, int *mem_prop_size, int *mem_prop_used, u64 top_address ) { range_t *r; - int ncells; - ucell *props; + int ncells, prop_used, prop_size; - ucell start, size; + ucell start, size, *prop; if (s_phandle_memory == 0) return; @@ -216,15 +258,32 @@ } /* inverse of phys_range list could take 2 more cells for the tail */ - props = malloc((ncells+1) * sizeof(ucell) * 2); + prop_used = (ncells+1) * sizeof(ucell) * 2; + + if (prop_used > *mem_prop_size) { - if (props == NULL) { + /* The property doesn't fix within the existing space, so keep doubling it + until it does */ + prop_size = *mem_prop_size; + while (prop_size < prop_used) { + prop_size *= 2; + } + + /* Allocate the new memory and copy all of the existing information across */ + *mem_prop = realloc(*mem_prop, prop_size); + *mem_prop_size = prop_size; + *mem_prop_used = prop_used; + } + + if (*mem_prop == NULL) { /* out of memory! */ + printk("Unable to allocate memory for memory range property!\n"); return; } start = 0; ncells = 0; + prop = *mem_prop; for (r = range; r; r=r->next) { if (r->start >= top_address) { @@ -233,32 +292,30 @@ size = r->start - start; if (size) { - props[ncells++] = start; - props[ncells++] = size; + prop[ncells++] = start; + prop[ncells++] = size; } start = r->start + r->size; } /* tail */ if (start < top_address) { - props[ncells++] = start; - props[ncells++] = top_address - start; + prop[ncells++] = start; + prop[ncells++] = top_address - start; } - set_property(ph, "available", - (char*)props, ncells * sizeof(props[0])); - - free(props); + ofmem_set_property(ph, "available", + (char*)prop, ncells * sizeof(prop[0])); } static void ofmem_update_translations( void ) { ofmem_t *ofmem = ofmem_arch_get_private(); - ofmem_update_memory_available(s_phandle_memory, - ofmem->phys_range, get_ram_size()); - ofmem_update_memory_available(s_phandle_mmu, - ofmem->virt_range, -1ULL); + ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, + &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, get_ram_size()); + ofmem_update_memory_available(s_phandle_mmu, ofmem->virt_range, + &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, -1ULL); ofmem_update_mmu_translations(); } @@ -741,5 +798,11 @@ s_phandle_memory = ph_memory; s_phandle_mmu = ph_mmu; + /* Initialise some default property sizes */ + trans_prop_size = phys_range_prop_size = virt_range_prop_size = OFMEM_DEFAULT_PROP_SIZE; + trans_prop = malloc(trans_prop_size); + phys_range_prop = malloc(phys_range_prop_size); + virt_range_prop = malloc(virt_range_prop_size); + ofmem_update_translations(); }

1 0

Hello Solaris :)
by Mark Cave-Ayland 14 Oct '10

14 Oct '10

Hi everyone, For those of you interested in the progress of Solaris on OpenBIOS, I'm pleased to report the following output from SVN trunk (r886) with the attached patch applied (this is because the OpenSolaris 10 kernel seems to want quite a lot of run-time memory - more on this later): Solaris 9 installation CD: OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Oct 3 2010 20:40 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 5936 bytes entry point is 0x4000 open isn't unique. Jumping to entry point 0000000000100000 for type 0000000000000001... switching to new context: entry point 0x100000 stack 0x00000000ffe06b49 warning:interpret: exception -13 caught SunOS Release 5.9 Version Generic 64-bit Copyright 1983-2002 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. Milax CD (OpenSolaris): OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.0 built on Oct 3 2010 20:40 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 7084 bytes entry point is 0x4000 Ignoring failed claim for va 1000000 memsz bf34e! Ignoring failed claim for va 1402000 memsz 303b3! Ignoring failed claim for va 1800000 memsz 60a30! Jumping to entry point 00000000010071d8 for type 0000000000000001... switching to new context: entry point 0x10071d8 stack 0x00000000ffe06b49 warning:interpret: exception -13 caught SunOS Release 5.11 Version MilaX_0.3.2 64-bit Copyright 1983-2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. spacex@:interpret: exception -13 caught kdbg-words:interpret: exception -13 caught cb-r/w:interpret: exception -13 caught out of malloc memory (f28)! out of malloc memory (a10)! out of malloc memory (a70)! out of malloc memory (f28)! out of malloc memory (a10)! out of malloc memory (a70)! ...etc... A couple of things that will be of interest to other developers: - Solaris 9 seems to get stuck in a tight loop at the bottom of memory and doesn't want to proceed any further. - In order to get Milax to boot this far, I had to keep increasing the memory requirements (and as you can see, it still wants more). There is a lot of MMU mapping activity, and so I suspect most of the dictionary space is being used to update the translations properties. We really need to optimise OFMEM so that it doesn't keep allocating new space from the dictionary all the time which should help reduce this immensely. - Building with -O0 rather than -Os breaks Milax boot (the new SAVE_CPU_STATE handler falls over). This suggests that the stack is getting clobbered somewhere - Igor, any pointers on this one? But all in all, I think we're looking quite good :) 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 3

[commit] r885 - trunk/openbios-devel/libgcc
by repository service 13 Oct '10

13 Oct '10

Author: blueswirl Date: Sun Oct 3 21:18:28 2010 New Revision: 885 URL: http://tracker.coreboot.org/trac/openbios/changeset/885 Log: ppc: fix build with newer GCCs New GCCs (for example 4.6.0) needed a few more functions to libgcc. Without the functions, there were a lot of linker errors: LINK openbios-qemu.elf libqemu.a(ofmem.o): In function `hash_page': /src/openbios-devel/obj-ppc/../arch/ppc/qemu/ofmem.c:353: undefined reference to `_restgpr_25_x' libqemu.a(ofmem.o): In function `ea_to_phys': /src/openbios-devel/obj-ppc/../arch/ppc/qemu/ofmem.c:231: undefined reference to `_restgpr_30_x' etc. Copy the needed functions from Linux. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Added: trunk/openbios-devel/libgcc/crtsavres.S Modified: trunk/openbios-devel/libgcc/build.xml Modified: trunk/openbios-devel/libgcc/build.xml ============================================================================== --- trunk/openbios-devel/libgcc/build.xml Sun Oct 3 21:18:26 2010 (r884) +++ trunk/openbios-devel/libgcc/build.xml Sun Oct 3 21:18:28 2010 (r885) @@ -10,6 +10,8 @@ <object source="__udivmoddi4.c"/> <object source="__umoddi3.c"/> + <object source="crtsavres.S" condition="PPC"/> +  <object source="__divti3.c" condition="SPARC64"/> <object source="__udivti3.c" condition="SPARC64"/> @@ -17,7 +19,6 @@ <object source="__umodti3.c" condition="SPARC64"/> <object source="multi3.c" condition="SPARC64"/> <object source="__negti2.c" condition="SPARC64"/> - </library> </build> Added: trunk/openbios-devel/libgcc/crtsavres.S ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/openbios-devel/libgcc/crtsavres.S Sun Oct 3 21:18:28 2010 (r885) @@ -0,0 +1,401 @@ +/* + * Special support for eabi and SVR4 + * + * Copyright (C) 1995, 1996, 1998, 2000, 2001 Free Software Foundation, Inc. + * Copyright 2008 Freescale Semiconductor, Inc. + * Written By Michael Meissner + * + * Based on gcc/config/rs6000/crtsavres.asm from gcc + * 64 bit additions from reading the PPC elf64abi document. + * + * This file is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. + * + * In addition to the permissions in the GNU General Public License, the + * Free Software Foundation gives you unlimited permission to link the + * compiled version of this file with other programs, and to distribute + * those programs without any restriction coming from the use of this + * file. (The General Public License restrictions do apply in other + * respects; for example, they cover modification of the file, and + * distribution when not linked into another program.) + * + * This file is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; see the file COPYING. If not, write to + * the Free Software Foundation, 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301, USA. + * + * As a special exception, if you link this library with files + * compiled with GCC to produce an executable, this does not cause + * the resulting executable to be covered by the GNU General Public License. + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + */ + +/* taken from Linux arch/powerpc/lib/crtsavres.S */ + +/* arch/powerpc/include/asm/ppc_asm.h */ +#ifdef CONFIG_PPC64 + +#define XGLUE(a,b) a##b +#define GLUE(a,b) XGLUE(a,b) + +#define _GLOBAL(name) \ + .section ".text"; \ + .align 2 ; \ + .globl name; \ + .globl GLUE(.,name); \ + .section ".opd","aw"; \ +name: \ + .quad GLUE(.,name); \ + .quad .TOC.@tocbase; \ + .quad 0; \ + .previous; \ + .type GLUE(.,name),@function; \ +GLUE(.,name): + +#else /* 32-bit */ + +/* include/linux/stringify.h */ + +/* Indirect stringification. Doing two levels allows the parameter to be a + * macro itself. For example, compile with -DFOO=bar, __stringify(FOO) + * converts to "bar". + */ + +#define __stringify_1(x...) #x +#define __stringify(x...) __stringify_1(x) + +/* arch/powerpc/include/asm/ppc_asm.h continues */ + +#define _GLOBAL(n) \ + .text; \ + .stabs __stringify(n:F-1),N_FUN,0,0,n;\ + .globl n; \ +n: + +/* some stab codes */ +#define N_FUN 36 + +#endif + +/* arch/powerpc/lib/crtsavres.S continues */ + + .file "crtsavres.S" + .section ".text" + +#ifndef CONFIG_PPC64 + +/* Routines for saving integer registers, called by the compiler. */ +/* Called with r11 pointing to the stack header word of the caller of the */ +/* function, just beyond the end of the integer save area. */ + +_GLOBAL(_savegpr_14) +_GLOBAL(_save32gpr_14) + stw 14,-72(11) /* save gp registers */ +_GLOBAL(_savegpr_15) +_GLOBAL(_save32gpr_15) + stw 15,-68(11) +_GLOBAL(_savegpr_16) +_GLOBAL(_save32gpr_16) + stw 16,-64(11) +_GLOBAL(_savegpr_17) +_GLOBAL(_save32gpr_17) + stw 17,-60(11) +_GLOBAL(_savegpr_18) +_GLOBAL(_save32gpr_18) + stw 18,-56(11) +_GLOBAL(_savegpr_19) +_GLOBAL(_save32gpr_19) + stw 19,-52(11) +_GLOBAL(_savegpr_20) +_GLOBAL(_save32gpr_20) + stw 20,-48(11) +_GLOBAL(_savegpr_21) +_GLOBAL(_save32gpr_21) + stw 21,-44(11) +_GLOBAL(_savegpr_22) +_GLOBAL(_save32gpr_22) + stw 22,-40(11) +_GLOBAL(_savegpr_23) +_GLOBAL(_save32gpr_23) + stw 23,-36(11) +_GLOBAL(_savegpr_24) +_GLOBAL(_save32gpr_24) + stw 24,-32(11) +_GLOBAL(_savegpr_25) +_GLOBAL(_save32gpr_25) + stw 25,-28(11) +_GLOBAL(_savegpr_26) +_GLOBAL(_save32gpr_26) + stw 26,-24(11) +_GLOBAL(_savegpr_27) +_GLOBAL(_save32gpr_27) + stw 27,-20(11) +_GLOBAL(_savegpr_28) +_GLOBAL(_save32gpr_28) + stw 28,-16(11) +_GLOBAL(_savegpr_29) +_GLOBAL(_save32gpr_29) + stw 29,-12(11) +_GLOBAL(_savegpr_30) +_GLOBAL(_save32gpr_30) + stw 30,-8(11) +_GLOBAL(_savegpr_31) +_GLOBAL(_save32gpr_31) + stw 31,-4(11) + blr + +/* Routines for restoring integer registers, called by the compiler. */ +/* Called with r11 pointing to the stack header word of the caller of the */ +/* function, just beyond the end of the integer restore area. */ + +_GLOBAL(_restgpr_14) +_GLOBAL(_rest32gpr_14) + lwz 14,-72(11) /* restore gp registers */ +_GLOBAL(_restgpr_15) +_GLOBAL(_rest32gpr_15) + lwz 15,-68(11) +_GLOBAL(_restgpr_16) +_GLOBAL(_rest32gpr_16) + lwz 16,-64(11) +_GLOBAL(_restgpr_17) +_GLOBAL(_rest32gpr_17) + lwz 17,-60(11) +_GLOBAL(_restgpr_18) +_GLOBAL(_rest32gpr_18) + lwz 18,-56(11) +_GLOBAL(_restgpr_19) +_GLOBAL(_rest32gpr_19) + lwz 19,-52(11) +_GLOBAL(_restgpr_20) +_GLOBAL(_rest32gpr_20) + lwz 20,-48(11) +_GLOBAL(_restgpr_21) +_GLOBAL(_rest32gpr_21) + lwz 21,-44(11) +_GLOBAL(_restgpr_22) +_GLOBAL(_rest32gpr_22) + lwz 22,-40(11) +_GLOBAL(_restgpr_23) +_GLOBAL(_rest32gpr_23) + lwz 23,-36(11) +_GLOBAL(_restgpr_24) +_GLOBAL(_rest32gpr_24) + lwz 24,-32(11) +_GLOBAL(_restgpr_25) +_GLOBAL(_rest32gpr_25) + lwz 25,-28(11) +_GLOBAL(_restgpr_26) +_GLOBAL(_rest32gpr_26) + lwz 26,-24(11) +_GLOBAL(_restgpr_27) +_GLOBAL(_rest32gpr_27) + lwz 27,-20(11) +_GLOBAL(_restgpr_28) +_GLOBAL(_rest32gpr_28) + lwz 28,-16(11) +_GLOBAL(_restgpr_29) +_GLOBAL(_rest32gpr_29) + lwz 29,-12(11) +_GLOBAL(_restgpr_30) +_GLOBAL(_rest32gpr_30) + lwz 30,-8(11) +_GLOBAL(_restgpr_31) +_GLOBAL(_rest32gpr_31) + lwz 31,-4(11) + blr + +/* Routines for restoring integer registers, called by the compiler. */ +/* Called with r11 pointing to the stack header word of the caller of the */ +/* function, just beyond the end of the integer restore area. */ + +_GLOBAL(_restgpr_14_x) +_GLOBAL(_rest32gpr_14_x) + lwz 14,-72(11) /* restore gp registers */ +_GLOBAL(_restgpr_15_x) +_GLOBAL(_rest32gpr_15_x) + lwz 15,-68(11) +_GLOBAL(_restgpr_16_x) +_GLOBAL(_rest32gpr_16_x) + lwz 16,-64(11) +_GLOBAL(_restgpr_17_x) +_GLOBAL(_rest32gpr_17_x) + lwz 17,-60(11) +_GLOBAL(_restgpr_18_x) +_GLOBAL(_rest32gpr_18_x) + lwz 18,-56(11) +_GLOBAL(_restgpr_19_x) +_GLOBAL(_rest32gpr_19_x) + lwz 19,-52(11) +_GLOBAL(_restgpr_20_x) +_GLOBAL(_rest32gpr_20_x) + lwz 20,-48(11) +_GLOBAL(_restgpr_21_x) +_GLOBAL(_rest32gpr_21_x) + lwz 21,-44(11) +_GLOBAL(_restgpr_22_x) +_GLOBAL(_rest32gpr_22_x) + lwz 22,-40(11) +_GLOBAL(_restgpr_23_x) +_GLOBAL(_rest32gpr_23_x) + lwz 23,-36(11) +_GLOBAL(_restgpr_24_x) +_GLOBAL(_rest32gpr_24_x) + lwz 24,-32(11) +_GLOBAL(_restgpr_25_x) +_GLOBAL(_rest32gpr_25_x) + lwz 25,-28(11) +_GLOBAL(_restgpr_26_x) +_GLOBAL(_rest32gpr_26_x) + lwz 26,-24(11) +_GLOBAL(_restgpr_27_x) +_GLOBAL(_rest32gpr_27_x) + lwz 27,-20(11) +_GLOBAL(_restgpr_28_x) +_GLOBAL(_rest32gpr_28_x) + lwz 28,-16(11) +_GLOBAL(_restgpr_29_x) +_GLOBAL(_rest32gpr_29_x) + lwz 29,-12(11) +_GLOBAL(_restgpr_30_x) +_GLOBAL(_rest32gpr_30_x) + lwz 30,-8(11) +_GLOBAL(_restgpr_31_x) +_GLOBAL(_rest32gpr_31_x) + lwz 0,4(11) + lwz 31,-4(11) + mtlr 0 + mr 1,11 + blr + +#else /* CONFIG_PPC64 */ + +.globl _savegpr0_14 +_savegpr0_14: + std r14,-144(r1) +.globl _savegpr0_15 +_savegpr0_15: + std r15,-136(r1) +.globl _savegpr0_16 +_savegpr0_16: + std r16,-128(r1) +.globl _savegpr0_17 +_savegpr0_17: + std r17,-120(r1) +.globl _savegpr0_18 +_savegpr0_18: + std r18,-112(r1) +.globl _savegpr0_19 +_savegpr0_19: + std r19,-104(r1) +.globl _savegpr0_20 +_savegpr0_20: + std r20,-96(r1) +.globl _savegpr0_21 +_savegpr0_21: + std r21,-88(r1) +.globl _savegpr0_22 +_savegpr0_22: + std r22,-80(r1) +.globl _savegpr0_23 +_savegpr0_23: + std r23,-72(r1) +.globl _savegpr0_24 +_savegpr0_24: + std r24,-64(r1) +.globl _savegpr0_25 +_savegpr0_25: + std r25,-56(r1) +.globl _savegpr0_26 +_savegpr0_26: + std r26,-48(r1) +.globl _savegpr0_27 +_savegpr0_27: + std r27,-40(r1) +.globl _savegpr0_28 +_savegpr0_28: + std r28,-32(r1) +.globl _savegpr0_29 +_savegpr0_29: + std r29,-24(r1) +.globl _savegpr0_30 +_savegpr0_30: + std r30,-16(r1) +.globl _savegpr0_31 +_savegpr0_31: + std r31,-8(r1) + std r0,16(r1) + blr + +.globl _restgpr0_14 +_restgpr0_14: + ld r14,-144(r1) +.globl _restgpr0_15 +_restgpr0_15: + ld r15,-136(r1) +.globl _restgpr0_16 +_restgpr0_16: + ld r16,-128(r1) +.globl _restgpr0_17 +_restgpr0_17: + ld r17,-120(r1) +.globl _restgpr0_18 +_restgpr0_18: + ld r18,-112(r1) +.globl _restgpr0_19 +_restgpr0_19: + ld r19,-104(r1) +.globl _restgpr0_20 +_restgpr0_20: + ld r20,-96(r1) +.globl _restgpr0_21 +_restgpr0_21: + ld r21,-88(r1) +.globl _restgpr0_22 +_restgpr0_22: + ld r22,-80(r1) +.globl _restgpr0_23 +_restgpr0_23: + ld r23,-72(r1) +.globl _restgpr0_24 +_restgpr0_24: + ld r24,-64(r1) +.globl _restgpr0_25 +_restgpr0_25: + ld r25,-56(r1) +.globl _restgpr0_26 +_restgpr0_26: + ld r26,-48(r1) +.globl _restgpr0_27 +_restgpr0_27: + ld r27,-40(r1) +.globl _restgpr0_28 +_restgpr0_28: + ld r28,-32(r1) +.globl _restgpr0_29 +_restgpr0_29: + ld r0,16(r1) + ld r29,-24(r1) + mtlr r0 + ld r30,-16(r1) + ld r31,-8(r1) + blr + +.globl _restgpr0_30 +_restgpr0_30: + ld r30,-16(r1) +.globl _restgpr0_31 +_restgpr0_31: + ld r0,16(r1) + ld r31,-8(r1) + mtlr r0 + blr + +#endif /* CONFIG_PPC64 */

2 1

[PATCH, RFT] ppc: Suppress /hypervisor outside KVM
by Andreas Färber 13 Oct '10

13 Oct '10

My New World PowerMac G3 does not have a /hypervisor node. Move all Forth code to kvm_of_init() to make it match the comment: Don't expose /hypervisor when not in KVM. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- Hello Alex, Could you please test this on the KVM side of things? Thanks! Andreas arch/ppc/qemu/init.c | 12 +++++++++++- arch/ppc/qemu/tree.fs | 5 ----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 3979f5d..6601b7c 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -526,9 +526,17 @@ static void kvm_of_init(void) if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) return; - push_str("/hypervisor"); + push_str("/"); fword("find-device"); + fword("new-device"); + + push_str("hypervisor"); + fword("device-name"); + + push_str("hypervisor"); + fword("device-type"); + /* compatible */ push_str("linux,kvm"); @@ -567,6 +575,8 @@ static void kvm_of_init(void) fword("encode-string"); push_str("guest-name"); fword("property"); + + fword("finish-device"); } void diff --git a/arch/ppc/qemu/tree.fs b/arch/ppc/qemu/tree.fs index b7bb706..4d107a9 100644 --- a/arch/ppc/qemu/tree.fs +++ b/arch/ppc/qemu/tree.fs @@ -39,11 +39,6 @@ new-device : close ; finish-device -new-device - " hypervisor" device-name - " hypervisor" device-type -finish-device - \ ------------------------------------------------------------- \ /packages \ ------------------------------------------------------------- -- 1.7.3

2 1

[commit] r895 - trunk/openbios-devel/arch/ppc/qemu
by repository service 13 Oct '10

13 Oct '10

Author: agraf Date: Wed Oct 13 16:01:51 2010 New Revision: 895 URL: http://tracker.coreboot.org/trac/openbios/changeset/895 Log: ppc: Suppress /hypervisor outside KVM My New World PowerMac G3 does not have a /hypervisor node. Move all Forth code to kvm_of_init() to make it match the comment: Don't expose /hypervisor when not in KVM. Cc: Alexander Graf <agraf(a)suse.de> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/tree.fs Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Oct 9 12:16:33 2010 (r894) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Wed Oct 13 16:01:51 2010 (r895) @@ -526,9 +526,17 @@ if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) return; - push_str("/hypervisor"); + push_str("/"); fword("find-device"); + fword("new-device"); + + push_str("hypervisor"); + fword("device-name"); + + push_str("hypervisor"); + fword("device-type"); + /* compatible */ push_str("linux,kvm"); @@ -567,6 +575,8 @@ fword("encode-string"); push_str("guest-name"); fword("property"); + + fword("finish-device"); } void Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/tree.fs Sat Oct 9 12:16:33 2010 (r894) +++ trunk/openbios-devel/arch/ppc/qemu/tree.fs Wed Oct 13 16:01:51 2010 (r895) @@ -39,11 +39,6 @@ : close ; finish-device -new-device - " hypervisor" device-name - " hypervisor" device-type -finish-device - \ ------------------------------------------------------------- \ /packages \ -------------------------------------------------------------

1 0

Re: [OpenBIOS] PReP PowerPC "emulation"
by Massimo Montecchi 12 Oct '10

12 Oct '10

Until r828 was in this way ... then somethink was wrong.... 2010/9/13 Laurent Vivier <Laurent(a)vivier.eu> > > Hi, > > the last time I tried to boot AIX (6 or 7 monthes ago...), OpenBIOS was > able to load the bootloader but as RTAS is not provided by OpenBIOS, > bootloader failed and didn't go further. I think it was with the CHRP > emulation. > > Regards, > Laurent > > > > > Hi, > > I have tried qemu from 0.11 to latest git (as of 11/09/2010) with latest > openbios inside, but if i want to use PREP PPC "machine" the error is the > same: > > qemu: hardware error: PowerPC 601 / 620 / 970 need a 1MB BIOS > > CPU #0: > NIP 00000000 LR 00000000 CTR 00000000 XER 00000000 > MSR 00000000 HID0 00000000 HF 00000000 idx 0 > TB 00000000 00000000 DECR ffffffff > GPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > GPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > CR 00000000 [ - - - - - - - - ] RES 00000000 > FPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 > FPSCR 00000000 > SRR0 00000000 SRR1 00000000 SDR1 00000000 > > How can I use openbios to start an AIX with qemu ? > > -- > Cordiali Saluti/Best Regards > > Massimo Montecchi > Modena - Italy > > > > > -- > --------------------- Laurent(a)vivier.eu --------------------- > "Tout ce qui est impossible reste à accomplir" Jules Verne > "Things are only impossible until they're not" Jean-Luc Picard > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you > -- Cordiali Saluti/Best Regards Massimo Montecchi Modena - Italy

4 12

[PATCH] ppc: Fix typos in comment
by Andreas Färber 09 Oct '10

09 Oct '10

Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- arch/ppc/qemu/start.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S index d6777a8..d74fb9c 100644 --- a/arch/ppc/qemu/start.S +++ b/arch/ppc/qemu/start.S @@ -351,9 +351,9 @@ GLOBL(_entry): * * MSR = FP, ME + (DR|IR) * r1 = stack (32 K + 32 bytes link area above) - * r5 = clint interface handler + * r5 = client interface handler * r6 = address of client program arguments (unused) - * r7 = length of client program arguments (unsed) + * r7 = length of client program arguments (unused) * * Yaboot and Linux use r3 and r4 for initrd address and size */ -- 1.7.3

2 1

[PATCH] Fix test-method argument order
by Andreas Färber 09 Oct '10

09 Oct '10

test-method for "instantiate-rtas" would fail on the /rtas node. According to CHRP 1.5 draft, the stack order seems reversed. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- forth/system/ciface.fs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/forth/system/ciface.fs b/forth/system/ciface.fs index 27a1deb..ff87608 100644 --- a/forth/system/ciface.fs +++ b/forth/system/ciface.fs @@ -315,10 +315,10 @@ external \ PowerPC Microprocessor CHRP binding \ 10.5.2. Client Interface -( phandle cstring-method -- missing ) +( cstring-method phandle -- missing ) : test-method - dup cstrlen rot + swap dup cstrlen rot find-method 0= if -1 else drop 0 then ; [THEN] -- 1.7.3

2 1

[PATCH 1/3] Fix getprop return value trace
by Andreas Färber 09 Oct '10

09 Oct '10

Don't trace the buffer length in place of the property size. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- libopenbios/client.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libopenbios/client.c b/libopenbios/client.c index 16e4323..2b78dcc 100644 --- a/libopenbios/client.c +++ b/libopenbios/client.c @@ -170,7 +170,7 @@ static void dump_return(prom_args_t *pb) } else if (strcmp(pb->service, "getproplen") == 0) { printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { - printk("%ld\n", pb->args[3]); + printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[2], pb->args[3]); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); -- 1.7.3

2 3

[commit] r894 - trunk/openbios-devel/forth/system
by repository service 09 Oct '10

09 Oct '10

Author: blueswirl Date: Sat Oct 9 12:16:33 2010 New Revision: 894 URL: http://tracker.coreboot.org/trac/openbios/changeset/894 Log: Fix getprop return value According to IEEE 1275, "Size is either the actual size of the property, or –1 if name does not exist." The property might be larger than the client's buffer, so don't dup the min used for writing into the buffer but the original proplen value. Insert a comment to show what's going on. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Sat Oct 9 12:16:29 2010 (r893) +++ trunk/openbios-devel/forth/system/ciface.fs Sat Oct 9 12:16:33 2010 (r894) @@ -97,8 +97,9 @@ over cstrlen swap ?phandle get-package-property if 2drop -1 exit then ( buflen buf prop proplen ) - >r swap rot r> min - dup >r move r> + >r swap rot r> + ( prop buf buflen proplen ) + dup >r min move r> ; \ 1 OK, 0 no more prop, -1 prev invalid

1 0

[commit] r893 - trunk/openbios-devel/libopenbios
by repository service 09 Oct '10

09 Oct '10

Author: blueswirl Date: Sat Oct 9 12:16:29 2010 New Revision: 893 URL: http://tracker.coreboot.org/trac/openbios/changeset/893 Log: Improve getprop mem dump Currently the whole buffer supplied by the client is traced. AIX uses buffer sizes such as 64, 256, 1024 on properties that might not exist or contain 1 or 8 bytes. Limit the output to the amount of data actually written into the buffer. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sat Oct 9 12:16:26 2010 (r892) +++ trunk/openbios-devel/libopenbios/client.c Sat Oct 9 12:16:29 2010 (r893) @@ -171,7 +171,8 @@ printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[2], pb->args[3]); + if ((long)pb->args[pb->nargs] != -1) + memdump((char*)pb->args[2], MIN(pb->args[3], pb->args[pb->nargs])); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[2], pb->args[pb->nargs]);

1 0

[commit] r892 - trunk/openbios-devel/arch/ppc/qemu
by repository service 09 Oct '10

09 Oct '10

Author: blueswirl Date: Sat Oct 9 12:16:26 2010 New Revision: 892 URL: http://tracker.coreboot.org/trac/openbios/changeset/892 Log: ppc: Fix typos in comment Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Sat Oct 9 12:16:23 2010 (r891) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 9 12:16:26 2010 (r892) @@ -351,9 +351,9 @@ * * MSR = FP, ME + (DR|IR) * r1 = stack (32 K + 32 bytes link area above) - * r5 = clint interface handler + * r5 = client interface handler * r6 = address of client program arguments (unused) - * r7 = length of client program arguments (unsed) + * r7 = length of client program arguments (unused) * * Yaboot and Linux use r3 and r4 for initrd address and size */

1 0

[commit] r891 - trunk/openbios-devel/forth/system
by repository service 09 Oct '10

09 Oct '10

Author: blueswirl Date: Sat Oct 9 12:16:23 2010 New Revision: 891 URL: http://tracker.coreboot.org/trac/openbios/changeset/891 Log: Fix test-method argument order test-method for "instantiate-rtas" would fail on the /rtas node. According to CHRP 1.5 draft, the stack order seems reversed. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Sat Oct 9 12:16:21 2010 (r890) +++ trunk/openbios-devel/forth/system/ciface.fs Sat Oct 9 12:16:23 2010 (r891) @@ -314,10 +314,10 @@ \ PowerPC Microprocessor CHRP binding \ 10.5.2. Client Interface -( phandle cstring-method -- missing ) +( cstring-method phandle -- missing ) : test-method - dup cstrlen rot + swap dup cstrlen rot find-method 0= if -1 else drop 0 then ; [THEN]

1 0

[commit] r890 - trunk/openbios-devel/forth/admin
by repository service 09 Oct '10

09 Oct '10

Author: blueswirl Date: Sat Oct 9 12:16:21 2010 New Revision: 890 URL: http://tracker.coreboot.org/trac/openbios/changeset/890 Log: Zero-pad byte properties .properties before: someproperty -- 3 : 1 42 3 Now: someproperty -- 3 : 01 42 03 Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Sat Oct 9 12:16:19 2010 (r889) +++ trunk/openbios-devel/forth/admin/devices.fs Sat Oct 9 12:16:21 2010 (r890) @@ -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 0

[commit] r889 - trunk/openbios-devel/libopenbios
by repository service 09 Oct '10

09 Oct '10

Author: blueswirl Date: Sat Oct 9 12:16:19 2010 New Revision: 889 URL: http://tracker.coreboot.org/trac/openbios/changeset/889 Log: Fix getprop return value trace Don't trace the buffer length in place of the property size. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sat Oct 9 10:27:09 2010 (r888) +++ trunk/openbios-devel/libopenbios/client.c Sat Oct 9 12:16:19 2010 (r889) @@ -170,7 +170,7 @@ } else if (strcmp(pb->service, "getproplen") == 0) { printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { - printk("%ld\n", pb->args[3]); + printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[2], pb->args[3]); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]);

1 0

[commit] r888 - in trunk/openbios-devel: drivers fs/hfs include/libc
by repository service 09 Oct '10

09 Oct '10

Author: blueswirl Date: Sat Oct 9 10:27:09 2010 New Revision: 888 URL: http://tracker.coreboot.org/trac/openbios/changeset/888 Log: Add GCC format attributes to print functions Fix format problems found. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/include/libc/vsprintf.h Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Tue Oct 5 10:52:49 2010 (r887) +++ trunk/openbios-devel/drivers/pci.c Sat Oct 9 10:27:09 2010 (r888) @@ -297,7 +297,7 @@ case IO_SPACE: /* [n]i[t]DD,F,RR,NNNNNNNN */ - snprintf(buf, sizeof(buf), "%si%s%x,%x,%x,%x", + snprintf(buf, sizeof(buf), "%si%s%x,%x,%x," FMT_ucellx, n ? "n" : "", /* relocatable */ t ? "t" : "", /* aliased */ dev, fn, reg, t ? lo & 0x03FF : lo); @@ -306,7 +306,7 @@ case MEMORY_SPACE_32: /* [n]m[t][p]DD,F,RR,NNNNNNNN */ - snprintf(buf, sizeof(buf), "%sm%s%s%x,%x,%x,%x", + snprintf(buf, sizeof(buf), "%sm%s%s%x,%x,%x," FMT_ucellx, n ? "n" : "", /* relocatable */ t ? "t" : "", /* aliased */ p ? "p" : "", /* prefetchable */ @@ -319,7 +319,7 @@ snprintf(buf, sizeof(buf), "%sx%s%x,%x,%x,%llx", n ? "n" : "", /* relocatable */ p ? "p" : "", /* prefetchable */ - dev, fn, reg, ((uint64_t)mid << 32) | (uint64_t)lo ); + dev, fn, reg, ((long long)mid << 32) | (long long)lo); break; } push_str(buf); Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Tue Oct 5 10:52:49 2010 (r887) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sat Oct 9 10:27:09 2010 (r888) @@ -524,7 +524,7 @@ forth_printf("\n"); while( !hfs_readdir(common->dir, &ent) ) { - forth_printf("% 10d ", ent.u.file.dsize); + forth_printf("% 10ld ", ent.u.file.dsize); print_date(ent.mddate); if( ent.flags & HFS_ISDIR ) forth_printf("%s\\\n", ent.name); Modified: trunk/openbios-devel/include/libc/vsprintf.h ============================================================================== --- trunk/openbios-devel/include/libc/vsprintf.h Tue Oct 5 10:52:49 2010 (r887) +++ trunk/openbios-devel/include/libc/vsprintf.h Sat Oct 9 10:27:09 2010 (r888) @@ -20,11 +20,16 @@ #include <stdarg.h> #include "config.h" -extern int vsprintf(char *buf, const char *fmt, va_list args ); -extern int sprintf(char * buf, const char *fmt, ...); -extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); -extern int snprintf(char * buf, size_t size, const char *fmt, ...); +int vsprintf(char *buf, const char *fmt, va_list args) + __attribute__((__format__(__printf__, 2, 0))); +int sprintf(char * buf, const char *fmt, ...) + __attribute__((__format__(__printf__, 2, 3))); +int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) + __attribute__((__format__(__printf__, 3, 0))); +int snprintf(char * buf, size_t size, const char *fmt, ...) + __attribute__((__format__(__printf__, 3, 4))); -extern int forth_printf( const char *fmt, ... ); +int forth_printf(const char *fmt, ...) + __attribute__((__format__(__printf__, 1, 2))); #endif /* _H_VSPRINTF */

1 0

[commit] r887 - trunk/openbios-devel/arch/sparc64
by repository service 05 Oct '10

05 Oct '10

Author: mcayland Date: Tue Oct 5 10:52:49 2010 New Revision: 887 URL: http://tracker.coreboot.org/trac/openbios/changeset/887 Log: Fix the MMU TLB miss handlers so that they no longer crash when building SPARC64 with -O0. This patch allocates an extra 192 bytes of stack space required by unoptimised gcc builds for saving arguments to the stack. As suggested by Igor previously (see http://lists.openbios.org/pipermail/openbios/2009-July/003762.html and SVN r508). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/vectors.S Modified: trunk/openbios-devel/arch/sparc64/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S Sun Oct 3 22:28:27 2010 (r886) +++ trunk/openbios-devel/arch/sparc64/vectors.S Tue Oct 5 10:52:49 2010 (r887) @@ -557,8 +557,9 @@ SAVE_CPU_STATE(dtlb) - /* Switch to TLB locked stack space */ - add %g1, -STACK_BIAS, %sp + /* Switch to TLB locked stack space (note we add an additional 192 bytes required for + gcc to save its arguments when building with -O0) */ + add %g1, -STACK_BIAS - 192, %sp /* Enable interrupts for window spill/fill traps */ rdpr %pstate, %g7 @@ -581,8 +582,9 @@ SAVE_CPU_STATE(itlb) - /* Switch to TLB locked stack space */ - add %g1, -STACK_BIAS, %sp + /* Switch to TLB locked stack space (note we add an additional 192 bytes required for + gcc to save its arguments when building with -O0) */ + add %g1, -STACK_BIAS - 192, %sp /* Enable interrupts for window spill/fill traps */ rdpr %pstate, %g7

1 0

[commit] r879 - in trunk/openbios-devel/config: examples scripts
by repository service 03 Oct '10

03 Oct '10

Author: blueswirl Date: Sun Oct 3 16:23:18 2010 New Revision: 879 URL: http://tracker.coreboot.org/trac/openbios/changeset/879 Log: Improve compile system Autodetect cross compilation, so cross- prefix is no longer needed. Unify cross and native configurations. Add unix- prefix to enable openbios-unix build for selected target, similarly builtin- for builtin targets etc. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Deleted: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/cross-sparc32_config.xml trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/cross-x86_config.xml Modified: trunk/openbios-devel/config/examples/amd64_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/examples/sparc32_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml trunk/openbios-devel/config/examples/x86_config.xml trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/examples/amd64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/amd64_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/amd64_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,20 +1,6 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_AMD64" type="boolean" value="true"/> - <option name="CONFIG_LITTLE_ENDIAN" type="boolean" value="true"/> -  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> - <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> @@ -72,5 +58,3 @@ <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> - -</config> Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,19 +1,3 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_PPC" type="boolean" value="true"/> - <option name="CONFIG_MOL" type="boolean" value="false"/> - <option name="CONFIG_BRIQ" type="boolean" value="false"/> - <option name="CONFIG_PEARPC" type="boolean" value="false"/> - <option name="CONFIG_QEMU" type="boolean" value="true"/> - <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/> - -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -90,4 +74,3 @@ <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> -</config> Modified: trunk/openbios-devel/config/examples/sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/sparc32_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,21 +1,6 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_SPARC" type="boolean" value="true"/> - <option name="CONFIG_SPARC32" type="boolean" value="true"/> - <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/> -  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="false"/> - <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -84,4 +69,3 @@ <option name="CONFIG_DRIVER_ESCC_SUN" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xd00000510ULL"/> -</config> Modified: trunk/openbios-devel/config/examples/sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/sparc64_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,22 +1,6 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_SPARC" type="boolean" value="true"/> - <option name="CONFIG_SPARC64" type="boolean" value="true"/> - <option name="CONFIG_QEMU" type="boolean" value="true"/> - <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/> -  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="false"/> - <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -88,4 +72,3 @@ <option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0x510"/> -</config> Modified: trunk/openbios-devel/config/examples/x86_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/x86_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/x86_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,21 +1,6 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_X86" type="boolean" value="true"/> - <option name="CONFIG_LITTLE_ENDIAN" type="boolean" value="true"/> - <option name="CONFIG_XBOX" type="boolean" value="false"/> -  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> - <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> @@ -76,5 +61,3 @@ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> - -</config> Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 16:23:18 2010 (r879) @@ -5,12 +5,15 @@ # MOLPATH=$HOME/mol-0.9.71 -if [ x"$1" = x ]; then +if [ x"$1" = x -o "$1" = "-help" ]; then printf "Usage:\n $0 [arch-config]...\n" - printf "arch-config values supported for native builds:\n" - printf " amd64, ppc, sparc32, sparc64, x86\n" - printf "arch-config values supported for cross compiled builds:\n" - printf " cross-ppc, cross-sparc32, cross-sparc64, cross-x86\n" + printf "arch-config values supported for native or cross compiled builds:\n" + printf " amd64, ppc, sparc32, sparc64, x86\n\n" + printf "Add \"unix-\" prefix to compile openbios-unix executable (native only)\n" + printf "Add \"builtin-\" prefix to compile openbios-builtin executables\n\n" + printf "Without prefixes, builtin and unix targets are selected\n\n" + printf "Special targets: mol-ppc briq-ppc pearpc-ppc qemu-ppc xbox-x86\n\n" + printf "Example: $0 builtin-sparc32 unix-amd64 builtin-amd64\n" exit 0 fi @@ -102,6 +105,12 @@ exit 1 } +config_set_boolean() +{ + option=`echo $1 | tr a-z A-Z` + echo "<option name=\"$option\" type=\"boolean\" value=\"true\" />" +} + if ! test -f utils/dist/debian/rules; then echo "switch-arch must be run from the top-level source directory" >&2 exit 1 @@ -119,13 +128,93 @@ VERSION=`head VERSION` echo "Configuring OpenBIOS on $HOSTARCH for $*" -for RULES_ARCH in $*; do - if ! test -f config/examples/${RULES_ARCH}_config.xml; then - echo "Cannot find config/examples/${RULES_ARCH}_config.xml" >&2 - exit 1 + +target_list="" +for target in $*; do + case $target in + unix-*|builtin-*|plain-*|mol-ppc|briq-ppc|pearpc-ppc|qemu-ppc|xbox-x86) + target_list="$target_list $target" + ;; + cross-*) + echo "\"cross-\" prefix is no longer needed" + target=`echo $target | sed s/cross-//g` + target_list="$target_list builtin-$target" + ;; + *) + #default: build builtin and if possible, unix target + target_list="$target_list builtin-$target unix-$target" + ;; + esac +done + +arch_list="" +for target in $target_list; do + arch=`echo $target | sed s/.*-//g` + if ! test -f config/examples/${arch}_config.xml; then + echo "Cannot find config/examples/${arch}_config.xml" >&2 + exit 1 + fi + if ! echo $arch_list | grep -q "$arch"; then + arch_list="$arch_list $arch" fi +done + +for ARCH in $arch_list; do + unix="no" + builtin="no" + plain="no" + mol="no" + briq="no" + pearpc="no" + qemu="no" + xbox="no" + cross="no" + + for target in $target_list; do + case $target in + *-$ARCH) + : + ;; + *) + continue + ;; + esac + case $target in + mol-ppc) + mol="yes" + ;; + briq-ppc) + briq="yes" + ;; + pearpc-ppc) + pearpc="yes" + ;; + builtin-ppc|qemu-ppc) + qemu="yes" + ;; + xbox-x86) + xbox="yes" + ;; + builtin-sparc64) + builtin="yes" + qemu="yes" + ;; + unix-*) + if [ "$ARCH" != "$HOSTARCH" ]; then + # Can't cross compile Unix target + continue + fi + unix="yes" + ;; + builtin-*) + builtin="yes" + ;; + plain-*) + plain="yes" + ;; + esac + done - ARCH=`echo $RULES_ARCH | sed s/cross-//g` case $ARCH in amd64) select_prefix x86_64 @@ -135,7 +224,11 @@ ppc) select_prefix powerpc - CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + if [ "$unix" = "no" ]; then + CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + else + CFLAGS="-fno-builtin" + fi AS_FLAGS= ;; @@ -157,11 +250,12 @@ AS_FLAGS="-Wa,-32" ;; esac - if test "$ARCH" = "$RULES_ARCH"; then - TARGET="" + if [ "$ARCH" != "$HOSTARCH" ]; then + cross="yes" fi crosscflags $HOSTARCH $ARCH OBJDIR=obj-$ARCH + printf "Initializing build tree $OBJDIR..." rm -rf "$OBJDIR" mkdir "$OBJDIR" @@ -170,13 +264,6 @@ mkdir -p $OBJDIR/target/arch mkdir -p $OBJDIR/target/arch/unix mkdir -p $OBJDIR/target/arch/$ARCH - mkdir -p $OBJDIR/target/arch/ppc - mkdir -p $OBJDIR/target/arch/ppc/briq # no autodetection of those.. - mkdir -p $OBJDIR/target/arch/ppc/pearpc - mkdir -p $OBJDIR/target/arch/ppc/qemu - mkdir -p $OBJDIR/target/arch/ppc/mol - mkdir -p $OBJDIR/target/arch/x86 - mkdir -p $OBJDIR/target/arch/x86/xbox mkdir -p $OBJDIR/target/libgcc mkdir -p $OBJDIR/target/kernel mkdir -p $OBJDIR/target/libopenbios @@ -195,6 +282,31 @@ ln -s ../../../include/arch/$ARCH $OBJDIR/target/include/asm #compile the host binary with target settings instead #ln -s ../../../include/arch/$HOSTARCH $OBJDIR/host/include/asm + if [ "$mol" = "yes" ]; then + printf "\nUsing MOL path $MOLPATH...\n" + mkdir -p $OBJDIR/target/arch/ppc/mol + ln -s $MOLPATH/src/shared/osi_calls.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/shared/osi.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/shared/prom.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/include/boothelper_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/include/video_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/include/pseudofs_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/include/kbd_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/drivers/disk/include/scsi_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/drivers/disk/include/ablk_sh.h $OBJDIR/target/include/ + fi + if [ "$briq" = "yes" ]; then + mkdir -p $OBJDIR/target/arch/ppc/briq + fi + if [ "$pearpc" = "yes" ]; then + mkdir -p $OBJDIR/target/arch/ppc/pearpc + fi + if [ "$qemu" = "yes" ]; then + mkdir -p $OBJDIR/target/arch/ppc/qemu + fi + if [ "$xbox" = "yes" ]; then + mkdir -p $OBJDIR/target/arch/x86/xbox + fi echo "ok." cd $OBJDIR @@ -203,35 +315,64 @@ printf "Creating target Makefile..." echo "ARCH=$ARCH" > $ODIR/config.mak - echo "TARGET=$TARGET" >> $ODIR/config.mak + if [ "$cross" = "yes" ]; then + echo "TARGET=$TARGET" >> $ODIR/config.mak + fi echo "CFLAGS=$CFLAGS" >> $ODIR/config.mak echo "AS_FLAGS=$AS_FLAGS" >> $ODIR/config.mak echo "HOSTARCH?=$HOSTARCH" >> $ODIR/config.mak echo "CROSSCFLAGS=$CROSSCFLAGS" >> $ODIR/config.mak echo "VERSION=\"$VERSION\"" >> $ODIR/config.mak + ln -s $SRCDIR/config/xml/rules.xml $ODIR/rules.xml - ln -s $SRCDIR/config/examples/${RULES_ARCH}_config.xml $ODIR/config.xml + echo "<?xml version=\"1.0\"?><config>" > $ODIR/config.xml + # Generic + config_set_boolean CONFIG_$ARCH >> $ODIR/config.xml + if [ "$mol" = "yes" ]; then + config_set_boolean CONFIG_MOL >> $ODIR/config.xml + fi + if [ "$briq" = "yes" ]; then + config_set_boolean CONFIG_BRIQ >> $ODIR/config.xml + fi + if [ "$pearpc" = "yes" ]; then + config_set_boolean CONFIG_PEARPC >> $ODIR/config.xml + fi + if [ "$qemu" = "yes" ]; then + config_set_boolean CONFIG_QEMU >> $ODIR/config.xml + fi + if [ "$xbox" = "yes" ]; then + config_set_boolean CONFIG_XBOX >> $ODIR/config.xml + fi + if [ "$targetbigendian" = "yes" ]; then + config_set_boolean CONFIG_BIG_ENDIAN >> $ODIR/config.xml + else + config_set_boolean CONFIG_LITTLE_ENDIAN >> $ODIR/config.xml + fi + # Kernel binaries + if [ "$plain" = "yes" ]; then + config_set_boolean CONFIG_IMAGE_ELF >> $ODIR/config.xml + fi + if [ "$builtin" = "yes" ]; then + config_set_boolean CONFIG_IMAGE_ELF_EMBEDDED >> $ODIR/config.xml + fi + # Build hosted Unix binary? + if [ "$unix" = "yes" ]; then + config_set_boolean CONFIG_HOST_UNIX >> $ODIR/config.xml + #config_set_boolean CONFIG_UNIX_QT >> $ODIR/config.xml + #config_set_boolean CONFIG_PLUGINS >> $ODIR/config.xml + fi + cat $SRCDIR/config/examples/${ARCH}_config.xml >> $ODIR/config.xml + + echo "</config>" >> $ODIR/config.xml ln -s ../Makefile.target $ODIR/Makefile xsltproc $SRCDIR/config/xml/xinclude.xsl $SRCDIR/build.xml > $ODIR/build-full.xml xsltproc $SRCDIR/config/xml/makefile.xsl $ODIR/build-full.xml > $ODIR/rules.mak echo "ok." printf "Creating config files..." - xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/host/include/autoconf.h - xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/target/include/autoconf.h - xsltproc $SRCDIR/config/xml/config-forth.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/forth/config.fs + xsltproc $SRCDIR/config/xml/config-c.xsl $ODIR/config.xml > $ODIR/host/include/autoconf.h + xsltproc $SRCDIR/config/xml/config-c.xsl $ODIR/config.xml > $ODIR/target/include/autoconf.h + xsltproc $SRCDIR/config/xml/config-forth.xsl $ODIR/config.xml > $ODIR/forth/config.fs echo "ok." - grep CONFIG_MOL $ODIR/forth/config.fs >/dev/null && ( \ - echo "Using MOL path $MOLPATH..."; \ - ln -s $MOLPATH/src/shared/osi_calls.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/shared/osi.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/shared/prom.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/include/boothelper_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/include/video_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/include/pseudofs_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/include/kbd_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/drivers/disk/include/scsi_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/drivers/disk/include/ablk_sh.h $ODIR/target/include/ ) || true - cd $SRCDIR done

3 9

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

03 Oct '10

Author: mcayland Date: Sun Oct 3 22:28:27 2010 New Revision: 886 URL: http://tracker.coreboot.org/trac/openbios/changeset/886 Log: Implement va>tte-data defer word for the MMU TLB miss handlers. As used by OpenSolaris. This enables OpenSolaris boot to proceed further by allowing the kernel to correctly manage its own TLB misses. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/init.fs trunk/openbios-devel/arch/sparc64/lib.c Modified: trunk/openbios-devel/arch/sparc64/init.fs ============================================================================== --- trunk/openbios-devel/arch/sparc64/init.fs Sun Oct 3 21:18:28 2010 (r885) +++ trunk/openbios-devel/arch/sparc64/init.fs Sun Oct 3 22:28:27 2010 (r886) @@ -1,3 +1,10 @@ +\ va>tte-data defer MMU virtual to physical address hook for Solaris +\ We need to make sure this is in the global wordlist +active-package 0 active-package! +defer va>tte-data +0 to va>tte-data +active-package! + :noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 3 21:18:28 2010 (r885) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 3 22:28:27 2010 (r886) @@ -16,6 +16,8 @@ #include "ofmem_sparc64.h" +static ucell *va2ttedata = 0; + /* Format a string and print it on the screen, just like the libc * function printf. */ @@ -228,10 +230,28 @@ faultva >>= 13; faultva <<= 13; - /* Search the ofmem linked list for this virtual address */ - PUSH(faultva); - pgmap_fetch(); - tte_data = POP(); + /* If a valid va>tte-data routine has been set, invoke that Forth xt instead */ + if (va2ttedata && *va2ttedata != 0) { + + /* va>tte-data ( addr cnum -- false | tte-data true ) */ + PUSH(faultva); + PUSH(0); + enterforth(*va2ttedata); + + /* Check the result first... */ + tte_data = POP(); + if (!tte_data) { + bug(); + } else { + /* Grab the real data */ + tte_data = POP(); + } + } else { + /* Search the ofmem linked list for this virtual address */ + PUSH(faultva); + pgmap_fetch(); + tte_data = POP(); + } if (tte_data) { /* Update MMU */ @@ -240,6 +260,7 @@ /* If we got here, there was no translation so fail */ bug(); } + } static void @@ -298,10 +319,28 @@ faultva >>= 13; faultva <<= 13; - /* Search the ofmem linked list for this virtual address */ - PUSH(faultva); - pgmap_fetch(); - tte_data = POP(); + /* If a valid va>tte-data routine has been set, invoke that Forth xt instead */ + if (va2ttedata && *va2ttedata != 0) { + + /* va>tte-data ( addr cnum -- false | tte-data true ) */ + PUSH(faultva); + PUSH(0); + enterforth(*va2ttedata); + + /* Check the result first... */ + tte_data = POP(); + if (!tte_data) { + bug(); + } else { + /* Grab the real data */ + tte_data = POP(); + } + } else { + /* Search the ofmem linked list for this virtual address */ + PUSH(faultva); + pgmap_fetch(); + tte_data = POP(); + } if (tte_data) { /* Update MMU */ @@ -617,4 +656,8 @@ PUSH(0); fword("active-package!"); bind_func("pgmap@", pgmap_fetch); + + /* Find address of va2ttedata defer word contents for MMU miss handlers */ + va2ttedata = (ucell *)findword("va>tte-data"); + va2ttedata++; }

1 0

[commit] r884 - in trunk/openbios-devel/fs: hfs iso9660
by repository service 03 Oct '10

03 Oct '10

Author: blueswirl Date: Sun Oct 3 21:18:26 2010 New Revision: 884 URL: http://tracker.coreboot.org/trac/openbios/changeset/884 Log: ppc: fix warnings from GCC 4.6.0 Compiling PPC with GCC 4.6.0 20100925 produced a few warnings: ../fs/hfs/block.c: In function 'reuse': ../fs/hfs/block.c:304:11: error: variable 'chain' set but not used [-Werror=unused-but-set-variable] ../fs/iso9660/iso9660_mount.c: In function 'iso9660_name': ../fs/iso9660/iso9660_mount.c:18:16: error: variable 'uh' set but not used [-Werror=unused-but-set-variable] Fix the warnings by avoiding write-only variables. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/fs/hfs/block.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c Modified: trunk/openbios-devel/fs/hfs/block.c ============================================================================== --- trunk/openbios-devel/fs/hfs/block.c Sun Oct 3 21:18:23 2010 (r883) +++ trunk/openbios-devel/fs/hfs/block.c Sun Oct 3 21:18:26 2010 (r884) @@ -301,7 +301,7 @@ static int reuse(bcache *cache, bucket *b, unsigned long bnum) { - bucket *chain[HFS_BLOCKBUFSZ], *bptr; + bucket *bptr; int i; # ifdef DEBUG @@ -317,7 +317,6 @@ for (bptr = b, i = 0; i < HFS_BLOCKBUFSZ; ++i) { - chain[i] = bptr; bptr = bptr->cprev; } } Modified: trunk/openbios-devel/fs/iso9660/iso9660_mount.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Oct 3 21:18:23 2010 (r883) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Oct 3 21:18:26 2010 (r884) @@ -15,7 +15,7 @@ void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer) { int j; - unsigned char uh, ul, uc; + unsigned char ul, uc; buffer[0] = 0; if (idr->name_len[0] == 1 && idr->name[0] == 0) @@ -32,7 +32,6 @@ */ for (j = 0; j < (int)idr->name_len[0] / 2; j++) { - uh = idr->name[j*2]; ul = idr->name[j*2+1]; /*

1 0

[commit] r883 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 03 Oct '10

03 Oct '10

Author: blueswirl Date: Sun Oct 3 21:18:23 2010 New Revision: 883 URL: http://tracker.coreboot.org/trac/openbios/changeset/883 Log: sparc32: fix warnings from GCC 4.6.0 Compiling Sparc32 with GCC 4.6.0 20100925 produced a few warnings: ../arch/sparc32/context.c: In function 'start_main': ../arch/sparc32/context.c:49:9: error: variable 'retval' set but not used [-Werror=unused-but-set-variable] ../arch/sparc32/romvec.c: In function 'obp_devwrite': ../arch/sparc32/romvec.c:326:9: error: variable 'ret' set but not used [-Werror=unused-but-set-variable] ../drivers/iommu.c: In function 'iommu_init': ../drivers/iommu.c:102:24: error: variable 'vers' set but not used [-Werror=unused-but-set-variable] ../drivers/iommu.c:102:18: error: variable 'impl' set but not used [-Werror=unused-but-set-variable] Fix the warnings by avoiding write-only variables. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/drivers/iommu.c Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Oct 3 18:37:47 2010 (r882) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Oct 3 21:18:23 2010 (r883) @@ -46,17 +46,12 @@ */ static void start_main(void) { - int retval; - /* Save startup context, so we can refer to it later. * We have to keep it in physical address since we will relocate. */ __boot_ctx = virt_to_phys(__context); /* Start the real fun */ - retval = openbios(); - - /* Pass return value to startup context. Bootloader may see it. */ - //boot_ctx->eax = retval; + openbios(); /* Returning from here should jump to __exit_context */ __context = boot_ctx; Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 3 18:37:47 2010 (r882) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Oct 3 21:18:23 2010 (r883) @@ -323,16 +323,21 @@ static int obp_devwrite(int dev_desc, char *buf, int nbytes) { +#ifdef CONFIG_DEBUG_OBP_DEVWRITE /* disabled, makes too much noise */ int ret; +#endif PUSH((int)buf); PUSH(nbytes); push_str("write"); PUSH(dev_desc); fword("$call-method"); +#ifdef CONFIG_DEBUG_OBP_DEVWRITE ret = POP(); - - //DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret); + DPRINTF("obp_devwrite(fd 0x%x, buf %s, nbytes %d) = %d\n", dev_desc, buf, nbytes, ret); +#else + POP(); +#endif return nbytes; } Modified: trunk/openbios-devel/drivers/iommu.c ============================================================================== --- trunk/openbios-devel/drivers/iommu.c Sun Oct 3 18:37:47 2010 (r882) +++ trunk/openbios-devel/drivers/iommu.c Sun Oct 3 21:18:23 2010 (r883) @@ -99,7 +99,9 @@ { unsigned int *ptab; int ptsize; +#ifdef CONFIG_DEBUG_IOMMU unsigned int impl, vers; +#endif unsigned int tmp; struct iommu_regs *regs; int ret; @@ -111,8 +113,10 @@ for (;;) { } } t->regs = regs; +#ifdef CONFIG_DEBUG_IOMMU impl = (regs->control & IOMMU_CTRL_IMPL) >> 28; vers = (regs->control & IOMMU_CTRL_VERS) >> 24; +#endif tmp = regs->control; tmp &= ~(IOMMU_CTRL_RNGE);

1 0

[commit] r882 - in trunk/openbios-devel: arch/sparc64 drivers packages
by repository service 03 Oct '10

03 Oct '10

Author: blueswirl Date: Sun Oct 3 18:37:47 2010 New Revision: 882 URL: http://tracker.coreboot.org/trac/openbios/changeset/882 Log: Fix warnings from GCC 4.6.0 Compiling Sparc64 with GCC 4.6.0 20100925 produced a few warnings: ../arch/sparc64/context.c: In function 'start_main': ../arch/sparc64/context.c:49:9: error: variable 'retval' set but not used [-Werror=unused-but-set-variable] ../packages/disk-label.c: In function 'dlabel_load': ../packages/disk-label.c:183:8: error: variable 'buf' set but not used [-Werror=unused-but-set-variable] ../drivers/floppy.c: In function 'collect_interrupt': ../drivers/floppy.c:378:13: error: variable 'status' set but not used [-Werror=unused-but-set-variable] Fix the warnings by avoiding write-only variables. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/drivers/floppy.c trunk/openbios-devel/packages/disk-label.c Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Sun Oct 3 16:28:12 2010 (r881) +++ trunk/openbios-devel/arch/sparc64/context.c Sun Oct 3 18:37:47 2010 (r882) @@ -46,17 +46,12 @@ */ static void start_main(void) { - int retval; - /* Save startup context, so we can refer to it later. * We have to keep it in physical address since we will relocate. */ __boot_ctx = virt_to_phys(__context); /* Start the real fun */ - retval = openbios(); - - /* Pass return value to startup context. Bootloader may see it. */ - //boot_ctx->eax = retval; + openbios(); /* Returning from here should jump to __exit_context */ __context = boot_ctx; Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Oct 3 16:28:12 2010 (r881) +++ trunk/openbios-devel/drivers/floppy.c Sun Oct 3 18:37:47 2010 (r882) @@ -375,7 +375,10 @@ { unsigned char pcn = 0xff; unsigned char reply_buffer[MAX_REPLIES]; - int nr, i, status; + int nr; +#ifdef CONFIG_DEBUG_FLOPPY + int i, status; +#endif nr = result(reply_buffer, MAX_REPLIES); if (nr != 0) { printk_debug("SENSEI\n"); @@ -393,6 +396,7 @@ } max_sensei--; }while(((reply_buffer[0] & 0x83) != FD_DRIVE) && (nr == 2) && max_sensei); +#ifdef CONFIG_DEBUG_FLOPPY status = fdc_state.fdc_inb(FD_STATUS); printk_debug("status = %x, reply_buffer=", status); for(i = 0; i < nr; i++) { @@ -400,6 +404,9 @@ reply_buffer[i]); } printk_debug("\n"); +#else + fdc_state.fdc_inb(FD_STATUS); +#endif } return pcn; Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Oct 3 16:28:12 2010 (r881) +++ trunk/openbios-devel/packages/disk-label.c Sun Oct 3 18:37:47 2010 (r882) @@ -180,10 +180,16 @@ dlabel_load( __attribute__((unused)) dlabel_info_t *di ) { /* Try the load method of the part package */ +#ifdef DEBUG_DISK_LABEL char *buf; +#endif xt_t xt; +#ifdef DEBUG_DISK_LABEL buf = (char *)POP(); +#else + POP(); +#endif DPRINTF("load invoked with address %p\n", buf);

1 0

[PATCH] ofmem: Fix and enable ofmem_claim() trace output
by Andreas Färber 03 Oct '10

03 Oct '10

A printk statement was commented out and there were format string mismatches for ppc target. Use OFMEM_TRACE to more easily enable/disable it and use FMT_ucellx as in other trace output. Note that this changes the alignment from decimal to hexidecimal notation. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- libopenbios/ofmem_common.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libopenbios/ofmem_common.c b/libopenbios/ofmem_common.c index 1e797b3..00a95b8 100644 --- a/libopenbios/ofmem_common.c +++ b/libopenbios/ofmem_common.c @@ -477,7 +477,7 @@ ucell ofmem_claim( ucell addr, ucell size, ucell align ) ucell virt, phys; ucell offs = addr & 0xfff; - /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ + OFMEM_TRACE("ofmem_claim " FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", addr, size, align ); virt = phys = 0; if( !align ) { if( is_free(addr, size, ofmem->virt_range) && -- 1.7.3

2 1

[commit] r881 - trunk/openbios-devel/libopenbios
by repository service 03 Oct '10

03 Oct '10

Author: blueswirl Date: Sun Oct 3 16:28:12 2010 New Revision: 881 URL: http://tracker.coreboot.org/trac/openbios/changeset/881 Log: ofmem: Fix and enable ofmem_claim() trace output A printk statement was commented out and there were format string mismatches for ppc target. Use OFMEM_TRACE to more easily enable/disable it and use FMT_ucellx as in other trace output. Note that this changes the alignment from decimal to hexidecimal notation. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Sun Oct 3 16:28:10 2010 (r880) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Sun Oct 3 16:28:12 2010 (r881) @@ -477,7 +477,7 @@ ucell virt, phys; ucell offs = addr & 0xfff; - /* printk("+ ofmem_claim %08lx %lx %ld\n", addr, size, align ); */ + OFMEM_TRACE("ofmem_claim " FMT_ucellx " " FMT_ucellx " " FMT_ucellx "\n", addr, size, align ); virt = phys = 0; if( !align ) { if( is_free(addr, size, ofmem->virt_range) &&

1 0

[commit] r880 - trunk/openbios-devel/config/scripts
by repository service 03 Oct '10

03 Oct '10

Author: blueswirl Date: Sun Oct 3 16:28:10 2010 New Revision: 880 URL: http://tracker.coreboot.org/trac/openbios/changeset/880 Log: switch-arch: Fix recognition of x86_64 target as 64-bit The comparison would've always been false due to missing $. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 16:23:18 2010 (r879) +++ trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 16:28:10 2010 (r880) @@ -51,7 +51,7 @@ # target long bits test if test "$target" = "sparc64" -o "$target" = "ia64" \ - -o "$target" = "amd64" -o "target" = "x86_64" \ + -o "$target" = "amd64" -o "$target" = "x86_64" \ -o "$target" = "alpha"; then targetlongbits="64" else

1 0

[PATCH] Darwin/ppc host needs fake int128_t for sparc64
by Andreas Färber 03 Oct '10

03 Oct '10

Otherwise it chokes on ducell in include/kernel/stack.h. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- It seems I only mentioned this on the list but never sent a proper patch. http://www.openfirmware.info/pipermail/openbios/2009-November/004192.html Not sure about Linux/ppc or Darwin/x86, so I've limited it to Darwin/ppc for now. Regards, Andreas config/scripts/switch-arch | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index c1158fa..8b6563d 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -71,6 +71,8 @@ crosscflags() if test "$host" = "x86" -a "$targetlongbits" = "64"; then cflags="$cflags -DNEED_FAKE_INT128_T" + elif test "$host" = "ppc" -a "$targetlongbits" = "64" -a `uname -s` = "Darwin"; then + cflags="$cflags -DNEED_FAKE_INT128_T" fi CROSSCFLAGS=$cflags -- 1.7.0.4

2 3

[commit] r878 - trunk/openbios-devel/forth/bootstrap
by repository service 03 Oct '10

03 Oct '10

Author: mcayland Date: Sun Oct 3 12:34:50 2010 New Revision: 878 URL: http://tracker.coreboot.org/trac/openbios/changeset/878 Log: Implement the "to" Forth word for setting defers. This enables OpenSolaris to execute "' kmem64-tte is va>tte-data" for setting the va>tte-data defer. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 3 11:37:13 2010 (r877) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Oct 3 12:34:50 2010 (r878) @@ -1043,6 +1043,13 @@ then ; immediate +: is ( xt "wordname<>" -- ) + parse-word $find if + (to) + else + s" could not find " type type + then + ; \ \ 7.3.4.2 Console Input

1 0

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

03 Oct '10

Author: mcayland Date: Sun Oct 3 11:37:13 2010 New Revision: 877 URL: http://tracker.coreboot.org/trac/openbios/changeset/877 Log: Implement pgmap@ for SPARC64 since it is required for OpenSolaris. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/lib.c Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 3 08:54:04 2010 (r876) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 3 11:37:13 2010 (r877) @@ -135,6 +135,43 @@ } } +/* + * D5.3 pgmap@ ( va -- tte ) + */ +static void +pgmap_fetch(void) +{ + translation_t *t = *g_ofmem_translations; + unsigned long va, tte_data; + + va = POP(); + + /* Search the ofmem linked list for this virtual address */ + while (t != NULL) { + /* Find the correct range */ + if (va >= t->virt && va < (t->virt + t->size)) { + + /* valid tte, 8k size */ + tte_data = 0x8000000000000000UL; + + /* mix in phys address mode */ + tte_data |= t->mode; + + /* mix in page physical address = t->phys + offset */ + tte_data |= t->phys + (va - t->virt); + + /* return tte_data */ + PUSH(tte_data); + + return; + } + t = t->next; + } + + /* If we get here, there was no entry */ + PUSH(0); +} + static void dtlb_load2(unsigned long vaddr, unsigned long tte_data) { @@ -185,7 +222,6 @@ dtlb_miss_handler(void) { unsigned long faultva, tte_data = 0; - translation_t *t = *g_ofmem_translations; /* Grab fault address from MMU and round to nearest 8k page */ faultva = dtlb_faultva(); @@ -193,30 +229,17 @@ faultva <<= 13; /* Search the ofmem linked list for this virtual address */ - while (t != NULL) { - /* Find the correct range */ - if (faultva >= t->virt && faultva < (t->virt + t->size)) { - - /* valid tte, 8k size */ - tte_data = 0x8000000000000000UL; - - /* mix in phys address mode */ - tte_data |= t->mode; - - /* mix in page physical address = t->phys + offset */ - tte_data |= t->phys + (faultva - t->virt); - - /* Update MMU */ - dtlb_load2(faultva, tte_data); - - return; - } - - t = t->next; + PUSH(faultva); + pgmap_fetch(); + tte_data = POP(); + + if (tte_data) { + /* Update MMU */ + dtlb_load2(faultva, tte_data); + } else { + /* If we got here, there was no translation so fail */ + bug(); } - - /* If we got here, there was no translation so fail */ - bug(); } static void @@ -238,6 +261,20 @@ "r" (tte_data), "r" (tte_index << 3), "i" (ASI_ITLB_DATA_ACCESS)); } +/* + ( index tte_data vaddr -- ? ) +*/ +static void +itlb_load(void) +{ + unsigned long vaddr, tte_data, idx; + + vaddr = POP(); + tte_data = POP(); + idx = POP(); + itlb_load3(vaddr, tte_data, idx); +} + static unsigned long itlb_faultva(void) { @@ -255,7 +292,6 @@ itlb_miss_handler(void) { unsigned long faultva, tte_data = 0; - translation_t *t = *g_ofmem_translations; /* Grab fault address from MMU and round to nearest 8k page */ faultva = itlb_faultva(); @@ -263,45 +299,17 @@ faultva <<= 13; /* Search the ofmem linked list for this virtual address */ - while (t != NULL) { - /* Find the correct range */ - if (faultva >= t->virt && faultva < (t->virt + t->size)) { - - /* valid tte, 8k size */ - tte_data = 0x8000000000000000UL; - - /* mix in phys address mode */ - tte_data |= t->mode; - - /* mix in page physical address = t->phys + offset */ - tte_data |= t->phys + (faultva - t->virt); - - /* Update MMU */ - itlb_load2(faultva, tte_data); - - return; - } - - t = t->next; + PUSH(faultva); + pgmap_fetch(); + tte_data = POP(); + + if (tte_data) { + /* Update MMU */ + itlb_load2(faultva, tte_data); + } else { + /* If we got here, there was no translation so fail */ + bug(); } - - /* If we got here, there was no translation so fail */ - bug(); -} - - -/* - ( index tte_data vaddr -- ? ) -*/ -static void -itlb_load(void) -{ - unsigned long vaddr, tte_data, idx; - - vaddr = POP(); - tte_data = POP(); - idx = POP(); - itlb_load3(vaddr, tte_data, idx); } static void @@ -604,4 +612,9 @@ fword("find-device"); bind_func("cif-claim", ciface_claim); bind_func("cif-release", ciface_release); + + /* Other MMU functions */ + PUSH(0); + fword("active-package!"); + bind_func("pgmap@", pgmap_fetch); }

1 0

[commit] r876 - trunk/openbios-devel/config/scripts
by repository service 03 Oct '10

03 Oct '10

Author: blueswirl Date: Sun Oct 3 08:54:04 2010 New Revision: 876 URL: http://tracker.coreboot.org/trac/openbios/changeset/876 Log: Darwin/ppc host needs fake int128_t for sparc64 Otherwise it chokes on ducell in include/kernel/stack.h. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Oct 2 15:28:49 2010 (r875) +++ trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 08:54:04 2010 (r876) @@ -71,6 +71,8 @@ if test "$host" = "x86" -a "$targetlongbits" = "64"; then cflags="$cflags -DNEED_FAKE_INT128_T" + elif test "$host" = "ppc" -a "$targetlongbits" = "64" -a `uname -s` = "Darwin"; then + cflags="$cflags -DNEED_FAKE_INT128_T" fi CROSSCFLAGS=$cflags

1 0

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

02 Oct '10

Author: mcayland Date: Sat Oct 2 15:28:49 2010 New Revision: 875 URL: http://tracker.coreboot.org/trac/openbios/changeset/875 Log: Solaris 9 kernel needs more memory during startup. 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 Sat Oct 2 14:10:45 2010 (r874) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.c Sat Oct 2 15:28:49 2010 (r875) @@ -20,7 +20,7 @@ #define OF_MALLOC_BASE ((char*)OFMEM + ALIGN_SIZE(sizeof(ofmem_t), 8)) -#define MEMSIZE ((128 + 512 + 512) * 1024) +#define MEMSIZE ((256 + 512 + 512) * 1024) static union { char memory[MEMSIZE]; ofmem_t ofmem;

1 0

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

02 Oct '10

Author: mcayland Date: Sat Oct 2 14:10:45 2010 New Revision: 874 URL: http://tracker.coreboot.org/trac/openbios/changeset/874 Log: Allow context-switching within the MMU TLB miss handlers on SPARC64, and use this to implement MMU miss handlers in C rather than assembler. In order to allow OpenSolaris to boot under OpenBIOS, it is necessary to be able to invoke Forth words from within the MMU I/D-TLB miss handlers, since Solaris 10 kernels hook into the virtual to physical address translation process via va>tte-data at boot time. Hence this patch implements two macros: SAVE_CPU_STATE and RESTORE_CPU_STATE which enable a context switch to occur from within these trap handlers. Things are more complicated from within the MMU miss handlers because we can't use flushw to flush the processor registers to stack. This is because the memory pointed to by the stack pointer may not be in the TLB either, and so we'd end up in a recursive MMU trap. Hence we solve this by creating a static stack within OpenBIOS which is guaranteed to be locked in the TLB and storing all of our state there. Once the ability to switch context has been implemented, it is possible to invoke C functions as per normal from within the MMU miss handlers. Hence as a proof of concept I've migrated the MMU miss handling code from ASM to C with a view of making the relevant changes to invoke the relevant Forth functions at a later date. I'd also like to say thank you to Blue Swirl who took the time to answer all my questions and generally point out the shortcomings in my first attempts at SPARC assembler. 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.h trunk/openbios-devel/arch/sparc64/vectors.S Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sat Oct 2 00:29:16 2010 (r873) +++ trunk/openbios-devel/arch/sparc64/lib.c Sat Oct 2 14:10:45 2010 (r874) @@ -154,6 +154,18 @@ "r" (tte_data), "r" (tte_index << 3), "i" (ASI_DTLB_DATA_ACCESS)); } +static unsigned long +dtlb_faultva(void) +{ + unsigned long faultva; + + asm("ldxa [%1] %2, %0\n" + : "=r" (faultva) + : "r" (48), "i" (ASI_DMMU)); + + return faultva; +} + /* ( index tte_data vaddr -- ? ) */ @@ -168,6 +180,45 @@ dtlb_load3(vaddr, tte_data, idx); } +/* MMU D-TLB miss handler */ +void +dtlb_miss_handler(void) +{ + unsigned long faultva, tte_data = 0; + translation_t *t = *g_ofmem_translations; + + /* Grab fault address from MMU and round to nearest 8k page */ + faultva = dtlb_faultva(); + faultva >>= 13; + faultva <<= 13; + + /* Search the ofmem linked list for this virtual address */ + while (t != NULL) { + /* Find the correct range */ + if (faultva >= t->virt && faultva < (t->virt + t->size)) { + + /* valid tte, 8k size */ + tte_data = 0x8000000000000000UL; + + /* mix in phys address mode */ + tte_data |= t->mode; + + /* mix in page physical address = t->phys + offset */ + tte_data |= t->phys + (faultva - t->virt); + + /* Update MMU */ + dtlb_load2(faultva, tte_data); + + return; + } + + t = t->next; + } + + /* If we got here, there was no translation so fail */ + bug(); +} + static void itlb_load2(unsigned long vaddr, unsigned long tte_data) { @@ -187,6 +238,58 @@ "r" (tte_data), "r" (tte_index << 3), "i" (ASI_ITLB_DATA_ACCESS)); } +static unsigned long +itlb_faultva(void) +{ + unsigned long faultva; + + asm("ldxa [%1] %2, %0\n" + : "=r" (faultva) + : "r" (48), "i" (ASI_IMMU)); + + return faultva; +} + +/* MMU I-TLB miss handler */ +void +itlb_miss_handler(void) +{ + unsigned long faultva, tte_data = 0; + translation_t *t = *g_ofmem_translations; + + /* Grab fault address from MMU and round to nearest 8k page */ + faultva = itlb_faultva(); + faultva >>= 13; + faultva <<= 13; + + /* Search the ofmem linked list for this virtual address */ + while (t != NULL) { + /* Find the correct range */ + if (faultva >= t->virt && faultva < (t->virt + t->size)) { + + /* valid tte, 8k size */ + tte_data = 0x8000000000000000UL; + + /* mix in phys address mode */ + tte_data |= t->mode; + + /* mix in page physical address = t->phys + offset */ + tte_data |= t->phys + (faultva - t->virt); + + /* Update MMU */ + itlb_load2(faultva, tte_data); + + return; + } + + t = t->next; + } + + /* If we got here, there was no translation so fail */ + bug(); +} + + /* ( index tte_data vaddr -- ? ) */ Modified: trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Sat Oct 2 00:29:16 2010 (r873) +++ trunk/openbios-devel/arch/sparc64/ofmem_sparc64.h Sat Oct 2 14:10:45 2010 (r874) @@ -25,4 +25,8 @@ extern translation_t **g_ofmem_translations; +extern void dtlb_miss_handler(void); +extern void itlb_miss_handler(void); +extern void bug(void); + #endif /* _H_OFMEM_SPARC64 */ Modified: trunk/openbios-devel/arch/sparc64/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S Sat Oct 2 00:29:16 2010 (r873) +++ trunk/openbios-devel/arch/sparc64/vectors.S Sat Oct 2 14:10:45 2010 (r874) @@ -274,7 +274,22 @@ tl1_resv1e0: BTRAPS(0x1e0) BTRAPS(0x1e8) tl1_resv1f0: BTRAPS(0x1f0) BTRAPS(0x1f8) + .section ".data" + .align 8 + .globl tlb_handler_stack_top, tlb_handler_stack_pointer + + ! Stack for the tlb MMU trap handlers +tlb_handler_stack_bottom: + .skip 8192 +tlb_handler_stack_top: + .skip 8 + + ! MMU trap handler stack pointer +tlb_handler_stack_pointer: + .xword tlb_handler_stack_top + .section ".text", "ax" + spill_32bit: srl %sp, 0, %sp stw %l0, [%sp + 0x00] @@ -317,83 +332,272 @@ restored retry - .globl reload_DMMU_tlb, reload_IMMU_tlb +/* + * SAVE_CPU_STATE and RESTORE_CPU_STATE are macros used to enable a context switch + * to C to occur within the MMU I/D TLB miss handlers. + * + * Because these handlers are called on a TLB miss, we cannot use flushw to store + * processor window state on the stack, as the memory areas used by each window's + * stack pointer may not be in the TLB, causing recursive TLB miss traps. + * + * For this reason, we save window state by manually rotating the window registers + * and saving their contents (along with other vital registers) into a special + * tlb_handler_stack defined above which is guaranteed to be locked in the TLB, and + * so won't cause issues with trap recursion. + * + * Once this process is complete, we remain in a TL=0, CWP=0 state (with IE=1 to allow + * window fill/spill traps if required), switch to our safe tlb_handler_stack and + * invoke the miss handler. + */ + +#define SAVE_CPU_STATE(type) \ + /* Set up our exception stack pointer in %g1 */ \ + setx tlb_handler_stack_pointer, %g7, %g6; \ + ldx [%g6], %g1; \ + add %g1, -0x510, %g1; \ + \ + /* First save the various state registers */ \ + rdpr %cwp, %g7; \ + stx %g7, [%g1]; \ + rdpr %cansave, %g7; \ + stx %g7, [%g1 + 0x8]; \ + rdpr %canrestore, %g7; \ + stx %g7, [%g1 + 0x10]; \ + rdpr %otherwin, %g7; \ + stx %g7, [%g1 + 0x18]; \ + rdpr %wstate, %g7; \ + stx %g7, [%g1 + 0x20]; \ + rdpr %cleanwin, %g7; \ + stx %g7, [%g1 + 0x28]; \ + rdpr %pstate, %g7; \ + stx %g7, [%g1 + 0x30]; \ + \ + rd %y, %g7; \ + stx %g7, [%g1 + 0x38]; \ + rd %fprs, %g7; \ + stx %g7, [%g1 + 0x40]; \ + \ + rdpr %tl, %g7; \ + stx %g7, [%g1 + 0x48]; \ + \ + /* Trap state */ \ + add %g1, 0x50, %g5; \ + mov 4, %g6; \ + \ +save_trap_state_##type: \ + deccc %g6; \ + wrpr %g6, %tl; \ + rdpr %tpc, %g7; \ + stx %g7, [%g5]; \ + rdpr %tnpc, %g7; \ + stx %g7, [%g5 + 0x8]; \ + rdpr %tstate, %g7; \ + stx %g7, [%g5 + 0x10]; \ + rdpr %tt, %g7; \ + stx %g7, [%g5 + 0x18]; \ + bne save_trap_state_##type; \ + add %g5, 0x20, %g5; \ + \ + /* For 4 trap levels with 4 registers, memory required is + 4*8*4 = 0x80 bytes */ \ + \ + /* Save the o registers */ \ + stx %o0, [%g1 + 0xd0]; \ + stx %o1, [%g1 + 0xd8]; \ + stx %o2, [%g1 + 0xe0]; \ + stx %o3, [%g1 + 0xe8]; \ + stx %o4, [%g1 + 0xf0]; \ + stx %o5, [%g1 + 0xf8]; \ + stx %o6, [%g1 + 0x100]; \ + stx %o7, [%g1 + 0x108]; \ + \ + /* Now iterate through all of the windows saving all l and i registers */ \ + add %g1, 0x110, %g5; \ + \ + /* Get the number of windows in %g6 */ \ + rdpr %ver, %g6; \ + and %g6, 0xf, %g6; \ + inc %g6; \ + \ +save_cpu_window_##type: \ + deccc %g6; \ + wrpr %g6, %cwp; \ + stx %l0, [%g5]; \ + stx %l1, [%g5 + 0x8]; \ + stx %l2, [%g5 + 0x10]; \ + stx %l3, [%g5 + 0x18]; \ + stx %l4, [%g5 + 0x20]; \ + stx %l5, [%g5 + 0x28]; \ + stx %l6, [%g5 + 0x30]; \ + stx %l7, [%g5 + 0x38]; \ + stx %i0, [%g5 + 0x40]; \ + stx %i1, [%g5 + 0x48]; \ + stx %i2, [%g5 + 0x50]; \ + stx %i3, [%g5 + 0x58]; \ + stx %i4, [%g5 + 0x60]; \ + stx %i5, [%g5 + 0x68]; \ + stx %i6, [%g5 + 0x70]; \ + stx %i7, [%g5 + 0x78]; \ + bne save_cpu_window_##type; \ + add %g5, 0x80, %g5; \ + \ + /* For 8 windows with 16 registers to save in the window, memory required + is 16*8*8 = 0x400 bytes */ \ + \ + /* Now we should be in window 0 so update the other window registers */ \ + rdpr %ver, %g6; \ + and %g6, 0xf, %g6; \ + dec %g6; \ + wrpr %g6, %cansave; \ + \ + wrpr %g0, %cleanwin; \ + wrpr %g0, %canrestore; \ + wrpr %g0, %otherwin; \ + \ + /* Update our exception stack pointer */ \ + setx tlb_handler_stack_pointer, %g7, %g6; \ + stx %g1, [%g6]; + + +#define RESTORE_CPU_STATE(type) \ + /* Set up our exception stack pointer in %g1 */ \ + setx tlb_handler_stack_pointer, %g7, %g6; \ + ldx [%g6], %g1; \ + \ + /* Get the number of windows in %g6 */ \ + rdpr %ver, %g6; \ + and %g6, 0xf, %g6; \ + inc %g6; \ + \ + /* Now iterate through all of the windows restoring all l and i registers */ \ + add %g1, 0x110, %g5; \ + \ +restore_cpu_window_##type: \ + deccc %g6; \ + wrpr %g6, %cwp; \ + ldx [%g5], %l0; \ + ldx [%g5 + 0x8], %l1; \ + ldx [%g5 + 0x10], %l2; \ + ldx [%g5 + 0x18], %l3; \ + ldx [%g5 + 0x20], %l4; \ + ldx [%g5 + 0x28], %l5; \ + ldx [%g5 + 0x30], %l6; \ + ldx [%g5 + 0x38], %l7; \ + ldx [%g5 + 0x40], %i0; \ + ldx [%g5 + 0x48], %i1; \ + ldx [%g5 + 0x50], %i2; \ + ldx [%g5 + 0x58], %i3; \ + ldx [%g5 + 0x60], %i4; \ + ldx [%g5 + 0x68], %i5; \ + ldx [%g5 + 0x70], %i6; \ + ldx [%g5 + 0x78], %i7; \ + bne restore_cpu_window_##type; \ + add %g5, 0x80, %g5; \ + \ + /* Restore the window registers to their original value */ \ + ldx [%g1], %g7; \ + wrpr %g7, %cwp; \ + ldx [%g1 + 0x8], %g7; \ + wrpr %g7, %cansave; \ + ldx [%g1 + 0x10], %g7; \ + wrpr %g7, %canrestore; \ + ldx [%g1 + 0x18], %g7; \ + wrpr %g7, %otherwin; \ + ldx [%g1 + 0x20], %g7; \ + wrpr %g7, %wstate; \ + ldx [%g1 + 0x28], %g7; \ + wrpr %g7, %cleanwin; \ + ldx [%g1 + 0x30], %g7; \ + wrpr %g7, %pstate; \ + \ + /* Restore the o registers */ \ + ldx [%g1 + 0xd0], %o0; \ + ldx [%g1 + 0xd8], %o1; \ + ldx [%g1 + 0xe0], %o2; \ + ldx [%g1 + 0xe8], %o3; \ + ldx [%g1 + 0xf0], %o4; \ + ldx [%g1 + 0xf8], %o5; \ + ldx [%g1 + 0x100], %o6; \ + ldx [%g1 + 0x108], %o7; \ + \ + /* Restore the trap state */ \ + add %g1, 0x50, %g5; \ + mov 4, %g6; \ + \ +restore_trap_state_##type: \ + deccc %g6; \ + wrpr %g6, %tl; \ + ldx [%g5], %g7; \ + wrpr %g7, %tpc; \ + ldx [%g5 + 0x8], %g7; \ + wrpr %g7, %tnpc; \ + ldx [%g5 + 0x10], %g7; \ + wrpr %g7, %tstate; \ + ldx [%g5 + 0x18], %g7; \ + wrpr %g7, %tt; \ + bne restore_trap_state_##type; \ + add %g5, 0x20, %g5; \ + \ + ldx [%g1 + 0x38], %g7; \ + wr %g7, 0, %y; \ + ldx [%g1 + 0x40], %g7; \ + wr %g7, 0, %fprs; \ + ldx [%g1 + 0x48], %g7; \ + wrpr %g7, %tl; \ + \ + /* Restore exception stack pointer to previous value */ \ + setx tlb_handler_stack_pointer, %g7, %g6; \ + add %g1, 0x510, %g1; \ + stx %g1, [%g6]; + + + .globl reload_DMMU_tlb, reload_IMMU_tlb, bug reload_DMMU_tlb: - mov 6 << 3, %g2 ! va = fault virtual address - ldxa [%g2] ASI_DMMU, %g1 ! from tag access register - srlx %g1, 13, %g1 ! %g1 = va rounded to 8k page - sllx %g1, 13, %g1 ! + SAVE_CPU_STATE(dtlb) + + /* Switch to TLB locked stack space */ + add %g1, -STACK_BIAS, %sp + + /* Enable interrupts for window spill/fill traps */ + rdpr %pstate, %g7 + or %g7, PSTATE_IE, %g7 + wrpr %g7, %pstate - setx g_ofmem_translations, %g7, %g3 - ldx [%g3], %g3 ! translation_t* t = *g_ofmem_translations -dmmu_next_trans: - ldx [%g3], %g3 - brz %g3, bug ! NULL pointer - nop - ldx [%g3+0x08], %g4 ! t->virt - sub %g1, %g4, %g7 ! %g7 offset = va - t->virt - brlz %g7, dmmu_next_trans ! va < t->virt ? - nop - ldx [%g3+0x10], %g4 ! t->size - sub %g7, %g4, %g4 ! va >= t->virt - t->size ? - brgez %g4, dmmu_next_trans - nop - - ! install 8k tlb entry - - ldx [%g3+0x18], %g4 ! t->phys - add %g4, %g7, %g4 ! %g4 page physical address = t->phys + offset - ldx [%g3+0x20], %g5 ! t->mode - - set 0x80000000, %g2 ! valid tte, 8k size - sllx %g2, 32, %g2 - or %g2, %g5, %g2 ! mix in translation mode - or %g2, %g4, %g3 ! mix in phys addr mode - - mov 6 << 3, %g2 ! page virtual address - stxa %g1, [%g2] ASI_DMMU ! - stxa %g3, [%g0] ASI_DTLB_DATA_IN + call dtlb_miss_handler + nop + + /* Disable interrupts */ + rdpr %pstate, %g7 + andn %g7, PSTATE_IE, %g7 + wrpr %g7, %pstate + + RESTORE_CPU_STATE(dtlb) retry reload_IMMU_tlb: - mov 6 << 3, %g2 ! va = fault virtual address - ldxa [%g2] ASI_IMMU, %g1 ! from tag access register - srlx %g1, 13, %g1 ! %g1 = va rounded to 8k page - sllx %g1, 13, %g1 ! + SAVE_CPU_STATE(itlb) + + /* Switch to TLB locked stack space */ + add %g1, -STACK_BIAS, %sp + + /* Enable interrupts for window spill/fill traps */ + rdpr %pstate, %g7 + or %g7, PSTATE_IE, %g7 + wrpr %g7, %pstate + + call itlb_miss_handler + nop + + /* Disable interrupts */ + rdpr %pstate, %g7 + andn %g7, PSTATE_IE, %g7 + wrpr %g7, %pstate - setx g_ofmem_translations, %g7, %g3 - ldx [%g3], %g3 ! translation_t* t = *g_ofmem_translations -immu_next_trans: - ldx [%g3], %g3 - brz %g3, bug ! NULL pointer - nop - ldx [%g3+0x08], %g4 ! t->virt - sub %g1, %g4, %g7 ! %g7 offset = va - t->virt - brlz %g7, immu_next_trans ! va < t->virt ? - nop - ldx [%g3+0x10], %g4 ! t->size - sub %g7, %g4, %g4 ! va >= t->virt - t->size ? - brgez %g4, immu_next_trans - nop - - ! install 8k tlb entry - - ldx [%g3+0x18], %g4 ! t->phys - add %g4, %g7, %g4 ! %g4 page physical address = t->phys + offset - ldx [%g3+0x20], %g5 ! t->mode - - set 0x80000000, %g2 ! valid tte, 8k size - sllx %g2, 32, %g2 - or %g2, %g5, %g2 ! mix in translation mode - or %g2, %g4, %g3 ! mix in phys addr mode - - mov 6 << 3, %g2 ! page virtual address - stxa %g1, [%g2] ASI_IMMU ! - stxa %g3, [%g0] ASI_ITLB_DATA_IN + RESTORE_CPU_STATE(itlb) retry

1 0

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

02 Oct '10

Author: mcayland Date: Sat Oct 2 00:29:16 2010 New Revision: 873 URL: http://tracker.coreboot.org/trac/openbios/changeset/873 Log: Increase IMAGE_STACK_SIZE to 16K from 8K. The existing 8K stack used when switching context to run the executable payload was not enough. Increasing the stack to 16K solves the issue, preventing the payload from clobbering memory within OpenBIOS as it runs. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/context.c Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Wed Sep 29 22:30:51 2010 (r872) +++ trunk/openbios-devel/arch/sparc64/context.c Sat Oct 2 00:29:16 2010 (r873) @@ -11,7 +11,7 @@ #include "openbios.h" #define MAIN_STACK_SIZE 16384 -#define IMAGE_STACK_SIZE 4096*2 +#define IMAGE_STACK_SIZE 4096*4 #define debug printk

1 0

OpenBIOS and ppc64?
by Andreas Färber 01 Oct '10

01 Oct '10

Hello, I'm investigating the idea of a new QEMU chrp machine derived from mac99. The background is that there are ofmem issues when running Haiku on the g3beige machine, whereas running AIX on mac99 fails with the fix in place that makes Haiku go further. I assume this is due to differences in memory layout so that I need to move OpenBIOS to another location in RAM and anything else that clobbers the memory locations AIX assumes to be able to claim for itself. Not having (low-level) access to an IBM Power System / System p / pSeries, the best source I could find was a JS20 device tree [1]. (Some older RS/6000 ones for comparison are available at [2].) Interestingly the nvram is at 0x00000100ff800000 and pci at 0x08000000f8000000, i.e. above 32-bit address space. With sizeof(void*) == 4, drivers/macio.c:nvram is unable to save and access such an address. ofmem cannot deal with 64-bit virtual/physical addresses either, since it uses 32-bit ucell in translation_t and range_t. The MMU translations on mac99 don't match Apple's OpenFirmware on my G5 size- wise. What's the plan for fixing this? Will we need an openbios-ppc64 after all, or is there a way to fix these issues in openbios-ppc using uint64_t and some assembler magic? The 970 init (arch/ppc/qemu/ init.c:ppc64_patch_handlers) apparently does something clever for the interrupt handlers and seems able to use 64-bit ld/std instructions in start.S. That still wouldn't help with ucell based structs and C functions of course... Regards, Andreas [1] http://www.ibm.com/developerworks/forums/thread.jspa?threadID=73270 [2] http://www.tibit.org/ppc/

5 14

[commit] r868 - trunk/openbios-devel/libopenbios
by repository service 30 Sep '10

30 Sep '10

Author: mcayland Date: Wed Sep 29 18:27:42 2010 New Revision: 868 URL: http://tracker.coreboot.org/trac/openbios/changeset/868 Log: When DEBUG_CIF is defined, a serial message of the form "method(...) = " is emitted by dump_service(). After successful execution the return value and a linebreak are emitted by dump_return(). If however the method fails, nothing is emitted, so that subsequent method calls end up in place of the return value. Observed for getproplen with AIX. Emit an error indication and a linebreak when DEBUG_CIF is defined. 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/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Tue Sep 28 20:59:47 2010 (r867) +++ trunk/openbios-devel/libopenbios/client.c Wed Sep 29 18:27:42 2010 (r868) @@ -306,6 +306,10 @@ if( val == -1 ) printk("Unimplemented service %s ([%ld] -- [%ld])\n", pb->service, pb->nargs, pb->nret ); +#ifdef DEBUG_CIF + else + printk("ERROR!\n"); +#endif return -1; }

5 4

[PATCH 1/2] iso9660: Fix Forth return value for iso9660_files_open()
by Andreas Färber 30 Sep '10

30 Sep '10

There's a mixup of 0 and -1. Don't return failure if iso9660_open() succeeded. Don't return success in case iso9660_open() or iso9660_mount() failed. This resolves both a hang when trying to boot cd:,\\:tbxi and failure to boot either cd:,\ppc\bootinfo.txt or cd:,\ppc\chrp\bootfile.exe despite present on the AIX 6.1 disk. Cc: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- fs/iso9660/iso9660_fs.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/iso9660/iso9660_fs.c b/fs/iso9660/iso9660_fs.c index 5714d6d..3fb5c16 100644 --- a/fs/iso9660/iso9660_fs.c +++ b/fs/iso9660/iso9660_fs.c @@ -49,7 +49,7 @@ iso9660_files_open( iso9660_info_t *mi ) if ( mi->volume == NULL ) { free( path ); close_io( fd ); - RET( -1 ); + RET( 0 ); } mi->common->dir = iso9660_opendir( mi->volume, path ); @@ -59,11 +59,11 @@ iso9660_files_open( iso9660_info_t *mi ) iso9660_umount( mi->volume ); close_io( fd ); free( path ); - RET( -1 ); + RET( 0 ); } mi->common->type = FILE; free( path ); - RET( 0 ); + RET( -1 ); } mi->common->type = DIR; free( path ); -- 1.7.3

3 7

Re: [OpenBIOS] x86 multiboot header?
by Nathan Kunkee 30 Sep '10

30 Sep '10

> Date: Tue, 21 Sep 2010 10:07:19 +0100 > From: mark.cave-ayland(a)siriusit.co.uk > To: openbios(a)openbios.org > Subject: Re: [OpenBIOS] x86 multiboot header? > > Nathan Kunkee wrote: > > > Hi all, > > > > As of revision 861, I am unable to build a working multiboot image. I am working on Ubuntu 10.4, gcc 4.4. Although OpenSolaris b134, gcc4, also doesn't work. > > > > Grub 1.95 doesn't recognize the file as a multiboot file. QEMU crashes when passed this via -kernel (something about running code near 0xa000). Sure enough, I can find the second header for 0x2BAD but not 0x1BAD. Is the linker script that prefixes the header off? > > > > Thank you in advance for any assistance! > > Nathan > > Interesting. Did you find r861 as the result of an SVN bisect? If so, > posting a link to your test image so that someone could debug this would > be very helpful. > > > ATB, > > Mark. Hello, I should have said "As of the latest commit (r861)..." since I wanted to convey that I'd tried the latest sources, not that a particular revision introduced this, nor that I found it with a bisect. I found the following change enabled the multiboot image to load with the embedded utils/iso/boot/grub: Index: arch/x86/multiboot.c =================================================================== --- arch/x86/multiboot.c (revision 872) +++ arch/x86/multiboot.c (working copy) @@ -15,8 +15,10 @@ unsigned int magic, flags, checksum; }; -static const struct mbheader multiboot_header - __attribute__((section (".hdr"))) = +//static +const struct mbheader multiboot_header + __attribute__ ((section (".hdr"))) += { MULTIBOOT_HEADER_MAGIC, MULTIBOOT_HEADER_FLAGS, However, even with this, qemu doesn't successfully load the multiboot image: nathan@fangorn:~/openbios-devel/obj-x86$ /usr/local/build/qemu/i386-softmmu/qemu -L /usr/local/src/qemu/pc-bios/ -kernel openbios.multiboot -initrd openbios-x86.dict qemu: I believe we found a multiboot image! multiboot: mh_header_addr = 0 multiboot: mh_load_addr = 0x8 multiboot: mh_load_end_addr = 0x9 multiboot: mh_bss_end_addr = 0x1 qemu: loading multiboot kernel (0x14d28 bytes) at 0x8 multiboot loading module: openbios-x86.dict mod00: 00016008 - 0002dd44 mod_start: 0x9b73cd0 mod_end: 0x9b8ba0c cmdline: 00015018 multiboot: mh_entry_addr = 0x42464c45 mb_buf_phys = 00000008 mod_start = 00016008 mb_mods_count = 1 qemu: fatal: Trying to execute code outside RAM or ROM at 0x42464c45 I've uploaded a zip (openbios-multi.zip) to http://filebin.ca/boqpcs/openbios-multi.zip [filebin.ca] if you'd like to look at my test image. Thank you for your assistance! Nathan

2 1

[commit] r872 - in trunk/openbios-devel: arch/ppc/mol arch/ppc/pearpc arch/sparc32 arch/x86/xbox include/libopenbios libopenbios packages
by repository service 29 Sep '10

29 Sep '10

Author: blueswirl Date: Wed Sep 29 22:30:51 2010 New Revision: 872 URL: http://tracker.coreboot.org/trac/openbios/changeset/872 Log: Avoid a lot of malloc/free traffic Each console write caused temporary buffer allocation. Avoid allocations by changing console_draw_str() to use Forth string parameters, which are usually readily available. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/mol/mol.h trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/pearpc/pearpc.h trunk/openbios-devel/arch/sparc32/console.c trunk/openbios-devel/arch/x86/xbox/methods.c trunk/openbios-devel/include/libopenbios/console.h trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/ppc/mol/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/arch/ppc/mol/methods.c Wed Sep 29 22:30:51 2010 (r872) @@ -85,14 +85,9 @@ { int len = POP(); char *addr = (char*)POP(); - char *s = malloc( len + 1 ); - - strncpy_nopad( s, addr, len ); - s[len]=0; /* printk( "%s", s ); */ - console_draw_str( s ); - free( s ); + console_draw_fstr(addr, len); PUSH( len ); } Modified: trunk/openbios-devel/arch/ppc/mol/mol.h ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/mol.h Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/arch/ppc/mol/mol.h Wed Sep 29 22:30:51 2010 (r872) @@ -24,7 +24,7 @@ extern void set_color( int index, unsigned long color ); /* console.c */ -extern int console_draw_str( const char *str ); +extern int console_draw_fstr(const char *str, int len); extern void console_close( void ); /* pseudodisk.c */ Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Wed Sep 29 22:30:51 2010 (r872) @@ -70,16 +70,10 @@ { int len = POP(); char *addr = (char*)POP(); - char *s = malloc( len + 1 ); - - strncpy_nopad( s, addr, len ); - s[len]=0; printk( "%s", s ); //vfd_draw_str( s ); - console_draw_str( s ); - - free( s ); + console_draw_fstr(addr, len); PUSH( len ); } Modified: trunk/openbios-devel/arch/ppc/pearpc/pearpc.h ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/pearpc.h Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/arch/ppc/pearpc/pearpc.h Wed Sep 29 22:30:51 2010 (r872) @@ -19,7 +19,7 @@ extern int vfd_draw_str( const char *str ); extern void vfd_close( void ); -extern int console_draw_str( const char *str ); +extern int console_draw_fstr(const char *str, int len); #include "kernel.h" Modified: trunk/openbios-devel/arch/sparc32/console.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/console.c Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/arch/sparc32/console.c Wed Sep 29 22:30:51 2010 (r872) @@ -32,12 +32,11 @@ static void video_putchar(int c) { - char buf[2]; + char buf; - buf[0] = c & 0xff; - buf[1] = 0; + buf = c & 0xff; - console_draw_str(buf); + console_draw_fstr(&buf, 1); } static void video_cls(void) Modified: trunk/openbios-devel/arch/x86/xbox/methods.c ============================================================================== --- trunk/openbios-devel/arch/x86/xbox/methods.c Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/arch/x86/xbox/methods.c Wed Sep 29 22:30:51 2010 (r872) @@ -35,16 +35,10 @@ { int len = POP(); char *addr = (char*)POP(); - char *s = malloc( len + 1 ); - - strncpy_nopad( s, addr, len ); - s[len]=0; printk( "%s", s ); //vfd_draw_str( s ); - console_draw_str( s ); - - free( s ); + console_draw_fstr(addr, len); PUSH( len ); } Modified: trunk/openbios-devel/include/libopenbios/console.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/console.h Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/include/libopenbios/console.h Wed Sep 29 22:30:51 2010 (r872) @@ -2,7 +2,7 @@ #define VIDEO_CONSOLE_H /* libopenbios/console_common.c */ -int console_draw_str(const char *str); +int console_draw_fstr(const char *str, int len); int console_init(void); void console_close(void); Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/libopenbios/console_common.c Wed Sep 29 22:30:51 2010 (r872) @@ -382,12 +382,12 @@ } int -console_draw_str( const char *str ) +console_draw_fstr(const char *str, int len) { unsigned int y, x; unsigned char ch; - if (!str) { + if (!str || len <= 0) { return 0; } @@ -395,7 +395,7 @@ return -1; show_cursor(0); - while( (ch=*str++) ) { + while((ch = *str++) && len--) { do_con_trol(ch); if( cons.x >= cons.w ) { Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Wed Sep 29 20:34:41 2010 (r871) +++ trunk/openbios-devel/packages/video.c Wed Sep 29 22:30:51 2010 (r872) @@ -288,11 +288,10 @@ char *addr; int len; - len = GETTOS(); - addr = pop_fstr_copy(); + len = POP(); + addr = (char *)POP(); - console_draw_str(addr); - free(addr); + console_draw_fstr(addr, len); PUSH(len); }

1 0

[commit] r871 - trunk/openbios-devel/packages
by repository service 29 Sep '10

29 Sep '10

Author: blueswirl Date: Wed Sep 29 20:34:41 2010 New Revision: 871 URL: http://tracker.coreboot.org/trac/openbios/changeset/871 Log: video: improve boundary checking Add checks to fill_rect() and video_scroll(). Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Wed Sep 29 19:06:31 2010 (r870) +++ trunk/openbios-devel/packages/video.c Wed Sep 29 20:34:41 2010 (r871) @@ -142,7 +142,8 @@ char *pp; unsigned long col = get_color(col_ind); - if( !video.has_video || x < 0 || y < 0 || x+w > video.fb.w || y+h > video.fb.h ) + if (!video.has_video || x < 0 || y < 0 || w <= 0 || h <= 0 || + x + w > video.fb.w || y + h > video.fb.h) return; pp = (char*)video.fb.mphys + video.fb.rb * y; @@ -203,6 +204,9 @@ { int i, offs, size, *dest, *src; + if (height <= 0 || height >= video.fb.h) { + return; + } offs = video.fb.rb * height; size = (video.fb.h * video.fb.rb - offs)/16; dest = (int*)video.fb.mphys;

1 0

[commit] r870 - trunk/openbios-devel/libopenbios
by repository service 29 Sep '10

29 Sep '10

Author: blueswirl Date: Wed Sep 29 19:06:31 2010 New Revision: 870 URL: http://tracker.coreboot.org/trac/openbios/changeset/870 Log: console: fix off-by-one errror The maximum allowed value for x axis is one less than cons.w. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/console_common.c Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Wed Sep 29 18:28:28 2010 (r869) +++ trunk/openbios-devel/libopenbios/console_common.c Wed Sep 29 19:06:31 2010 (r870) @@ -346,7 +346,7 @@ draw_line(cons.y); return; case 2: /* erase whole line */ - for (i = 0; i <= cons.w; i++) + for (i = 0; i < cons.w; i++) cons.buf[cons.y * cons.w + i] = ' '; draw_line(cons.y); return;

1 0

[PATCH 1/2] CIF: Emit debug linebreak when method fails
by Andreas Färber 29 Sep '10

29 Sep '10

When DEBUG_CIF is defined, a serial message of the form "method(...) = " is emitted by dump_service(). After successful execution the return value and a linebreak are emitted by dump_return(). If however the method fails, nothing is emitted, so that subsequent method calls end up in place of the return value. Observed for getproplen with AIX. Emit an error indication and a linebreak when DEBUG_CIF is defined. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> --- libopenbios/client.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/libopenbios/client.c b/libopenbios/client.c index 9cea0e7..4c43a99 100644 --- a/libopenbios/client.c +++ b/libopenbios/client.c @@ -306,6 +306,10 @@ of_client_interface( int *params ) if( val == -1 ) printk("Unimplemented service %s ([%ld] -- [%ld])\n", pb->service, pb->nargs, pb->nret ); +#ifdef DEBUG_CIF + else + printk("ERROR!\n"); +#endif return -1; } -- 1.7.3

3 4

[commit] r869 - trunk/openbios-devel/libopenbios
by repository service 29 Sep '10

29 Sep '10

Author: mcayland Date: Wed Sep 29 18:28:28 2010 New Revision: 869 URL: http://tracker.coreboot.org/trac/openbios/changeset/869 Log: Prettify the whitespace placement. 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/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Wed Sep 29 18:27:42 2010 (r868) +++ trunk/openbios-devel/libopenbios/client.c Wed Sep 29 18:28:28 2010 (r869) @@ -220,7 +220,7 @@ } else { printk("of_client_interface return:"); for (i = 0; i < pb->nret; i++) { - printk("%lx ", pb->args[pb->nargs + i]); + printk(" %lx", pb->args[pb->nargs + i]); } printk("\n"); }

1 0

[commit] r867 - trunk/openbios-devel/packages
by repository service 28 Sep '10

28 Sep '10

Author: blueswirl Date: Tue Sep 28 20:59:47 2010 New Revision: 867 URL: http://tracker.coreboot.org/trac/openbios/changeset/867 Log: disk-label: fix memory leakages Avoid a strdup() call. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/packages/disk-label.c Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Tue Sep 28 20:59:45 2010 (r866) +++ trunk/openbios-devel/packages/disk-label.c Tue Sep 28 20:59:47 2010 (r867) @@ -64,9 +64,6 @@ cell status; path = my_args_copy(); - if (!path) { - path = strdup(""); - } DPRINTF("dlabel-open '%s'\n", path ); @@ -122,14 +119,14 @@ DPRINTF("Located filesystem with ph " FMT_ucellx "\n", ph); DPRINTF("path: %s length: %d\n", path, strlen(path)); - if (strlen(path)) { + if (path && strlen(path)) { DPRINTF("INTERPOSE!\n"); push_str( path ); PUSH_ph( ph ); fword("interpose"); } - } else if (*path && strcmp(path, "%BOOT") != 0) { + } else if (path && strcmp(path, "%BOOT") != 0) { goto out; }

1 0

[commit] r866 - trunk/openbios-devel/packages
by repository service 28 Sep '10

28 Sep '10

Author: blueswirl Date: Tue Sep 28 20:59:45 2010 New Revision: 866 URL: http://tracker.coreboot.org/trac/openbios/changeset/866 Log: sun-parts: fix memory leakages Free the string returned by my_args_copy() also in error cases. Adjust string parsing to avoid strdup() calls. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Tue Sep 28 20:59:43 2010 (r865) +++ trunk/openbios-devel/packages/sun-parts.c Tue Sep 28 20:59:45 2010 (r866) @@ -92,8 +92,8 @@ sunparts_open( sunparts_info_t *di ) { char *str = my_args_copy(); - char *argstr = strdup(""); - char *parstr = strdup(""); + char *argstr = NULL; + char *parstr = NULL; int parnum = -1; unsigned char buf[512]; struct sun_disklabel *p; @@ -140,7 +140,7 @@ } /* Convert the id to a partition number */ - if (strlen(parstr)) { + if (parstr && strlen(parstr)) { if (parstr[0] >= 'a' && parstr[0] < ('a' + 8)) parnum = parstr[0] - 'a'; else @@ -156,12 +156,15 @@ di->seek_xt = find_parent_method("seek"); SEEK( 0 ); - if( READ(buf, 512) != 512 ) + if (READ(buf, 512) != 512) { + free(str); RET(0); + } /* Check Magic */ if (!has_sun_part_magic(buf)) { DPRINTF("Sun partition magic not found.\n"); + free(str); RET(0); } @@ -190,6 +193,7 @@ size = (long long)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; if (size == 0) { DPRINTF("Partition size is 0, exiting\n"); + free(str); RET(0); } di->size_hi = size >> BITS; @@ -213,7 +217,7 @@ /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ - if (strlen(argstr)) { + if (argstr && strlen(argstr)) { push_str( argstr ); PUSH_ph( ph ); fword("interpose"); @@ -228,7 +232,7 @@ feval("find-package"); ph = POP_ph(); - if (ph) { + if (argstr && ph) { ph = POP_ph(); push_str(argstr); PUSH_ph(ph);

1 0

[commit] r865 - trunk/openbios-devel/fs/iso9660
by repository service 28 Sep '10

28 Sep '10

Author: blueswirl Date: Tue Sep 28 20:59:43 2010 New Revision: 865 URL: http://tracker.coreboot.org/trac/openbios/changeset/865 Log: iso9660: Make name comparison case-insensitive Make seek_name() compare the path component in a case-insensitive way. Should fix an issue reported by Mark. Cc: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Cc: Laurent Vivier <laurent(a)vivier.eu> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/fs/iso9660/iso9660_opendir.c Modified: trunk/openbios-devel/fs/iso9660/iso9660_opendir.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_opendir.c Tue Sep 28 20:59:41 2010 (r864) +++ trunk/openbios-devel/fs/iso9660/iso9660_opendir.c Tue Sep 28 20:59:43 2010 (r865) @@ -55,7 +55,7 @@ while ((idr = iso9660_readdir(dir)) != NULL) { iso9660_name(volume, idr, name_buf); - if (strcmp(name, name_buf) == 0) + if (strcasecmp(name, name_buf) == 0) { result = idr_new(idr); iso9660_closedir(dir);

1 0

[commit] r864 - trunk/openbios-devel/fs/iso9660
by repository service 28 Sep '10

28 Sep '10

Author: blueswirl Date: Tue Sep 28 20:59:41 2010 New Revision: 864 URL: http://tracker.coreboot.org/trac/openbios/changeset/864 Log: iso9660: Fix Forth return value for iso9660_files_open() There's a mixup of 0 and -1. Don't return failure if iso9660_open() succeeded. Don't return success in case iso9660_open() or iso9660_mount() failed. This resolves both a hang when trying to boot cd:,\\:tbxi and failure to boot either cd:,\ppc\bootinfo.txt or cd:,\ppc\chrp\bootfile.exe despite present on the AIX 6.1 disk. Cc: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sat Sep 25 19:07:10 2010 (r863) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Tue Sep 28 20:59:41 2010 (r864) @@ -49,7 +49,7 @@ if ( mi->volume == NULL ) { free( path ); close_io( fd ); - RET( -1 ); + RET( 0 ); } mi->common->dir = iso9660_opendir( mi->volume, path ); @@ -59,11 +59,11 @@ iso9660_umount( mi->volume ); close_io( fd ); free( path ); - RET( -1 ); + RET( 0 ); } mi->common->type = FILE; free( path ); - RET( 0 ); + RET( -1 ); } mi->common->type = DIR; free( path );

1 0

Re: [OpenBIOS] Learning Forth
by Programmingkid 27 Sep '10

27 Sep '10

On Sep 27, 2010, at 4:57 AM, openbios-request(a)openbios.org wrote: > On Sep 26, 2010, at 3:24 AM, openbios-request(a)openbios.org wrote: > >> Message: 8 >> Date: Sun, 26 Sep 2010 07:23:31 +0000 >> From: Blue Swirl <blauwirbel(a)gmail.com> >> To: The OpenBIOS Mailinglist <openbios(a)openbios.org> >> Subject: Re: [OpenBIOS] Learning Forth >> Message-ID: >> <AANLkTinpVXx_YeYy16TiPhuscytObcRmx62n-FdDJoUR(a)mail.gmail.com> >> Content-Type: text/plain; charset=UTF-8 >> >> On Sat, Sep 25, 2010 at 11:00 PM, Programmingkid >> <programmingkidx(a)gmail.com> wrote: >>> I am thinking about buying a book on learning Forth. Would anyone have a suggestion? >> >> I got my Forth skills by reading "Starting Forth" by Leo Brodie. It is >> available online: >> http://www.forth.com/starting-forth/ > > > Thank you for the suggestion. Just curious, has anyone read Forth Programmer's Handbook 3rd edition? If so, would you recommend the book?

1 0

a boring question, is that forth quick?
by kim.jin 27 Sep '10

27 Sep '10

Hi, Generally speaking, is that Forth quicker than C? I hope to know, if we write OpenBIOS by C, is it quicker? BTW, which program language does used to write FCode evaluator? Best Regards! Kim King 2010-09-27

2 1

Re: [OpenBIOS] Learning Forth
by Programmingkid 27 Sep '10

27 Sep '10

On Sep 26, 2010, at 3:24 AM, openbios-request(a)openbios.org wrote: > Message: 8 > Date: Sun, 26 Sep 2010 07:23:31 +0000 > From: Blue Swirl <blauwirbel(a)gmail.com> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Learning Forth > Message-ID: > <AANLkTinpVXx_YeYy16TiPhuscytObcRmx62n-FdDJoUR(a)mail.gmail.com> > Content-Type: text/plain; charset=UTF-8 > > On Sat, Sep 25, 2010 at 11:00 PM, Programmingkid > <programmingkidx(a)gmail.com> wrote: >> I am thinking about buying a book on learning Forth. Would anyone have a suggestion? > > I got my Forth skills by reading "Starting Forth" by Leo Brodie. It is > available online: > http://www.forth.com/starting-forth/ Thank you for the suggestion.

1 0

Learning Forth
by Programmingkid 26 Sep '10

26 Sep '10

I am thinking about buying a book on learning Forth. Would anyone have a suggestion?

2 1

Re: [OpenBIOS] Help with some code
by Programmingkid 25 Sep '10

25 Sep '10

On Sep 25, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > Message: 2 > Date: Fri, 24 Sep 2010 09:25:28 -0400 > From: Tarl Neustaedter <tarl-b2(a)tarl.net> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Help with some code > Message-ID: <4C9CA6C8.2050009(a)tarl.net> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > You should get in the habit of putting stack diagram comments on every line > of code - it will help you keep track of what you are playing with. By > convention, a stack diagram starting with $ indicates a addr,len string > pointer, which you should use in this code for clarity. > > As best I can tell without stack diagrams, you are generating strings of the > form "foo: set-foo foo ! ; foo", and it's probably barfing on "foo:" . I'm not > sure what this is supposed to accomplish. What I'm trying to do is create a new word. The new word's name will be set-_variable_name_. What would be another way to create a new word inside another word? > > Replace the "eval" with a "type" and you should be able to see what it's > generating. I tried your suggestion, but everything looked just fine. The problem shows up at compile-time. Using this code: variable dog : myword 4 -> dog ; What the code should create at compile-time is this: : myword 4 set-dog ; but creates this instead : myword 4 : set-dog ; The problem is with the extra colon between the 4 and the set-dog word. I need a way to eliminate it from the myword word. Other times the compiler will say the word set-dog is undefined. Any clue how to fix this problem?

1 0

[PATCH] fcode-utils: Add type support for Haiku
by Andreas Färber 25 Sep '10

25 Sep '10

Haiku does not have asm/types.h. It does have [u]int*_t but not in sys/types.h. Use stdint.h instead, that works for both Haiku and OpenSolaris and avoids more code duplication in shared/types.h. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Cc: Stefan Reinauer <stepan(a)openbios.org> --- shared/types.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shared/types.h b/shared/types.h index ff24355..9d67c85 100644 --- a/shared/types.h +++ b/shared/types.h @@ -52,9 +52,9 @@ typedef u_int16_t u16; typedef int32_t s32; typedef u_int32_t u32; -#elif defined(__sun__) +#elif defined(__sun__) || defined(__HAIKU__) -#include <sys/types.h> +#include <stdint.h> typedef int8_t s8; typedef uint8_t u8; -- 1.7.1.rc2.7.g3e7f1

3 7

[commit] r863 - trunk/fcode-utils-devel/shared
by repository service 25 Sep '10

25 Sep '10

Author: stepan Date: Sat Sep 25 19:07:10 2010 New Revision: 863 URL: http://tracker.coreboot.org/trac/openbios/changeset/863 Log: Haiku does not have asm/types.h. It does have [u]int*_t but not in sys/types.h. Use C99/POSIX stdint.h types for all platforms. v1 -> v2: * Don't just use stdint.h in place of sys/types.h in the Sun/Haiku code path. Suggested by Stefan. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Cc: Stefan Reinauer <stepan(a)openbios.org> Modified: trunk/fcode-utils-devel/shared/types.h Modified: trunk/fcode-utils-devel/shared/types.h ============================================================================== --- trunk/fcode-utils-devel/shared/types.h Sat Sep 11 18:39:32 2010 (r862) +++ trunk/fcode-utils-devel/shared/types.h Sat Sep 25 19:07:10 2010 (r863) @@ -39,22 +39,8 @@ * **************************************************************************** */ -#if defined(__APPLE__) +#include <stdint.h> -#include <sys/types.h> - -typedef int8_t s8; -typedef u_int8_t u8; - -typedef int16_t s16; -typedef u_int16_t u16; - -typedef int32_t s32; -typedef u_int32_t u32; - -#elif defined(__sun__) - -#include <sys/types.h> typedef int8_t s8; typedef uint8_t u8; @@ -68,20 +54,6 @@ typedef int64_t s64; typedef uint64_t u64; -#else - -#include <asm/types.h> - -typedef __s8 s8; -typedef __u8 u8; - -typedef __s16 s16; -typedef __u16 u16; - -typedef __s32 s32; -typedef __u32 u32; - -#endif #ifdef FALSE /* Hack for AIX. */ #undef FALSE

1 0

Help with some code
by Programmingkid 24 Sep '10

24 Sep '10

I'm trying to implement the -> word for setting variables, but it is not working as I hoped. Everything seems find until I reach the first eval word. At that point the evaluated string should make a new word. For some reason, the eval word says that the word can't be found. Here is the code: \ compile time: 4 -> cat \ run time: 4 set-cat \ : set-cat cat ! ; \ sets values for local variables : -> ( x - ) parse-word \ creates a copy of the variable's name 2dup strdup 2dup strdup 2dup strdup \ creates the new variable setting word " : set-" 2swap $cat2 2swap " ! ;" $cat2 " " 2swap $cat2 $cat2 eval \ sets up the new word to be called in place of -> " set-" 2swap $cat2 " postpone " 2swap $cat2 eval ; immediate \ combines two strings together : $cat2 ( $1 $2 -- $3 ) 2 pick over + dup >r alloc-mem >r 2swap tuck r@ swap move ( $2 $1-len ) r@ + swap move ( ) r> r> ; Anybody know what I could be doing wrong?

2 1

x86 multiboot header?
by Nathan Kunkee 21 Sep '10

21 Sep '10

Hi all, As of revision 861, I am unable to build a working multiboot image. I am working on Ubuntu 10.4, gcc 4.4. Although OpenSolaris b134, gcc4, also doesn't work. Grub 1.95 doesn't recognize the file as a multiboot file. QEMU crashes when passed this via -kernel (something about running code near 0xa000). Sure enough, I can find the second header for 0x2BAD but not 0x1BAD. Is the linker script that prefixes the header off? Thank you in advance for any assistance! Nathan

2 1

is it GPL?
by kim.jin 20 Sep '10

20 Sep '10

Hi, Is it all open firmware GPL? such as OpenBIOS, Smart Firmware, Open Firmware, and OpenBoot? Can any one I can use it free? My project need one boot tool. Best Regards! Kim King 2010-09-20

3 4

Re: [OpenBIOS] PReP PowerPC "emulation"
by Laurent Vivier 18 Sep '10

18 Sep '10

> OK, maybe I make a mistake. It's not a problem. > My goals is to run AIX 4.3, 5.1 and 6.1 on QEMU!!!!!. > Can you help me? What you suggest? > I think there is a lot of confusion ( I also make confusion). > How I can run QEMU to "emulate" CHRP platform ? By default, qemu-system-ppc emulates a CHRP. To run AIX 4.3 and 5.1 you can use a 32bit machine (qemu-system-ppc), to run AIX 6.1 you need a 64bit machine (qemu-system-ppc64). But to be able to run AIX, there are some improvements to add: - to OpenBIOS: at least RTAS is missing. - to qemu: emulate hardware supported by AIX (disk controller, network interface, graphic card, ...) As said before: patches are welcome... Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

8 9

PReP PowerPC "emulation"
by Massimo Montecchi 16 Sep '10

16 Sep '10

Hi, I have tried qemu from 0.11 to latest git (as of 11/09/2010) with latest openbios inside, but if i want to use PREP PPC "machine" the error is the same: qemu: hardware error: PowerPC 601 / 620 / 970 need a 1MB BIOS CPU #0: NIP 00000000 LR 00000000 CTR 00000000 XER 00000000 MSR 00000000 HID0 00000000 HF 00000000 idx 0 TB 00000000 00000000 DECR ffffffff GPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 CR 00000000 [ - - - - - - - - ] RES 00000000 FPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPSCR 00000000 SRR0 00000000 SRR1 00000000 SDR1 00000000 How can I use openbios to start an AIX with qemu ? -- Cordiali Saluti/Best Regards Massimo Montecchi Modena - Italy

5 7

Re: [OpenBIOS] corrections to vocabulary.fs
by Programmingkid 16 Sep '10

16 Sep '10

On Sep 15, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > Message: 1 > Date: Wed, 15 Sep 2010 09:50:07 +0100 > From: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] corrections to vocabulary.fs > Message-ID: <4C9088BF.4060803(a)siriusit.co.uk> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > Programmingkid wrote: > >> I found a few documentation mistakes in the vocabulary.fs file. In the comment section of get-order and set-order, their comments are incorrect. For get-order the comment should be ( -- widn .. wid1 n). For set-order the comment should be ( widn .. wid1 n -- ). This page is where I found the correct comments: http://lars.nocrew.org/dpans/dpans16.htm#16.6.1.2197 > > Nice work. Can you provide a patch for us to review and commit? > > > ATB, > > Mark. > > -- I'm not very good with making patches, but I think this might work: --- ./vocabulary.fs 2009-11-15 21:03:50.000000000 -0500 +++ /vocabulary.fs 2010-09-15 18:09:40.000000000 -0400 @@ -39,14 +39,14 @@ here 0 , ; -: get-order ( -- wid1 .. widn n ) +: get-order ( -- widn .. wid1 n ) #order @ 0 ?do #order @ i - 1- cells context + @ loop #order @ ; -: set-order ( wid1 .. widn n -- ) +: set-order ( widn .. wid1 n -- ) dup -1 = if drop forth-last 1 \ push system default word list and number of lists then

1 0

sparc32 openbios - passing nvram options
by Dmitriy Kargapolov 15 Sep '10

15 Sep '10

Hello, I tried to install netbsd 5.0.2 to qemu-system-sparc (which uses openbios). Boot from cdrom image and installation passed with no problems. But I was not able to boot from hdd. All the -boot, -prom-env options kind of ignored by qemu-system-sparc... All tries end up with booting fromn cdrom (if presented). Configuration device id QEMU version 1 machine id 64 UUID: 00000000-0000-0000-0000-000000000000 CPUs: 1 x TI,TMS390Z55 invalid nvram partition length nvram error detected, zapping pram [sparc] Booting file 'cdrom' with parameters '' Trying cdrom (/iommu/sbus/espdma/esp/sd@2,0) It looks like something wrong happens in the way of passing nvram parameters to openbios. Looking at the sources, I found that key method void arch_nvram_get(char*) is missing from openbios-1.0/arch/sparc32/openbios.c, but it is included in openbios-1.0/arch/sparc64/openbios.c. How nvram settings are passed from qemu command line to openbios-sparc32 in this case? Isn't this a bug? Thanks.

3 4

operating systems that I'm able and not able to run on QEMU PPC
by Massimo Montecchi 15 Sep '10

15 Sep '10

Here is the lists of operating systems that I'm able and not able to run on QEMU PPC: - DEBIAN 5.0.5 PPC it works - OPENSUSE 11.1 PPC it works - FreeBSD 8.1 PPC hangs (see below details) - NETBSD 5.0.2 PPC and PPC64 does not load with defaults (see below details) - SLES 11 SP1 PPC does not load with defaults (see below details) - AIX 4.3.3, 5.1 and 6.1 do not load (see below details) Some time ago I remember that the "working" OSs was more that now :-( -- Cordiali Saluti/Best Regards Massimo Montecchi Modena - Italy DETAILS: ------------------------------------------------------------------------------- FreeBSD 8.1 PPC >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 14:41] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 1024M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 Trying cd:,\\:tbxi... Consoles: Open Firmware console FreeBSD/powerpc Open Firmware loader, Revision 0.1 (root(a)xserve.lan.xcllnt.net, Sun Jul 18 04:50:11 UTC 2010) Memory: 1048576KB Booted from: cd Loading /boot/defaults/loader.conf /boot/kernel/kernel data=0x72c6b8+0x3e280 syms=[0x4+0x5ac10+0x4+0x7d8ad] / Hit [Enter] to boot immediately, or any other key for command prompt. Booting [/boot/kernel/kernel]... Kernel entry at 0x100100 ... ------------------------------------------------------------------------------- NETBSD 5.0.2 (netbsd-ofppccd-5.0.2.iso) PPC64 C>> annot manage 'OHCI USB controller' PCI device type 'usb': >> 106b 3f (c 3 10) >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 14:41] >> Configuration device id QEMU version 1 machine id 3 >> CPUs: 1 >> Memory: 1024M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,970FX Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 Trying cd:,\\:tbxi... ------------------------------------------------------------------------------- NETBSD 5.0.2 (netbsd-ofppccd-5.0.2.iso) PPC >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 14:41] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 1024M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 Trying cd:,\\:tbxi... ------------------------------------------------------------------------------- NETBSD 5.0.2 (netbsd-prepcd-5.0.2.iso) PPC >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 14:41] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 1024M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 Trying cd:,\\:tbxi... >> Not a bootable ELF image No valid state has been set by load or init-program 0 > ------------------------------------------------------------------------------- SLES 11 SP1 PPC >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 14:41] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 1024M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 Trying cd:,\\:tbxi... No valid state has been set by load or init-program 0 > ------------------------------------------------------------------------------- AIX 4.3.3 PPC, AIX 5.1 PPC, AIX 6.1 PPC >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 14:41] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 1024M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 Trying cd:,\\:tbxi...

2 5

corrections to vocabulary.fs
by Programmingkid 15 Sep '10

15 Sep '10

I found a few documentation mistakes in the vocabulary.fs file. In the comment section of get-order and set-order, their comments are incorrect. For get-order the comment should be ( -- widn .. wid1 n). For set-order the comment should be ( widn .. wid1 n -- ). This page is where I found the correct comments: http://lars.nocrew.org/dpans/dpans16.htm#16.6.1.2197

2 1

Re: [OpenBIOS] PReP PowerPC "emulation"
by Andreas Färber 14 Sep '10

14 Sep '10

Hi, Am 13.09.2010 um 10:31 schrieb Laurent Vivier: >> I have tried qemu from 0.11 to latest git (as of 11/09/2010) with >> latest openbios inside, but if i want to use PREP PPC "machine" the >> error is the same: > the last time I tried to boot AIX (6 or 7 monthes ago...), OpenBIOS > was able to load the bootloader but as RTAS is not provided by > OpenBIOS, bootloader failed and didn't go further. I think it was > with the CHRP emulation. I just tried `qemu-system-ppc64 -boot d -cdrom dvd.AIX6_OpenBeta....iso` and it hangs after: Welcome to OpenBIOS v1.0 built on Sep 9 2010 19:56 Trying cd:,\\:tbxi... On a real PowerMac G5 neither the above nor the ppc\bootinfo.txt command `boot &device;:\ppc\chrp\bootfile.exe` worked, any variations of it with , and/or :0 etc. lead to errors about no FDisk partition found or noninterposed LOAD not supported, iirc. This is what -nographic shows me: >> Cannot manage 'OHCI USB controller' PCI device type 'usb': >> 106b 3f (c 3 10) >> ============================================================= >> OpenBIOS 1.0 [Sep 9 2010 19:56] >> Configuration device id QEMU version 1 machine id 3 >> CPUs: 1 >> Memory: 128M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,970FX Welcome to OpenBIOS v1.0 built on Sep 9 2010 19:56 Trying cd:,\\:tbxi... @Alex, any hunch what the OHCI thing is about? It doesn't appear with qemu-system-ppc. Some USB initialization missing in the QEMU U3 machine init maybe? Regards, Andreas

4 4

Re: [OpenBIOS] help with compile/run-time code
by Programmingkid 13 Sep '10

13 Sep '10

On Sep 13, 2010, at 4:32 AM, openbios-request(a)openbios.org wrote: > Programmingkid wrote: > >> I need a little help on how to take compile-time code and change it so that it executes a different set of code at run-time. I want to take this code: "4 -> cat" and change it to "4 cat !" at run-time. The "->" word needs to be able to do this. Would anyone know how? >> >> compile time: 4 -> cat >> run-time: 4 cat ! > > In the context of local variables, would you be able to get away with > parsing this as a string? > > > 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 I was thinking about parsing them as strings, but that would make viewing and debugging the code difficult. I was really hoping for translating the compile-time code into the run-time code I have presented. I made some code examples that I would like to obtain some feedback on. Tell me which of these run-time code examples seems the most plausible to work. Example 1: compile-time code: : myword { ; dog cat hamster } 4 -> dog 3 -> cat 1 -> hamster dog @ cat @ + hamster @ + cr " animals = " . cr ; run-time code: : myword \ Note: myword_wordlist and standardlist are raw numbers - not variables myword_wordlist standardlist 2 set-order \ setup dictionary search order definitions variable dog variable cat variable hamster 4 dog ! 3 cat ! 1 hamster ! dog @ cat @ + hamster @ + cr " animals = " . cr standardlist 1 set-order \ restore dictionary search order definitions ; Another possible run-time code translation: : myword variable dog variable cat variable hamster 4 dog ! 3 cat ! 1 hamster ! dog @ cat @ + hamster @ + cr " animals = " . cr forget dog forget cat forget hamster ; Example 2: compile-time code: \ assigning top stack value to variables : myword { dog cat hamster } dog @ cat @ + hamster @ + cr " animals = " . cr ; run-time code: : myword variable dog variable cat variable hamster dog ! cat ! hamster ! dog @ cat @ + hamster @ + cr " animals = " . cr forget dog forget cat forget hamster ; In each example, the compile-time code would be something that the user enters or is found in a boot script.

1 0

Re: [OpenBIOS] PReP PowerPC "emulation"
by Laurent Vivier 13 Sep '10

13 Sep '10

>Laurent Vivier wrote: > >> Hi, >> >> the last time I tried to boot AIX (6 or 7 monthes ago...), OpenBIOS was >> able to load the bootloader but as RTAS is not provided by OpenBIOS, >> bootloader failed and didn't go further. I think it was with the CHRP >> emulation. >> >> Regards, >> Laurent > >Bizarrely there are lots of "#ifdef USE_RTAS .... #endif" sections >within the PPC code, but USE_RTAS isn't actually defined anywhere to >activate them. I think the entry point is implemented but all the "mechanic" is missing. Probably because it is only used by IBM (neither by Sun, nor by Apple) Regards, Laurent -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

Re: [OpenBIOS] PReP PowerPC "emulation"
by Mark Cave-Ayland 13 Sep '10

13 Sep '10

Laurent Vivier wrote: > Hi, > > the last time I tried to boot AIX (6 or 7 monthes ago...), OpenBIOS was > able to load the bootloader but as RTAS is not provided by OpenBIOS, > bootloader failed and didn't go further. I think it was with the CHRP > emulation. > > Regards, > Laurent Bizarrely there are lots of "#ifdef USE_RTAS .... #endif" sections within the PPC code, but USE_RTAS isn't actually defined anywhere to activate them. 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

1 0

Re: [OpenBIOS] PReP PowerPC "emulation"
by Laurent Vivier 13 Sep '10

13 Sep '10

Hi, the last time I tried to boot AIX (6 or 7 monthes ago...), OpenBIOS was able to load the bootloader but as RTAS is not provided by OpenBIOS, bootloader failed and didn't go further. I think it was with the CHRP emulation. Regards, Laurent Hi, I have tried qemu from 0.11 to latest git (as of 11/09/2010) with latest openbios inside, but if i want to use PREP PPC "machine" the error is the same: qemu: hardware error: PowerPC 601 / 620 / 970 need a 1MB BIOS CPU #0: NIP 00000000 LR 00000000 CTR 00000000 XER 00000000 MSR 00000000 HID0 00000000 HF 00000000 idx 0 TB 00000000 00000000 DECR ffffffff GPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 GPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 CR 00000000 [ - - - - - - - - ] RES 00000000 FPR00 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR04 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR08 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR12 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR16 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR20 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR24 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPR28 0000000000000000 0000000000000000 0000000000000000 0000000000000000 FPSCR 00000000 SRR0 00000000 SRR1 00000000 SDR1 00000000 How can I use openbios to start an AIX with qemu ? -- Cordiali Saluti/Best Regards Massimo Montecchi Modena - Italy -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

help with compile/run-time code
by Programmingkid 13 Sep '10

13 Sep '10

I need a little help on how to take compile-time code and change it so that it executes a different set of code at run-time. I want to take this code: "4 -> cat" and change it to "4 cat !" at run-time. The "->" word needs to be able to do this. Would anyone know how? compile time: 4 -> cat run-time: 4 cat !

2 1

[commit] r862 - trunk/openbios-devel/drivers
by repository service 11 Sep '10

11 Sep '10

Author: blueswirl Date: Sat Sep 11 18:39:32 2010 New Revision: 862 URL: http://tracker.coreboot.org/trac/openbios/changeset/862 Log: Set DMA controller enable bit DMA should be enabled before using it. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/esp.c Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Mon Sep 6 22:56:54 2010 (r861) +++ trunk/openbios-devel/drivers/esp.c Sat Sep 11 18:39:32 2010 (r862) @@ -95,8 +95,8 @@ // Set DMA length esp->ll->regs[ESP_TCLOW] = cmdlen & 0xff; esp->ll->regs[ESP_TCMED] = (cmdlen >> 8) & 0xff; - // Set DMA direction - esp->espdma.regs->cond_reg = 0; + // Set DMA direction and enable DMA + esp->espdma.regs->cond_reg = DMA_ENABLE; // Set ATN, issue command esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA; // Wait for DMA to complete. Can this fail? @@ -121,7 +121,7 @@ esp->ll->regs[ESP_TCLOW] = replylen & 0xff; esp->ll->regs[ESP_TCMED] = (replylen >> 8) & 0xff; // Set DMA direction - esp->espdma.regs->cond_reg = DMA_ST_WRITE; + esp->espdma.regs->cond_reg = DMA_ST_WRITE | DMA_ENABLE; // Transfer esp->ll->regs[ESP_CMD] = ESP_CMD_TI | ESP_CMD_DMA; // Wait for DMA to complete

1 0

Re: [OpenBIOS] Concatenating strings
by Programmingkid 07 Sep '10

07 Sep '10

> > On Sep 5, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > On 9/1/10 4:57 PM, Programmingkid wrote: > > On Sep 1, 2010, at 6:00 AM, openbios-request(a)openbios.org > <mailto:openbios-request@openbios.org> wrote: > > Message: 5 > Date: Tue, 31 Aug 2010 20:11:30 -0400 > From: Tarl Neustaedter <tarl-b2(a)tarl.net <mailto:tarl-b2@tarl.net>> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org > <mailto:openbios@openbios.org>> > Subject: Re: [OpenBIOS] Concatenating strings > Message-ID: <4C7D9A32.2070300(a)tarl.net > <mailto:4C7D9A32.2070300@tarl.net>> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 2010-8-31 8:06 PM, Programmingkid wrote: > Could someone provide me with a code example on how to combine two > strings > together in forth please. Here is my attempt. For some reason it > doesn't > work. Any help would be great. > > The below takes two strings of the form (addr len), allocates a chunk of > memory for them, and concatenates them into that allocated memory, > returning > addr len. > > : $cat2 ( $1 $2 -- $3 ) > 2 pick over + dup >r alloc-mem >r > 2swap tuck r@ swap move ( $2 $1-len ) > r@ + swap move ( ) > r> r> > ; > > Thank you very much Tarl. This word should be added to OpenBIOS. > > Please make sure whether the already existing functions (ie. in > openbios/forth/lib/string.fs) work for you before adding new stuff. > > Stefan Sorry Stefan, but the words there are not very useful. $cat looks a lot more useful and user-friendly than tmpstrcat. Adding $cat to string.fs would make an excellent addition the OpenBIOS.

1 0

Re: [OpenBIOS] Concatenating strings
by M A 07 Sep '10

07 Sep '10

> > On Sep 5, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > On 9/1/10 4:57 PM, Programmingkid wrote: > > On Sep 1, 2010, at 6:00 AM, openbios-request(a)openbios.org > <mailto:openbios-request@openbios.org> wrote: > > Message: 5 > Date: Tue, 31 Aug 2010 20:11:30 -0400 > From: Tarl Neustaedter <tarl-b2(a)tarl.net <mailto:tarl-b2@tarl.net>> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org > <mailto:openbios@openbios.org>> > Subject: Re: [OpenBIOS] Concatenating strings > Message-ID: <4C7D9A32.2070300(a)tarl.net > <mailto:4C7D9A32.2070300@tarl.net>> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 2010-8-31 8:06 PM, Programmingkid wrote: > Could someone provide me with a code example on how to combine two > strings > together in forth please. Here is my attempt. For some reason it > doesn't > work. Any help would be great. > > The below takes two strings of the form (addr len), allocates a chunk of > memory for them, and concatenates them into that allocated memory, > returning > addr len. > > : $cat2 ( $1 $2 -- $3 ) > 2 pick over + dup >r alloc-mem >r > 2swap tuck r@ swap move ( $2 $1-len ) > r@ + swap move ( ) > r> r> > ; > > Thank you very much Tarl. This word should be added to OpenBIOS. > > Please make sure whether the already existing functions (ie. in > openbios/forth/lib/string.fs) work for you before adding new stuff. > > Stefan Sorry Stefan, but the words there are not very useful. $cat looks a lot more useful and user-friendly than tmpstrcat. Adding $cat to string.fs would make an excellent addition the OpenBIOS.

1 0

[commit] r861 - in trunk/openbios-devel: . arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 drivers include/drivers
by repository service 06 Sep '10

06 Sep '10

Author: blueswirl Date: Mon Sep 6 22:56:54 2010 New Revision: 861 URL: http://tracker.coreboot.org/trac/openbios/changeset/861 Log: Enable GCC warning flag -Wnested-externs, fix warnings Move nested extern declarations into header files, or use the already existing declarations. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/x86/context.c trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/arch/x86/openbios.h trunk/openbios-devel/drivers/timer.c trunk/openbios-devel/drivers/timer.h trunk/openbios-devel/include/drivers/drivers.h Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/Makefile.target Mon Sep 6 22:56:54 2010 (r861) @@ -12,7 +12,7 @@ HOSTCFLAGS+= -O2 -g -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) HOSTCFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith HOSTCFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels -HOSTCFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +HOSTCFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs HOSTCFLAGS+= -W HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include @@ -27,7 +27,7 @@ CFLAGS+= -Os -g -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS CFLAGS+= -Wall -Wredundant-decls -Wshadow -Wpointer-arith CFLAGS+= -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels -CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes +CFLAGS+= -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs CFLAGS+= -Werror INCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include AS_FLAGS+= -g Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Sep 6 22:56:54 2010 (r861) @@ -50,7 +50,6 @@ static uint16_t machine_id = 0; extern void unexpected_excep( int vector ); -extern void setup_timers( void ); void unexpected_excep( int vector ) Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/sparc32/context.c Mon Sep 6 22:56:54 2010 (r861) @@ -8,6 +8,7 @@ #include "context.h" #include "libopenbios/sys_info.h" #include "boot.h" +#include "openbios.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096 @@ -46,7 +47,6 @@ static void start_main(void) { int retval; - extern int openbios(void); /* Save startup context, so we can refer to it later. * We have to keep it in physical address since we will relocate. */ Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/sparc64/context.c Mon Sep 6 22:56:54 2010 (r861) @@ -8,6 +8,7 @@ #include "context.h" #include "libopenbios/sys_info.h" #include "boot.h" +#include "openbios.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096*2 @@ -46,7 +47,6 @@ static void start_main(void) { int retval; - extern int openbios(void); /* Save startup context, so we can refer to it later. * We have to keep it in physical address since we will relocate. */ Modified: trunk/openbios-devel/arch/x86/context.c ============================================================================== --- trunk/openbios-devel/arch/x86/context.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/x86/context.c Mon Sep 6 22:56:54 2010 (r861) @@ -12,6 +12,7 @@ #include "context.h" #include "libopenbios/sys_info.h" #include "boot.h" +#include "openbios.h" #define MAIN_STACK_SIZE 16384 #define IMAGE_STACK_SIZE 4096 @@ -57,8 +58,6 @@ static void start_main(void) { int retval; - extern int openbios(void); - extern void init_exceptions(void); /* Save startup context, so we can refer to it later. * We have to keep it in physical address since we will relocate. */ Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/x86/openbios.c Mon Sep 6 22:56:54 2010 (r861) @@ -50,8 +50,6 @@ static void arch_init( void ) { - void setup_timers(void); - openbios_init(); modules_init(); #ifdef CONFIG_DRIVER_PCI Modified: trunk/openbios-devel/arch/x86/openbios.h ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.h Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/arch/x86/openbios.h Mon Sep 6 22:56:54 2010 (r861) @@ -19,6 +19,9 @@ int openbios(void); +/* entry.S */ +void init_exceptions(void); + /* console.c */ extern void cls(void); #ifdef CONFIG_DEBUG_CONSOLE Modified: trunk/openbios-devel/drivers/timer.c ============================================================================== --- trunk/openbios-devel/drivers/timer.c Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/drivers/timer.c Mon Sep 6 22:56:54 2010 (r861) @@ -10,6 +10,7 @@ */ #include "config.h" +#include "drivers/drivers.h" #include "timer.h" #include "asm/io.h" @@ -86,7 +87,6 @@ void udelay(unsigned int usecs) { - extern void _wait_ticks(unsigned long); unsigned long ticksperusec = get_timer_freq() / 1000000; _wait_ticks(ticksperusec * usecs); } Modified: trunk/openbios-devel/drivers/timer.h ============================================================================== --- trunk/openbios-devel/drivers/timer.h Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/drivers/timer.h Mon Sep 6 22:56:54 2010 (r861) @@ -48,13 +48,15 @@ #define PPCB_SPKR 0x02 /* Bit 1 */ #define PPCB_T2GATE 0x01 /* Bit 0 */ -extern void setup_timers(void); extern void ndelay(unsigned int nsecs); extern void udelay(unsigned int usecs); extern void mdelay(unsigned int msecs); extern unsigned long currticks(void); extern unsigned long get_timer_freq(void); +/* arch/ppc/timebase.S */ +void _wait_ticks(unsigned long nticks); + #define TICKS_PER_SEC 1000 #endif /* TIMER_H */ Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Mon Sep 6 22:56:52 2010 (r860) +++ trunk/openbios-devel/include/drivers/drivers.h Mon Sep 6 22:56:54 2010 (r861) @@ -123,4 +123,8 @@ unsigned char keyboard_readdata(void); #endif #endif + +/* drivers/timer.c */ +void setup_timers(void); + #endif /* OPENBIOS_DRIVERS_H */

1 0

[commit] r860 - trunk/openbios-devel/libopenbios
by repository service 06 Sep '10

06 Sep '10

Author: blueswirl Date: Mon Sep 6 22:56:52 2010 New Revision: 860 URL: http://tracker.coreboot.org/trac/openbios/changeset/860 Log: Fix x86 target build OFmem is not available on x86. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/elf_load.c Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Wed Aug 25 18:58:55 2010 (r859) +++ trunk/openbios-devel/libopenbios/elf_load.c Mon Sep 6 22:56:52 2010 (r860) @@ -506,7 +506,7 @@ size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); if (!size) continue; -#ifndef CONFIG_SPARC32 +#if !defined(CONFIG_SPARC32) && !defined(CONFIG_X86) if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) { printk("Ignoring failed claim for va %lx memsz %lx!\n", (unsigned long)phdr[i].p_vaddr,

1 0

Re: [OpenBIOS] Concatenating strings
by Programmingkid 04 Sep '10

04 Sep '10

On Sep 1, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > Message: 5 > Date: Tue, 31 Aug 2010 20:11:30 -0400 > From: Tarl Neustaedter <tarl-b2(a)tarl.net> > To: The OpenBIOS Mailinglist <openbios(a)openbios.org> > Subject: Re: [OpenBIOS] Concatenating strings > Message-ID: <4C7D9A32.2070300(a)tarl.net> > Content-Type: text/plain; charset=ISO-8859-1; format=flowed > > On 2010-8-31 8:06 PM, Programmingkid wrote: >> Could someone provide me with a code example on how to combine two strings >> together in forth please. Here is my attempt. For some reason it doesn't >> work. Any help would be great. > > The below takes two strings of the form (addr len), allocates a chunk of > memory for them, and concatenates them into that allocated memory, returning > addr len. > > : $cat2 ( $1 $2 -- $3 ) > 2 pick over + dup >r alloc-mem >r > 2swap tuck r@ swap move ( $2 $1-len ) > r@ + swap move ( ) > r> r> > ; Thank you very much Tarl. This word should be added to OpenBIOS.

2 1

SPARC64: Forth re-entrancy during MMU I/D TLB miss
by Mark Cave-Ayland 04 Sep '10

04 Sep '10

Hi everyone, So having a poke around various bits of documentation relating to implementing pgmap@, I've come to the realisation that since the Solaris kernel needs to install it's own va>tte-data implementation into OpenBIOS then it's going to be necessary to call back into Forth from the D/I-MMU miss traps. I've been looking around the code in arch/sparc64/switch.S but it looks as if this code only swaps between 2 individual contexts - am I right in thinking there needs to be a way of specifying the memory address of the context for this code to be reusable during a trap? Or would a better way be to duplicate this file but with another static context used only for MMU miss traps? Another question for PPC users: will pgmap@/pgmap! be required there too? I'm trying to figure out if this is something that needs to live within libopenbios/ofmem_common.c or whether it's just a SPARC-specific hack. It looks as if these words are also required for SPARC32 so I'm leaning towards the former... 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

2 3

Concatenating strings
by Programmingkid 01 Sep '10

01 Sep '10

Could someone provide me with a code example on how to combine two strings together in forth please. Here is my attempt. For some reason it doesn't work. Any help would be great. \ (addr len -- ) : loadLocalVariable dup 9 + dup >r alloc-mem " variable " rot dup >r swap move r> r> + swap 3dup move 9 + dup >r - r> eval drop ; All this code does this basically sprintf(defineVariableCommandString, "variable %s", variableString); feval(defineVariableCommandString); Boy I love C.

2 1

vocabulary.fs issues
by Programmingkid 31 Aug '10

31 Aug '10

The words get-order and order do pretty much the same thing. The problem is their output is very different. The order word outputs list in unsigned format, and the get-order word output words in signed format. I think these and other words in vocabulary.fs should output their list in unsigned format because it is a lot friendlier to read than signed format. No matter which format wins, I suggest order and get-order should have the same output format. This change would eliminate any confusion someone might experience when using these words.

2 1

Sparc64 memory allocation problem
by Blue Swirl 26 Aug '10

26 Aug '10

Here's last lines from OpenBSD 4.3 boot, with DEBUG_CIF enabled: Booting cdrom:f/bsd 2590536@0x1000000of_client_interface: call-method 80aec8 ffe880f8 0 278748 1000000 call-method claim ([5] -- [2]) handle_calls return: 0 1000000 of_client_interface: call-method 80aec8 ffe88838 400000 278748 call-method claim ([4] -- [3]) handle_calls return: 0 0 400000 of_client_interface: call-method 80aed0 ffe880f8 ffffffffffffffff 278748 1000000 0 400000 call-method map ([7] -- [1]) handle_calls return: 0 of_client_interface: call-method 80aec8 ffe880f8 2000 4000 call-method claim ([4] -- [2]) handle_calls return: 0 2001e000 of_client_interface: call-method 80aec8 ffe88838 2000 4000 call-method claim ([4] -- [3]) handle_calls return: 0 0 1e000 of_client_interface: call-method 80aed0 ffe880f8 ffffffffffffffff 4000 2001e000 0 1e000 call-method map ([7] -- [1]) handle_calls return: 0 +3236576@0x1800000of_client_interface: call-method 80aec8 ffe880f8 0 400000 1800000 call-method claim ([5] -- [2]) handle_calls return: 0 1800000 of_client_interface: call-method 80aec8 ffe88838 400000 400000 call-method claim ([4] -- [3]) handle_calls return: 0 0 800000 ^ badness, mem_claim returns 0x800000 of_client_interface: call-method 80aed0 ffe880f8 ffffffffffffffff 400000 1800000 0 800000 call-method map ([7] -- [1]) handle_calls return: 0 Unhandled Exception 0x0000000000000010 PC = 0x0000000000803e20 NPC = 0x0000000000803e24 Stopping execution The client executes near 0x800000. However, the ofmem_claim_phys() (called from mem_claim() in lib.c) will happily allocate and return that range. BSD loader then crashes because it tries to zero the BSS which will be at 0x800000 and zeroing reaches PC value. Here's the loader code: http://www.openbsd.org/cgi-bin/cvsweb/src/sys/arch/sparc64/stand/ofwboot/el… Maybe some memory allocation method (FCode?) still does not use ofmem.

4 10

Re: [OpenBIOS] Fwd: [Bug 623852] Re: PPC emulation loops on booting a FreeBSD kernel
by Nigel Horne 25 Aug '10

25 Aug '10

I have been asked to forward this to you - could you help, please? Thanks! -Nigel > > > -------- Original Message -------- > > It looks like a firmware issue. Please report this to > openbios(a)openbios.org. You get the output below by using the -nographic > option. > > >>> ============================================================= >>> OpenBIOS 1.0 [Aug 17 2010 14:41] >>> Configuration device id QEMU version 1 machine id 2 >>> CPUs: 1 >>> Memory: 512M >>> UUID: 00000000-0000-0000-0000-000000000000 >>> CPU type PowerPC,750 > Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 > Trying cd:,\\:tbxi... > Consoles: Open Firmware console > > FreeBSD/powerpc Open Firmware loader, Revision 0.1 > (root(a)xserve.lan.xcllnt.net, Sun Jul 18 04:50:11 UTC 2010) > Memory: 524288KB > Booted from: cd > > Loading /boot/defaults/loader.conf > /boot/kernel/kernel data=0x72c6b8+0x3e280 syms=[0x4+0x5ac10+0x4+0x7d8ad] > / > Hit [Enter] to boot immediately, or any other key for command prompt. > Booting [/boot/kernel/kernel]... > Kernel entry at 0x100100 ... > panic: OFW translations above 32-bit boundary! > Uptime: 1s > -- Nigel Horne. Arranger, Adjudicator, Band Trainer, Composer, Tutor, Typesetter. NJH Music, ICQ#20252325, twitter: @nigelhorne njh(a)bandsman.co.uk http://www.bandsman.co.uk

2 2

Solaris 9: failed boot with strange device names
by Mark Cave-Ayland 25 Aug '10

25 Aug '10

Hi all, So given that the Fcode evaluator is sorted for Solaris 10, I thought I'd try my original Solaris 9 disk image again and was surprised to find that it didn't boot. Further investigation seems to show that strangely encoded device names are being passed into cif-open which is failing: : get-file ( 6000 ffe35870 27 ) 00000000ffe36378: fname>devname$ 3 > 2dup type /platform/OpenBiosTeam,OpenBIOS/ufsboot ok 3 > resume ok ( 6000 ffe35870 27 ) 00000000ffe36378: fname>devname$ ( 6000 ffe35ee8 2f ) 00000000ffe36380: ufs-fopen 3 > 2dup type cdrom:a,|platform|OpenBiosTeam,OpenBIOS|ufsboot ok 3 > resume ok ( 6000 ffe35ee8 2f ) 00000000ffe36380: ufs-fopen : ufs-fopen ( 6000 ffe35ee8 2f ) 00000000ffe360e8: drop ( 6000 ffe35ee8 ) 00000000ffe360f0: cif-open ( 6000 0 ) 00000000ffe360f8: (semis) : get-file ( 6000 ffe35870 17 ) 00000000ffe36378: fname>devname$ 3 > 2dup type /platform/sun4u/ufsboot ok 3 > resume ok ( 6000 ffe35870 17 ) 00000000ffe36378: fname>devname$ ( 6000 ffe35ee8 1f ) 00000000ffe36380: ufs-fopen 3 > 2dup type cdrom:a,|platform|sun4u|ufsboot ok 3 > resume ok ( 6000 ffe35ee8 1f ) 00000000ffe36380: ufs-fopen : ufs-fopen ( 6000 ffe35ee8 1f ) 00000000ffe360e8: drop ( 6000 ffe35ee8 ) 00000000ffe360f0: cif-open OFMEM: ofmem_claim_virt virt=ffffffffffffffff size=0000000000000200 align=0000000000000001 ( 6000 0 ) 00000000ffe360f8: (semis) It looks as if a special type of device-specifier is being passed into cif-open consisting of a device and argument, a comma, then the actual filename required with /s replaced by |s. Is this some kind of special syntax that needs to be taught to the dev word and/or cif-open words? 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 10

[commit] r859 - trunk/openbios-devel/arch/sparc64
by repository service 25 Aug '10

25 Aug '10

Author: mcayland Date: Wed Aug 25 18:58:55 2010 New Revision: 859 URL: http://tracker.coreboot.org/trac/openbios/changeset/859 Log: Alter the MMU properties as suggested by the UltraSPARC-II device tree prtconf output in the Debian sparc-utils package and Solaris 9 boot; i.e. remove the /CPU/mmu device, relocate its methods to /virtual-memory, and alter the /chosen mmu property so that it now points to /virtual-memory. This helps both Solaris 9 and OpenSolaris boot further along the way. 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/tree.fs Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Tue Aug 24 21:45:57 2010 (r858) +++ trunk/openbios-devel/arch/sparc64/lib.c Wed Aug 25 18:58:55 2010 (r859) @@ -446,7 +446,7 @@ { "SUNW,retain", mem_retain }, }; -DECLARE_UNNAMED_NODE(mmu, INSTALL_OPEN, 0); +DECLARE_NODE(mmu, INSTALL_OPEN, 0, "/virtual-memory"); NODE_METHODS(mmu) = { { "open", mmu_open }, @@ -462,33 +462,18 @@ void ob_mmu_init(const char *cpuname, uint64_t ram_size) { - char nodebuff[256]; - /* memory node */ REGISTER_NODE_METHODS(memory, "/memory"); /* MMU node */ - snprintf(nodebuff, sizeof(nodebuff), "/%s", cpuname); - push_str(nodebuff); - fword("find-device"); - - fword("new-device"); - - push_str("mmu"); - fword("device-name"); - - fword("finish-device"); - - snprintf(nodebuff, sizeof(nodebuff), "/%s/mmu", cpuname); - - REGISTER_NODE_METHODS(mmu, nodebuff); + REGISTER_NODE_METHODS(mmu, "/virtual-memory"); ofmem_register(find_dev("/memory"), find_dev("/virtual-memory")); push_str("/chosen"); fword("find-device"); - push_str(nodebuff); + push_str("/virtual-memory"); fword("open-dev"); fword("encode-int"); push_str("mmu"); Modified: trunk/openbios-devel/arch/sparc64/tree.fs ============================================================================== --- trunk/openbios-devel/arch/sparc64/tree.fs Tue Aug 24 21:45:57 2010 (r858) +++ trunk/openbios-devel/arch/sparc64/tree.fs Wed Aug 25 18:58:55 2010 (r859) @@ -31,19 +31,13 @@ external : open true ; : close ; - \ claim ( phys size align -- base ) -\ : claim 2drop ; - \ release ( phys size -- ) + \ see arch/sparc64/lib.c for methods finish-device new-device " virtual-memory" device-name external - : open true ; - : close ; - \ claim ( phys size align -- base ) -\ : claim 2drop ; - \ release ( phys size -- ) + \ see arch/sparc64/lib.c for methods finish-device " /options" find-device

1 0

[commit] r858 - trunk/openbios-devel/libopenbios
by repository service 24 Aug '10

24 Aug '10

Author: blueswirl Date: Tue Aug 24 21:45:57 2010 New Revision: 858 URL: http://tracker.coreboot.org/trac/openbios/changeset/858 Log: Claim memory areas used by ELF loader Can't enable Sparc32 yet, there is no ofmem_claim(). Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/elf_load.c Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Sun Aug 22 23:29:25 2010 (r857) +++ trunk/openbios-devel/libopenbios/elf_load.c Tue Aug 24 21:45:57 2010 (r858) @@ -11,6 +11,7 @@ #include "libopenbios/sys_info.h" #include "libopenbios/ipchecksum.h" #include "libopenbios/bindings.h" +#include "libopenbios/ofmem.h" #define printf printk #define debug printk @@ -505,10 +506,11 @@ size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); if (!size) continue; -#if 0 +#ifndef CONFIG_SPARC32 if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) { - printk("Claim failed!\n"); - return; + printk("Ignoring failed claim for va %lx memsz %lx!\n", + (unsigned long)phdr[i].p_vaddr, + (unsigned long)phdr[i].p_memsz); } #endif /* Workaround for archs where sizeof(int) != pointer size */

1 0

Re: [OpenBIOS] fword and feval
by Programmingkid 24 Aug '10

24 Aug '10

On Aug 20, 2010, at 6:00 AM, openbios-request(a)openbios.org wrote: > On Thu, Aug 19, 2010 at 4:52 PM, Programmingkid > <programmingkidx(a)gmail.com> wrote: >> I am trying to use the fword and feval functions in the file "kernel/forth.c". I know the header file for these functions are located in "include/libopenbios/bindings.h". I used this code to include the bindings.h file: >> >> #include "libopenbios/bindings.h" >> >> For some reason, I still see these errors: >> >> Building OpenBIOS for x86 >> Building...error: >> ?HOSTCC host/kernel/bootstrap.o >> ?HOSTCC host/kernel/dict.o >> ?HOSTCC host/kernel/primitives.o >> ?HOSTCC host/kernel/stack.o >> ?HOSTCC forthstrap >> host/kernel/primitives.o: In function `setupLocalDictionary': >> /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1035: undefined reference to `_fword' >> /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1037: undefined reference to `_fword' >> /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1044: undefined reference to `feval' >> /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1045: undefined reference to `feval' >> host/kernel/primitives.o: In function `loadLocalVariable': >> /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1072: undefined reference to `feval' >> collect2: ld returned 1 exit status >> make[1]: *** [forthstrap] Error 1 >> make[1]: Leaving directory `/home/user/Development/openbios-devel/obj-x86' >> make: *** [build] Error 1 >> >> >> This is a simple function someone could use as an example to be used in the file forth.c >> >> static void test(void) >> { >> ? ? ? ?feval("banner"); >> } >> >> Anyone know what I am doing wrong or how to solve this problem? > > You are using the bootstrap compiler, which has only very limited set > of basic Forth words defined and actually even some of those will not > work during bootstrap time. > > Full set of words like 'feval' is available when the library compiled > by bootstrap compiler is loaded into non-bootstrap kernel. Your > example should compile in arch/x86/openbios.c or arch/unix/unix.c. Thanks for the help, but I still run into problems. I want to be able to use the functions from the forth interpreter. I tried adding my functions to primitives.c and bootstrap.c, but openbios won't compile. Here are the functions I am trying to make available to the interpreter: static void setupLocalDictionary(void) { int localWordListID, standardDictionaryID; #define NUMBER_OF_DICTIONARIES 2 char commandString[100]; fword("wordlist"); localWordListID = POP(); fword("get-order"); POP(); // removes the number of dictionaries standardDictionaryID = POP(); sprintf(commandString, "%d %d %d", standardDictionaryID, localWordListID, NUMBER_OF_DICTIONARIES); feval(commandString); feval("set-order"); } // (addr len -- ) // variable static void loadLocalVariable(void) { int lengthOfVariableString, addressOfVariableString; char variableString[WIDTH], defineVariableCommandString[WIDTH]; int stackSize; #define NUMBER_OF_NEEDED_STACK_ITEMS 2 depth(); stackSize = POP(); if(stackSize < NUMBER_OF_NEEDED_STACK_ITEMS) { printk("\nSorry but loadLocalVarable needs stack in this format: (addr len -- )\n"); return; } lengthOfVariableString = POP(); addressOfVariableString = POP(); strncpy(variableString, (char *) addressOfVariableString, lengthOfVariableString); variableString[lengthOfVariableString] = '\0'; sprintf(defineVariableCommandString, "variable %s", variableString); feval(defineVariableCommandString); //printk("variable = %s\t", variableString); } Any ideas as to where I can place them?

2 1

[commit] r857 - trunk/openbios-devel/packages
by repository service 22 Aug '10

22 Aug '10

Author: mcayland Date: Sun Aug 22 23:29:25 2010 New Revision: 857 URL: http://tracker.coreboot.org/trac/openbios/changeset/857 Log: The Solaris 9 Fcode boot block relies on the assumption that Sun's OpenBOOT would always interpose /packages/ufs-file-system if it existed when opening a disk device. Emulate this behaviour in order to fix Solaris 9 boot. With thanks to Tarl for pointing me in the right direction. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Aug 22 23:23:19 2010 (r856) +++ trunk/openbios-devel/packages/sun-parts.c Sun Aug 22 23:29:25 2010 (r857) @@ -220,6 +220,20 @@ } } else { DPRINTF("sun-parts: no filesystem found; bypassing misc-files interpose\n"); + + /* Solaris Fcode boot blocks assume that the disk-label package will always + automatically interpose the "ufs-file-system" package if it exists! We + need to mimic this behaviour in order for the boot to work. */ + push_str("ufs-file-system"); + feval("find-package"); + ph = POP_ph(); + + if (ph) { + ph = POP_ph(); + push_str(argstr); + PUSH_ph(ph); + fword("interpose"); + } } free( str );

1 0

[commit] r856 - trunk/openbios-devel/arch/sparc64
by repository service 22 Aug '10

22 Aug '10

Author: mcayland Date: Sun Aug 22 23:23:19 2010 New Revision: 856 URL: http://tracker.coreboot.org/trac/openbios/changeset/856 Log: Fix bug in SPARC64 CIF claim function - previously we were just allocating virtual memory rather than allocating both virtual and physical memory and setting up an MMU mapping. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/lib.c Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Aug 22 11:29:28 2010 (r855) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Aug 22 23:23:19 2010 (r856) @@ -417,6 +417,27 @@ PUSH(phys >> 32); } +/* ( virt size align -- baseaddr|-1 ) */ +static void +ciface_claim( void ) +{ + ucell align = POP(); + ucell size = POP(); + ucell virt = POP(); + ucell ret = ofmem_claim( virt, size, align ); + + /* printk("ciface_claim: %08x %08x %x\n", virt, size, align ); */ + PUSH( ret ); +} + +/* ( virt size -- ) */ +static void +ciface_release( void ) +{ + POP(); + POP(); +} + DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); NODE_METHODS( memory ) = { @@ -493,6 +514,6 @@ push_str("/openprom/client-services"); fword("find-device"); - bind_func("cif-claim", mmu_claim); - bind_func("cif-release", mmu_release); + bind_func("cif-claim", ciface_claim); + bind_func("cif-release", ciface_release); }

1 0

[commit] r855 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 22 Aug '10

22 Aug '10

Author: blueswirl Date: Sun Aug 22 11:29:28 2010 New Revision: 855 URL: http://tracker.coreboot.org/trac/openbios/changeset/855 Log: Drop some unused variables Found with this Coccinelle script: @@ type T; identifier i; expression E; @@ ( extern T i; | - T i; <+... when != i - i = E; ...+> ) Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/romvec.c trunk/openbios-devel/drivers/pc_kbd.c trunk/openbios-devel/drivers/pc_serial.c Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Sat Aug 21 12:21:01 2010 (r854) +++ trunk/openbios-devel/arch/sparc32/romvec.c Sun Aug 22 11:29:28 2010 (r855) @@ -197,10 +197,9 @@ return ""; } else { - int len; char *str; - len = POP(); + POP(); /* len */ str = (char *) POP(); DPRINTF("obp_nextprop(0x%x, %s) = %s\n", node, name, str); Modified: trunk/openbios-devel/drivers/pc_kbd.c ============================================================================== --- trunk/openbios-devel/drivers/pc_kbd.c Sat Aug 21 12:21:01 2010 (r854) +++ trunk/openbios-devel/drivers/pc_kbd.c Sun Aug 22 11:29:28 2010 (r855) @@ -164,15 +164,12 @@ int len; phandle_t ph; unsigned long *prop; - char *args; fword("my-self"); fword("ihandle>phandle"); ph = (phandle_t)POP(); prop = (unsigned long *)get_property(ph, "address", &len); *address = *prop; - fword("my-args"); - args = pop_fstr_copy(); RET ( -1 ); } Modified: trunk/openbios-devel/drivers/pc_serial.c ============================================================================== --- trunk/openbios-devel/drivers/pc_serial.c Sat Aug 21 12:21:01 2010 (r854) +++ trunk/openbios-devel/drivers/pc_serial.c Sun Aug 22 11:29:28 2010 (r855) @@ -145,15 +145,12 @@ int len; phandle_t ph; unsigned long *prop; - char *args; fword("my-self"); fword("ihandle>phandle"); ph = (phandle_t)POP(); prop = (unsigned long *)get_property(ph, "address", &len); *address = *prop; - fword("my-args"); - args = pop_fstr_copy(); RET ( -1 ); }

1 0

latest SVN doesn't boot -kernel on PPC
by Alexander Graf 21 Aug '10

21 Aug '10

Hi guys, I just tried to build the current SVN checkout (852) and apparently something tried to boot from CD-ROM which fails when I use the -kernel option. agraf@lychee:/home/agraf/release/qemu> ./ppc64-softmmu/qemu-system-ppc64 -kernel /home/agraf/release/kvm/vmlinux -initrd /boot/initrd -append "console=ttyPZ0 root=/dev/hda3" -nographic -snapshot /SLES11/debian_lenny_powerpc_small.qcow -L ~/ppc64/bios -enable-kvm -m 512 Could not open option rom 'vgabios.bin': No such file or directory Could not open option rom 'pxe-ne2k_pci.bin': No such file or directory C>> annot manage 'OHCI USB controller' PCI device type 'usb': >> 106b 3f (c 3 10) >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 14:41] >> Configuration device id QEMU version 1 machine id 3 >> CPUs: 1 >> Memory: 512M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,970FX Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 Trying cd:,\\:tbxi... Trying cd:,\ppc\bootinfo.txt... [bctrl in enter_forth jumps to address 0] If additionally I pass in a CD-ROM image, everything is fine: agraf@lychee:/home/agraf/release/qemu> ./ppc64-softmmu/qemu-system-ppc64 -kernel /home/agraf/release/kvm/vmlinux -initrd /boot/initrd -append "console=ttyPZ0 root=/dev/hda3" -nographic -snapshot /SLES11/debian_lenny_powerpc_small.qcow -L ~/ppc64/bios -enable-kvm -m 512 -cdrom /SLES11/debian_etch_powerpc_small.qcow Could not open option rom 'vgabios.bin': No such file or directory Could not open option rom 'pxe-ne2k_pci.bin': No such file or directory C>> annot manage 'OHCI USB controller' PCI device type 'usb': >> 106b 3f (c 3 10) >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 14:41] >> Configuration device id QEMU version 1 machine id 3 >> CPUs: 1 >> Memory: 512M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,970FX Welcome to OpenBIOS v1.0 built on Aug 17 2010 14:41 Trying cd:,\\:tbxi... Trying cd:,\ppc\bootinfo.txt... >> [ppc] Kernel already loaded (0x01000000 + 0x00d3574c) (initrd 0x02800000 + 0x005d5ea6) >> [ppc] Kernel command line: console=ttyPZ0 root=/dev/hda3 OF stdout device is: /pci@f0000000/mac-io@e/escc@13000/ch-b@13000 Preparing to boot Linux version 2.6.35-38620-g0195a22-dirty (agraf@lychee) (gcc version 4.3.2 [gcc-4_3-branch revision 141291] (SUSE Linux) ) #338 SMP Tue Aug 17 14:00:18 CEST 2010 [...] Does anyone have an idea what's going on? Alex

4 7

[commit] r854 - in trunk/openbios-devel/forth: admin debugging
by repository service 21 Aug '10

21 Aug '10

Author: mcayland Date: Sat Aug 21 12:21:01 2010 New Revision: 854 URL: http://tracker.coreboot.org/trac/openbios/changeset/854 Log: Alter (encode-bootpath) so that it processes a string on the stack rather than using the parse buffer directly. This enables us to ensure that execution of any platform-specific boot code can occur before the main "load & go" boot, even if they invoke Forth commands that alter the parse buffer. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/admin/userboot.fs trunk/openbios-devel/forth/debugging/client.fs Modified: trunk/openbios-devel/forth/admin/userboot.fs ============================================================================== --- trunk/openbios-devel/forth/admin/userboot.fs Tue Aug 17 17:42:10 2010 (r853) +++ trunk/openbios-devel/forth/admin/userboot.fs Sat Aug 21 12:21:01 2010 (r854) @@ -1,10 +1,22 @@ \ 7.4.3.5 User commands for booting : boot ( "{param-text}<cr>" -- ) - (encode-bootpath) \ Setup bootpath/bootargs + linefeed parse + + \ Copy NVRAM parameters from boot-file to bootargs in case any parameters have + \ been specified for the platform-specific boot code + s" boot-file" $find drop execute + encode-string + " /chosen" (find-dev) if + " bootargs" rot (property) + then + + \ Execute platform-specific boot code, e.g. kernel s" platform-boot" $find if - execute \ Execute platform-specific boot code + execute then + + (encode-bootpath) \ Setup bootpath/bootargs $load \ load and go go ; Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Tue Aug 17 17:42:10 2010 (r853) +++ trunk/openbios-devel/forth/debugging/client.fs Sat Aug 21 12:21:01 2010 (r854) @@ -55,16 +55,19 @@ then ; -: (encode-bootpath) ( "{params}<cr>" -- bootpath-str bootpath-len) - \ Parse the current input buffer of a load/boot command and set both +: (encode-bootpath) ( param-str param-len -- bootpath-str bootpath-len) + \ Parse the <param> string from a load/boot command and set both \ the bootargs and bootpath properties as appropriate. - cr \ bootpath - bl parse dup 0= if + bl left-split \ argstr argstr-len bootdevstr bootdevstr-len + dup 0= if \ None specified. As per IEEE-1275 specification, search through each value \ in boot-device and use the first that returns a valid ihandle on open. + + 2drop \ drop the empty device string as we're going to use our own + s" boot-device" $find drop execute bl left-split begin @@ -80,8 +83,6 @@ then repeat 2drop - else - 0 0 2swap \ Fake (empty) parse string then \ Set the bootpath property @@ -91,7 +92,7 @@ then \ bootargs - linefeed parse dup 0= if + 2swap dup 0= if \ None specified, use default from nvram 2drop s" boot-file" $find drop execute then @@ -101,9 +102,6 @@ " /chosen" (find-dev) if " bootargs" rot (property) then - - \ Remove the remaining string - 2swap 2drop ; : $load ( devstr len ) @@ -121,6 +119,7 @@ ; : load ( "{params}<cr>" -- ) + linefeed parse (encode-bootpath) $load ;

1 0

fword and feval
by Programmingkid 19 Aug '10

19 Aug '10

I am trying to use the fword and feval functions in the file "kernel/forth.c". I know the header file for these functions are located in "include/libopenbios/bindings.h". I used this code to include the bindings.h file: #include "libopenbios/bindings.h" For some reason, I still see these errors: Building OpenBIOS for x86 Building...error: HOSTCC host/kernel/bootstrap.o HOSTCC host/kernel/dict.o HOSTCC host/kernel/primitives.o HOSTCC host/kernel/stack.o HOSTCC forthstrap host/kernel/primitives.o: In function `setupLocalDictionary': /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1035: undefined reference to `_fword' /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1037: undefined reference to `_fword' /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1044: undefined reference to `feval' /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1045: undefined reference to `feval' host/kernel/primitives.o: In function `loadLocalVariable': /home/user/Development/openbios-devel/obj-x86/../kernel/forth.c:1072: undefined reference to `feval' collect2: ld returned 1 exit status make[1]: *** [forthstrap] Error 1 make[1]: Leaving directory `/home/user/Development/openbios-devel/obj-x86' make: *** [build] Error 1 This is a simple function someone could use as an example to be used in the file forth.c static void test(void) { feval("banner"); } Anyone know what I am doing wrong or how to solve this problem?

2 1

QEMU and OpenBIOS
by Steven Noonan 18 Aug '10

18 Aug '10

Hi all, I just compiled OpenBIOS (from trunk) with a ton of CONFIG_DEBUG* options enabled, but I'm not getting any output from them (at least, under QEMU). printk() seems to work for this portion: >> ============================================================= >> OpenBIOS 1.0 [Aug 17 2010 21:39] >> Configuration device id QEMU version 1 machine id 2 >> CPUs: 1 >> Memory: 1024M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,G4 But nothing after that point gets printed to the serial device. Any ideas where I should be looking? - Steven

2 2

[commit] r853 - in trunk/openbios-devel: arch/ppc/qemu include/arch/common
by repository service 17 Aug '10

17 Aug '10

Author: agraf Date: Tue Aug 17 17:42:10 2010 New Revision: 853 URL: http://tracker.coreboot.org/trac/openbios/changeset/853 Log: Detect KVM hypervisor and set /hypervisor properties accordingly The ePAPR spec requires us to have a /hypervisor node that tells the guest OS which hypervisor it's running on and which hypercall to use to call into it. So let's fetch all that information from Qemu's fw_cfg interface and put it into place, making everyone happy. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/tree.fs trunk/openbios-devel/include/arch/common/fw_cfg.h Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Wed Aug 11 22:59:18 2010 (r852) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Tue Aug 17 17:42:10 2010 (r853) @@ -518,6 +518,58 @@ call_elf( 0, 0, addr); } +static void kvm_of_init(void) +{ + char hypercall[4 * 4]; + uint32_t *hc32; + + /* Don't expose /hypervisor when not in KVM */ + if (!fw_cfg_read_i32(FW_CFG_PPC_IS_KVM)) + return; + + push_str("/hypervisor"); + fword("find-device"); + + /* compatible */ + + push_str("linux,kvm"); + fword("encode-string"); + push_str("epapr,hypervisor-0.2"); + fword("encode-string"); + fword("encode+"); + push_str("compatible"); + fword("property"); + + /* Tell the guest about the hypercall instructions */ + fw_cfg_read(FW_CFG_PPC_KVM_HC, hypercall, 4 * 4); + hc32 = (uint32_t*)hypercall; + PUSH(hc32[0]); + fword("encode-int"); + PUSH(hc32[1]); + fword("encode-int"); + fword("encode+"); + PUSH(hc32[2]); + fword("encode-int"); + fword("encode+"); + PUSH(hc32[3]); + fword("encode-int"); + fword("encode+"); + push_str("hcall-instructions"); + fword("property"); + + /* ePAPR requires us to provide a unique guest id */ + PUSH(fw_cfg_read_i32(FW_CFG_PPC_KVM_PID)); + fword("encode-int"); + push_str("guest-id"); + fword("property"); + + /* ePAPR requires us to provide a guest name */ + push_str("KVM guest"); + fword("encode-string"); + push_str("guest-name"); + fword("property"); +} + void arch_of_init( void ) { @@ -714,6 +766,8 @@ stdout_path = "screen"; } + kvm_of_init(); + /* Setup nvram variables */ push_str("/options"); fword("find-device"); Modified: trunk/openbios-devel/arch/ppc/qemu/tree.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/tree.fs Wed Aug 11 22:59:18 2010 (r852) +++ trunk/openbios-devel/arch/ppc/qemu/tree.fs Tue Aug 17 17:42:10 2010 (r853) @@ -39,6 +39,11 @@ : close ; finish-device +new-device + " hypervisor" device-name + " hypervisor" device-type +finish-device + \ ------------------------------------------------------------- \ /packages \ ------------------------------------------------------------- Modified: trunk/openbios-devel/include/arch/common/fw_cfg.h ============================================================================== --- trunk/openbios-devel/include/arch/common/fw_cfg.h Wed Aug 11 22:59:18 2010 (r852) +++ trunk/openbios-devel/include/arch/common/fw_cfg.h Tue Aug 17 17:42:10 2010 (r853) @@ -41,6 +41,9 @@ #define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) #define FW_CFG_PPC_TBFREQ (FW_CFG_ARCH_LOCAL + 0x03) #define FW_CFG_PPC_CPUFREQ (FW_CFG_ARCH_LOCAL + 0x04) +#define FW_CFG_PPC_IS_KVM (FW_CFG_ARCH_LOCAL + 0x05) +#define FW_CFG_PPC_KVM_HC (FW_CFG_ARCH_LOCAL + 0x06) +#define FW_CFG_PPC_KVM_PID (FW_CFG_ARCH_LOCAL + 0x07) #define FW_CFG_INVALID 0xffff

1 0

Re: [OpenBIOS] [commit] r847 - trunk/openbios-devel/libopenbios
by Nick Couchman 17 Aug '10

17 Aug '10

> Gosh. cabc000 ~ 212M. I'm guessing this is a large boot_archive? Wow, don't I feel stupid right about now. Default memory for qemu is 128 MB, and when the boot_archive on CD is 170 MB, it's going to be hard to load, eh? :-). Maybe the error message it threw should have been my first hint?! So, after running qemu with "-m 512" to throw 512MB at it, I come up with the following (this is with fcode-debug? set to true): 0 > boot cdrom Not a Linux kernel image Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 7420 bytes entry point is 0x4000 doheaders isn't unique. fs-pkg$ isn't unique. fs-type$ isn't unique. /buf-len isn't unique. roundup isn't unique. cstrlen isn't unique. cscount isn't unique. $append isn't unique. $= isn't unique. str++ isn't unique. die isn't unique. diag-cr? isn't unique. find-abort isn't unique. get-package isn't unique. cif-ph isn't unique. cif-open isn't unique. cif-close isn't unique. cif-read isn't unique. cif-seek isn't unique. cif-release isn't unique. find-cif-method isn't unique. chosen-ph isn't unique. get-property isn't unique. get-string-prop isn't unique. get-int-prop isn't unique. mmu-ih isn't unique. mem-ih isn't unique. mmu-claim isn't unique. mmu-map isn't unique. mem-claim isn't unique. (mem-alloc) isn't unique. vmem-alloc isn't unique. mem-alloc isn't unique. mem-free isn't unique. /rd-fcode isn't unique. rd-offset isn't unique. open-abort isn't unique. open-cstr isn't unique. dev-open isn't unique. dev-close isn't unique. read-disk isn't unique. root-ph isn't unique. fs-ih isn't unique. nested? isn't unique. file-sz isn't unique. boot-dev isn't unique. boot-dev$ isn't unique. loader-base isn't unique. load-pkg isn't unique. get-bootdev isn't unique. mount-root isn't unique. vmem-alloc-prop isn't unique. get-file isn't unique. is-elf? isn't unique. is-archive? isn't unique. check-elf isn't unique. check-fcode isn't unique. >bootblk isn't unique. get-type isn't unique. fflag? isn't unique. boot-file isn't unique. boot-file$ isn't unique. kern? isn't unique. kern-file isn't unique. kern-file$ isn't unique. plat-name isn't unique. plat-name$ isn't unique. arch-name isn't unique. arch-name$ isn't unique. targ-file isn't unique. targ-file$ isn't unique. try-platname isn't unique. fj-check isn't unique. get-def-arch isn't unique. get-arch isn't unique. open-path isn't unique. lflag? isn't unique. zflag? isn't unique. fs-name isn't unique. fs-name$ isn't unique. open-zfs-fs isn't unique. next-str isn't unique. next-c isn't unique. halt? isn't unique. parse-bootargs isn't unique. rd-alloc-sz isn't unique. "ramdisk" isn't unique. setup-bootprops isn't unique. setup-ramdisk isn't unique. fix-elf-mem isn't unique. load-file isn't unique. setup-props isn't unique. exec-file isn't unique. do-boot isn't unique. byte-load: warning stack overflow, diff 1 byte-load: warning stack overflow, diff 1 Jumping to entry point 00000000010071d8 for type 0000000000000001... switching to new context: entry point 0x10071d8 stack 0x00000000ffe02b59 warning:interpret: exception -13 caught Unhandled Exception 0x0000000020016000 PC = 0x0000000001014710 NPC = 0x0000000001014714 Stopping execution Can this be debugged using the OpenBIOS/forth debugging, or do I need to whip out gdb, now? Looks like this error is after it actually switches over to the OpenSolaris kernel, so I'm guessing the OpenBIOS/fcode debugging is going to be of limited value. -Nick -------- This e-mail may contain confidential and privileged material for the sole use of the intended recipient. If this email is not intended for you, or you are not responsible for the delivery of this message to the intended recipient, please note that this message may contain SEAKR Engineering (SEAKR) Privileged/Proprietary Information. In such a case, you are strictly prohibited from downloading, photocopying, distributing or otherwise using this message, its contents or attachments in any way. If you have received this message in error, please notify us immediately by replying to this e-mail and delete the message from your mailbox. Information contained in this message that does not relate to the business of SEAKR is neither endorsed by nor attributable to SEAKR.

3 4

[commit] r847 - trunk/openbios-devel/libopenbios
by repository service 16 Aug '10

16 Aug '10

Author: blueswirl Date: Mon Aug 9 22:41:45 2010 New Revision: 847 URL: http://tracker.coreboot.org/trac/openbios/changeset/847 Log: Fix load breakage by r828 If a loader succeeds, don't try the others. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/load.c Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Mon Aug 9 21:21:22 2010 (r846) +++ trunk/openbios-devel/libopenbios/load.c Mon Aug 9 22:41:45 2010 (r847) @@ -44,6 +44,7 @@ { /* Invoke the loaders on the specified device */ char *param; + ucell valid; #ifdef CONFIG_LOADER_ELF @@ -57,18 +58,38 @@ param = pop_fstr_copy(); elf_load(&sys_info, dev, param, &elf_boot_notes); + feval("state-valid @"); + valid = POP(); + if (valid) { + return; + } #endif #ifdef CONFIG_LOADER_AOUT aout_load(&sys_info, dev); + feval("state-valid @"); + valid = POP(); + if (valid) { + return; + } #endif #ifdef CONFIG_LOADER_FCODE fcode_load(dev); + feval("state-valid @"); + valid = POP(); + if (valid) { + return; + } #endif #ifdef CONFIG_LOADER_FORTH forth_load(dev); + feval("state-valid @"); + valid = POP(); + if (valid) { + return; + } #endif }

5 13

[commit] r852 - trunk/openbios-devel/arch/sparc32
by repository service 11 Aug '10

11 Aug '10

Author: mcayland Date: Wed Aug 11 22:59:18 2010 New Revision: 852 URL: http://tracker.coreboot.org/trac/openbios/changeset/852 Log: Commit better SPARC32 fix for obp_devclose(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Wed Aug 11 22:57:53 2010 (r851) +++ trunk/openbios-devel/arch/sparc32/romvec.c Wed Aug 11 22:59:18 2010 (r852) @@ -279,11 +279,10 @@ static int obp_devclose(int dev_desc) { - int ret; + int ret = 1; PUSH(dev_desc); fword("close-dev"); - ret = POP(); DPRINTF("obp_devclose(0x%x) = %d\n", dev_desc, ret);

1 0

[commit] r851 - trunk/openbios-devel/arch/sparc32
by repository service 11 Aug '10

11 Aug '10

Author: mcayland Date: Wed Aug 11 22:57:53 2010 New Revision: 851 URL: http://tracker.coreboot.org/trac/openbios/changeset/851 Log: Revert commit r850 - on reflection, keeping a separate v2 function for obp_devclose() seems a little excessive. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Wed Aug 11 18:41:36 2010 (r850) +++ trunk/openbios-devel/arch/sparc32/romvec.c Wed Aug 11 22:57:53 2010 (r851) @@ -279,26 +279,17 @@ static int obp_devclose(int dev_desc) { - int ret = 1; + int ret; PUSH(dev_desc); fword("close-dev"); + ret = POP(); DPRINTF("obp_devclose(0x%x) = %d\n", dev_desc, ret); return ret; } -static void obp_devclose_v2(int dev_desc) -{ - PUSH(dev_desc); - fword("close-dev"); - - DPRINTF("obp_devclose_v2(0x%x)\n", dev_desc); - - return; -} - static int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf) { int ret, hi, lo, bs; @@ -468,7 +459,7 @@ romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap; romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap; romvec0.pv_v2devops.v2_dev_open = obp_devopen; - romvec0.pv_v2devops.v2_dev_close = obp_devclose_v2; + romvec0.pv_v2devops.v2_dev_close = (void (*)(int))obp_devclose; romvec0.pv_v2devops.v2_dev_read = obp_devread; romvec0.pv_v2devops.v2_dev_write = obp_devwrite; romvec0.pv_v2devops.v2_dev_seek = obp_devseek;

1 0

[commit] r850 - trunk/openbios-devel/arch/sparc32
by repository service 11 Aug '10

11 Aug '10

Author: mcayland Date: Wed Aug 11 18:41:36 2010 New Revision: 850 URL: http://tracker.coreboot.org/trac/openbios/changeset/850 Log: Fix up obp_devclose on SPARC32 - Forth's close-dev doesn't actually return a result code, so we fix it as 1 (to indicate success) for the v0 callback as suggested by Google, and simply return nothing for the v2 callback as indicated by the romvec structure. This allows us to remove the extra POP() which was causing a stack underflow error which was affecting Solaris 8 installation kernel boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/romvec.c Modified: trunk/openbios-devel/arch/sparc32/romvec.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/romvec.c Tue Aug 10 20:16:46 2010 (r849) +++ trunk/openbios-devel/arch/sparc32/romvec.c Wed Aug 11 18:41:36 2010 (r850) @@ -279,17 +279,26 @@ static int obp_devclose(int dev_desc) { - int ret; + int ret = 1; PUSH(dev_desc); fword("close-dev"); - ret = POP(); DPRINTF("obp_devclose(0x%x) = %d\n", dev_desc, ret); return ret; } +static void obp_devclose_v2(int dev_desc) +{ + PUSH(dev_desc); + fword("close-dev"); + + DPRINTF("obp_devclose_v2(0x%x)\n", dev_desc); + + return; +} + static int obp_rdblkdev(int dev_desc, int num_blks, int offset, char *buf) { int ret, hi, lo, bs; @@ -459,7 +468,7 @@ romvec0.pv_v2devops.v2_dumb_mmap = obp_dumb_mmap; romvec0.pv_v2devops.v2_dumb_munmap = obp_dumb_munmap; romvec0.pv_v2devops.v2_dev_open = obp_devopen; - romvec0.pv_v2devops.v2_dev_close = (void (*)(int))obp_devclose; + romvec0.pv_v2devops.v2_dev_close = obp_devclose_v2; romvec0.pv_v2devops.v2_dev_read = obp_devread; romvec0.pv_v2devops.v2_dev_write = obp_devwrite; romvec0.pv_v2devops.v2_dev_seek = obp_devseek;

1 0

[commit] r849 - in trunk/openbios-devel: arch/sparc32 drivers include/drivers
by repository service 10 Aug '10

10 Aug '10

Author: blueswirl Date: Tue Aug 10 20:16:46 2010 New Revision: 849 URL: http://tracker.coreboot.org/trac/openbios/changeset/849 Log: sparc32: move last fw_cfg user to openbios.c Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Tue Aug 10 19:51:53 2010 (r848) +++ trunk/openbios-devel/arch/sparc32/openbios.c Tue Aug 10 20:16:46 2010 (r849) @@ -828,6 +828,7 @@ uint32_t temp; uint16_t machine_id; char buf[256]; + unsigned long mem_size; fw_cfg_init(); @@ -853,9 +854,11 @@ ob_init_mmu(); ob_init_iommu(hwdef->iommu_base); #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->aux1_offset, hwdef->aux2_offset); + hwdef->aux1_offset, hwdef->aux2_offset, + mem_size); setup_machine(hwdef->slavio_base); Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Tue Aug 10 19:51:53 2010 (r848) +++ trunk/openbios-devel/drivers/obio.c Tue Aug 10 20:16:46 2010 (r849) @@ -20,8 +20,6 @@ #include "arch/common/nvram.h" #include "libopenbios/ofmem.h" #include "obio.h" -#define NO_QEMU_PROTOS -#include "arch/common/fw_cfg.h" #include "escc.h" #define PROMDEV_KBD 0 /* input from keyboard */ @@ -402,12 +400,9 @@ } static void -ob_smp_init(void) +ob_smp_init(unsigned long mem_size) { - unsigned long mem_size; - // See arch/sparc32/entry.S for memory layout - mem_size = fw_cfg_read_i32(FW_CFG_RAM_SIZE); smp_header = (struct smp_cfg *)map_io((uint64_t)(mem_size - 0x100), sizeof(struct smp_cfg)); } @@ -499,7 +494,8 @@ 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) + unsigned long aux1_offset, unsigned long aux2_offset, + unsigned long mem_size) { // All devices were integrated to NCR89C105, see @@ -534,7 +530,7 @@ ob_interrupt_init(slavio_base, intr_offset); - ob_smp_init(); + ob_smp_init(mem_size); return 0; } Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Tue Aug 10 19:51:53 2010 (r848) +++ trunk/openbios-devel/include/drivers/drivers.h Tue Aug 10 20:16:46 2010 (r849) @@ -64,7 +64,8 @@ /* 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); + 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); void ob_eccmemctl_init(uint64_t base);

1 0

[commit] r848 - in trunk/openbios-devel: arch/sparc32 drivers include/drivers
by repository service 10 Aug '10

10 Aug '10

Author: blueswirl Date: Tue Aug 10 19:51:53 2010 New Revision: 848 URL: http://tracker.coreboot.org/trac/openbios/changeset/848 Log: sparc32: move machine setup to openbios.c Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> 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 Mon Aug 9 22:41:45 2010 (r847) +++ trunk/openbios-devel/arch/sparc32/openbios.c Tue Aug 10 19:51:53 2010 (r848) @@ -602,6 +602,126 @@ } } +static void dummy_mach_init(uint64_t base) +{ +} + +struct machdef { + uint16_t machine_id; + const char *banner_name; + const char *model; + const char *name; + void (*initfn)(uint64_t base); +}; + +static const struct machdef sun4m_defs[] = { + { + .machine_id = 32, + .banner_name = "SPARCstation 5", + .model = "SUNW,501-3059", + .name = "SUNW,SPARCstation-5", + .initfn = ss5_init, + }, + { + .machine_id = 33, + .banner_name = "SPARCstation Voyager", + .model = "SUNW,501-2581", + .name = "SUNW,SPARCstation-Voyager", + .initfn = dummy_mach_init, + }, + { + .machine_id = 34, + .banner_name = "SPARCstation LX", + .model = "SUNW,501-2031", + .name = "SUNW,SPARCstation-LX", + .initfn = dummy_mach_init, + }, + { + .machine_id = 35, + .banner_name = "SPARCstation 4", + .model = "SUNW,501-2572", + .name = "SUNW,SPARCstation-4", + .initfn = ss5_init, + }, + { + .machine_id = 36, + .banner_name = "SPARCstation Classic", + .model = "SUNW,501-2326", + .name = "SUNW,SPARCstation-Classic", + .initfn = dummy_mach_init, + }, + { + .machine_id = 37, + .banner_name = "Tadpole S3 GX", + .model = "S3", + .name = "Tadpole_S3GX", + .initfn = ss5_init, + }, + { + .machine_id = 64, + .banner_name = "SPARCstation 10 (1 X 390Z55)", + .model = "SUNW,S10,501-2365", + .name = "SUNW,SPARCstation-10", + .initfn = ob_eccmemctl_init, + }, + { + .machine_id = 65, + .banner_name = "SPARCstation 20 (1 X 390Z55)", + .model = "SUNW,S20,501-2324", + .name = "SUNW,SPARCstation-20", + .initfn = ob_eccmemctl_init, + }, + { + .machine_id = 66, + .banner_name = "SPARCsystem 600(1 X 390Z55)", + .model = NULL, + .name = "SUNW,SPARCsystem-600", + .initfn = ob_eccmemctl_init, + }, +}; + +static const struct machdef * +id_machine(uint16_t machine_id) +{ + unsigned int i; + + for (i = 0; i < sizeof(sun4m_defs)/sizeof(struct machdef); i++) { + if (machine_id == sun4m_defs[i].machine_id) + return &sun4m_defs[i]; + } + printk("Unknown machine (ID %d), freezing!\n", machine_id); + for (;;); +} + +static void setup_machine(uint64_t base) +{ + uint16_t machine_id; + const struct machdef *mach; + + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + mach = id_machine(machine_id); + + push_str("/"); + fword("find-device"); + push_str(mach->banner_name); + fword("encode-string"); + push_str("banner-name"); + fword("property"); + + if (mach->model) { + push_str(mach->model); + fword("encode-string"); + push_str("model"); + fword("property"); + } + push_str(mach->name); + fword("encode-string"); + push_str("name"); + fword("property"); + + mach->initfn(base); +} + /* Add /uuid */ static void setup_uuid(void) { @@ -736,6 +856,9 @@ ob_obio_init(hwdef->slavio_base, hwdef->fd_offset, hwdef->counter_offset, hwdef->intr_offset, hwdef->aux1_offset, hwdef->aux2_offset); + + setup_machine(hwdef->slavio_base); + nvconf_init(); #endif #ifdef CONFIG_DRIVER_SBUS Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Mon Aug 9 22:41:45 2010 (r847) +++ trunk/openbios-devel/drivers/obio.c Tue Aug 10 19:51:53 2010 (r848) @@ -105,7 +105,7 @@ fword("property"); } -static void +void ob_eccmemctl_init(uint64_t base) { uint32_t version, *regs; @@ -169,11 +169,7 @@ return NVRAM_OB_SIZE; } -static void dummy_mach_init(uint64_t base) -{ -} - -static void +void ss5_init(uint64_t base) { ob_new_obio_device("slavioconfig", NULL); @@ -183,122 +179,6 @@ fword("finish-device"); } -struct machdef { - uint16_t machine_id; - const char *banner_name; - const char *model; - const char *name; - void (*initfn)(uint64_t base); -}; - -static const struct machdef sun4m_defs[] = { - { - .machine_id = 32, - .banner_name = "SPARCstation 5", - .model = "SUNW,501-3059", - .name = "SUNW,SPARCstation-5", - .initfn = ss5_init, - }, - { - .machine_id = 33, - .banner_name = "SPARCstation Voyager", - .model = "SUNW,501-2581", - .name = "SUNW,SPARCstation-Voyager", - .initfn = dummy_mach_init, - }, - { - .machine_id = 34, - .banner_name = "SPARCstation LX", - .model = "SUNW,501-2031", - .name = "SUNW,SPARCstation-LX", - .initfn = dummy_mach_init, - }, - { - .machine_id = 35, - .banner_name = "SPARCstation 4", - .model = "SUNW,501-2572", - .name = "SUNW,SPARCstation-4", - .initfn = ss5_init, - }, - { - .machine_id = 36, - .banner_name = "SPARCstation Classic", - .model = "SUNW,501-2326", - .name = "SUNW,SPARCstation-Classic", - .initfn = dummy_mach_init, - }, - { - .machine_id = 37, - .banner_name = "Tadpole S3 GX", - .model = "S3", - .name = "Tadpole_S3GX", - .initfn = ss5_init, - }, - { - .machine_id = 64, - .banner_name = "SPARCstation 10 (1 X 390Z55)", - .model = "SUNW,S10,501-2365", - .name = "SUNW,SPARCstation-10", - .initfn = ob_eccmemctl_init, - }, - { - .machine_id = 65, - .banner_name = "SPARCstation 20 (1 X 390Z55)", - .model = "SUNW,S20,501-2324", - .name = "SUNW,SPARCstation-20", - .initfn = ob_eccmemctl_init, - }, - { - .machine_id = 66, - .banner_name = "SPARCsystem 600(1 X 390Z55)", - .model = NULL, - .name = "SUNW,SPARCsystem-600", - .initfn = ob_eccmemctl_init, - }, -}; - -static const struct machdef * -id_machine(uint16_t machine_id) -{ - unsigned int i; - - for (i = 0; i < sizeof(sun4m_defs)/sizeof(struct machdef); i++) { - if (machine_id == sun4m_defs[i].machine_id) - return &sun4m_defs[i]; - } - printk("Unknown machine (ID %d), freezing!\n", machine_id); - for (;;); -} - -static void setup_machine(uint64_t base) -{ - uint16_t machine_id; - const struct machdef *mach; - - machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); - mach = id_machine(machine_id); - - push_str("/"); - fword("find-device"); - push_str(mach->banner_name); - fword("encode-string"); - push_str("banner-name"); - fword("property"); - - if (mach->model) { - push_str(mach->model); - fword("encode-string"); - push_str("model"); - fword("property"); - } - push_str(mach->name); - fword("encode-string"); - push_str("name"); - fword("property"); - - mach->initfn(base); -} - static void ob_nvram_init(uint64_t base, uint64_t offset) { @@ -632,8 +512,6 @@ #endif ob_set_obio_ranges(slavio_base); - setup_machine(slavio_base); - // Zilog Z8530 serial ports, see http://www.zilog.com // Must be before zs@0,0 or Linux won't boot ob_zs_init(slavio_base, SLAVIO_ZS1, ZS_INTR, 0, 0); Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Mon Aug 9 22:41:45 2010 (r847) +++ trunk/openbios-devel/include/drivers/drivers.h Tue Aug 10 19:51:53 2010 (r848) @@ -67,6 +67,8 @@ unsigned long aux1_offset, unsigned long aux2_offset); int start_cpu(unsigned int pc, unsigned int context_ptr, unsigned int context, int cpu); +void ob_eccmemctl_init(uint64_t base); +void ss5_init(uint64_t base); /* drivers/iommu.c */ void ob_init_iommu(uint64_t base);

1 0

[commit] r846 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 packages
by repository service 09 Aug '10

09 Aug '10

Author: blueswirl Date: Mon Aug 9 21:21:22 2010 New Revision: 846 URL: http://tracker.coreboot.org/trac/openbios/changeset/846 Log: sparc: fix partition probe, try two partitions If the size of the partition currently being probed is zero, fail the probe. This lets Forth code try the next candidate from boot-device list. Add explicit ':d' (Sparc32, 'f' for Sparc64) partition to CDROM probe list, so we can remove the ugly forced partition logic. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 8 23:20:15 2010 (r845) +++ trunk/openbios-devel/arch/sparc32/openbios.c Mon Aug 9 21:21:22 2010 (r846) @@ -784,7 +784,7 @@ break; default: case 'd': - push_str("cdrom"); + push_str("cdrom:d cdrom"); break; case 'n': push_str("net"); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Aug 8 23:20:15 2010 (r845) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon Aug 9 21:21:22 2010 (r846) @@ -480,7 +480,7 @@ break; default: case 'd': - push_str("cdrom"); + push_str("cdrom:f cdrom"); break; case 'n': push_str("net"); Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Aug 8 23:20:15 2010 (r845) +++ trunk/openbios-devel/packages/sun-parts.c Mon Aug 9 21:21:22 2010 (r846) @@ -175,10 +175,6 @@ __be32_to_cpu(p->partitions[i].num_sectors), __be16_to_cpu(p->infos[i].id), __be16_to_cpu(p->infos[i].flags)); - if (parnum < 0) { - if (p->partitions[i].num_sectors != 0 && p->infos[i].id != 0) - parnum = i; - } } if (parnum < 0) @@ -192,6 +188,10 @@ di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; size = (long long)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; + if (size == 0) { + DPRINTF("Partition size is 0, exiting\n"); + RET(0); + } di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; di->type = __be16_to_cpu(p->infos[parnum].id);

1 0

[commit] r832 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 09 Aug '10

09 Aug '10

Author: blueswirl Date: Tue Aug 3 22:48:23 2010 New Revision: 832 URL: http://tracker.coreboot.org/trac/openbios/changeset/832 Log: sparc32: fix pre-loaded kernel command line Fix more breakage from r828: For some reason, QEMU/Sparc32 does not set FW_CFG_CMDLINE_SIZE, so we have to use FW_CFG_KERNEL_CMDLINE instead. Setup romvec obp_arg.argv[1] and "boot-file" property. Remove obsolete command line setup code from obio.c. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/drivers/obio.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Tue Aug 3 20:39:27 2010 (r831) +++ trunk/openbios-devel/arch/sparc32/openbios.c Tue Aug 3 22:48:23 2010 (r832) @@ -20,6 +20,7 @@ #include "libopenbios/sys_info.h" #include "openbios.h" #include "boot.h" +#include "openprom.h" #include "packages/video.h" #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" @@ -134,7 +135,8 @@ arch_init( void ) { static char cmdline[128]; - int size; + int size = 0; + const char *kernel_cmdline; openbios_init(); modules_init(); @@ -154,25 +156,31 @@ #endif device_end(); + /* Initialiase openprom romvec */ + romvec = init_openprom(); + kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); if (kernel_size) kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR); - size = fw_cfg_read_i32(FW_CFG_CMDLINE_SIZE); - if (size) { - fw_cfg_read(FW_CFG_CMDLINE_DATA, cmdline, size); - } + kernel_cmdline = (const char *) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE); + if (kernel_cmdline) { + size = strlen(kernel_cmdline); + memcpy(cmdline, kernel_cmdline, size); + obp_arg.argv[1] = cmdline; + } cmdline[size] = '\0'; qemu_cmdline = (uint32_t)cmdline; - boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - - /* Initialiase openprom romvec */ - romvec = init_openprom(); + /* Setup nvram variables */ + push_str("/options"); + fword("find-device"); + push_str(cmdline); + fword("encode-string"); + push_str("boot-file"); + fword("property"); - /* Setup nvram variables */ - push_str("/options"); - fword("find-device"); + boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { case 'a': @@ -194,11 +202,6 @@ push_str("boot-device"); fword("property"); - push_str(""); - fword("encode-string"); - push_str("boot-file"); - fword("property"); - /* Set up other properties */ push_str("/chosen"); fword("find-device"); Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Tue Aug 3 20:39:27 2010 (r831) +++ trunk/openbios-devel/drivers/obio.c Tue Aug 3 22:48:23 2010 (r832) @@ -38,12 +38,6 @@ */ #define SUN4M_NCPU 4 -/* The kernel may want to examine the arguments, so hold a copy in OBP's - * mapped memory. - */ -#define OBIO_CMDLINE_MAX 256 -static char obio_cmdline[OBIO_CMDLINE_MAX]; - /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); @@ -651,14 +645,12 @@ const char *stdin, *stdout; unsigned int i; char nographic; - uint32_t size = 0; uint16_t machine_id; const struct cpudef *cpu; const struct machdef *mach; char buf[256]; uint32_t temp; phandle_t chosen; - const char *kernel_cmdline; ob_new_obio_device("eeprom", NULL); @@ -691,21 +683,6 @@ for(;;); } - kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); - if (kernel_size) - kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR); - kernel_cmdline = (const char *) fw_cfg_read_i32(FW_CFG_KERNEL_CMDLINE); - if (kernel_cmdline) { - size = strlen(kernel_cmdline); - if (size > OBIO_CMDLINE_MAX - 1) - size = OBIO_CMDLINE_MAX - 1; - memcpy(&obio_cmdline, kernel_cmdline, size); - } - obio_cmdline[size] = '\0'; - qemu_cmdline = (uint32_t) &obio_cmdline; - cmdline_size = size; - boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1); graphic_depth = fw_cfg_read_i16(FW_CFG_SUN4M_DEPTH);

5 17

[commit] r845 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 08 Aug '10

08 Aug '10

Author: blueswirl Date: Sun Aug 8 23:20:15 2010 New Revision: 845 URL: http://tracker.coreboot.org/trac/openbios/changeset/845 Log: sparc32: move CPU setup to openbios.c Move initial banner printing, CPU setup and graphic_depth setup to openbios.c. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/obio.h Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 8 22:03:38 2010 (r844) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 8 23:20:15 2010 (r845) @@ -28,6 +28,7 @@ #define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" +#define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) static ucell *memory; @@ -40,6 +41,7 @@ unsigned long aux1_offset, aux2_offset; uint64_t dma_base, esp_base, le_base; uint64_t tcx_base; + int mid_offset; int machine_id_low, machine_id_high; }; @@ -60,6 +62,7 @@ .dma_base = 0x78400000, .esp_base = 0x78800000, .le_base = 0x78c00000, + .mid_offset = 0, .machine_id_low = 32, .machine_id_high = 63, }, @@ -79,6 +82,7 @@ .dma_base = 0xef0400000ULL, .esp_base = 0xef0800000ULL, .le_base = 0xef0c00000ULL, + .mid_offset = 8, .machine_id_low = 64, .machine_id_high = 65, }, @@ -98,6 +102,7 @@ .dma_base = 0xef0081000ULL, .esp_base = 0xef0080000ULL, .le_base = 0xef0060000ULL, + .mid_offset = 8, .machine_id_low = 66, .machine_id_high = 66, }, @@ -117,6 +122,486 @@ { } +static void mb86904_init(void) +{ + PUSH(32); + fword("encode-int"); + push_str("cache-line-size"); + fword("property"); + + PUSH(512); + fword("encode-int"); + push_str("cache-nlines"); + fword("property"); + + PUSH(0x23); + fword("encode-int"); + push_str("mask_rev"); + fword("property"); +} + +static void tms390z55_init(void) +{ + push_str(""); + fword("encode-string"); + push_str("ecache-parity?"); + fword("property"); + + push_str(""); + fword("encode-string"); + push_str("bfill?"); + fword("property"); + + push_str(""); + fword("encode-string"); + push_str("bcopy?"); + fword("property"); + + push_str(""); + fword("encode-string"); + push_str("cache-physical?"); + fword("property"); + + PUSH(0xf); + fword("encode-int"); + PUSH(0xf8fffffc); + fword("encode-int"); + fword("encode+"); + PUSH(4); + fword("encode-int"); + fword("encode+"); + + PUSH(0xf); + fword("encode-int"); + fword("encode+"); + PUSH(0xf8c00000); + fword("encode-int"); + fword("encode+"); + PUSH(0x1000); + fword("encode-int"); + fword("encode+"); + + PUSH(0xf); + fword("encode-int"); + fword("encode+"); + PUSH(0xf8000000); + fword("encode-int"); + fword("encode+"); + PUSH(0x1000); + fword("encode-int"); + fword("encode+"); + + PUSH(0xf); + fword("encode-int"); + fword("encode+"); + PUSH(0xf8800000); + fword("encode-int"); + fword("encode+"); + PUSH(0x1000); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); +} + +static void rt625_init(void) +{ + PUSH(32); + fword("encode-int"); + push_str("cache-line-size"); + fword("property"); + + PUSH(512); + fword("encode-int"); + push_str("cache-nlines"); + fword("property"); + +} + +static void bad_cpu_init(void) +{ + printk("This CPU is not supported yet, freezing.\n"); + for(;;); +} + +struct cpudef { + unsigned long iu_version; + const char *name; + int psr_impl, psr_vers, impl, vers; + int dcache_line_size, dcache_lines, dcache_assoc; + int icache_line_size, icache_lines, icache_assoc; + int ecache_line_size, ecache_lines, ecache_assoc; + int mmu_nctx; + void (*initfn)(void); +}; + +static const struct cpudef sparc_defs[] = { + { + .iu_version = 0x00 << 24, /* Impl 0, ver 0 */ + .name = "FMI,MB86900", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x04 << 24, /* Impl 0, ver 4 */ + .name = "FMI,MB86904", + .psr_impl = 0, + .psr_vers = 5, + .impl = 0, + .vers = 5, + .dcache_line_size = 0x10, + .dcache_lines = 0x200, + .dcache_assoc = 1, + .icache_line_size = 0x20, + .icache_lines = 0x200, + .icache_assoc = 1, + .ecache_line_size = 0x20, + .ecache_lines = 0x4000, + .ecache_assoc = 1, + .mmu_nctx = 0x100, + .initfn = mb86904_init, + }, + { + .iu_version = 0x05 << 24, /* Impl 0, ver 5 */ + .name = "FMI,MB86907", + .psr_impl = 0, + .psr_vers = 5, + .impl = 0, + .vers = 5, + .dcache_line_size = 0x20, + .dcache_lines = 0x200, + .dcache_assoc = 1, + .icache_line_size = 0x20, + .icache_lines = 0x200, + .icache_assoc = 1, + .ecache_line_size = 0x20, + .ecache_lines = 0x4000, + .ecache_assoc = 1, + .mmu_nctx = 0x100, + .initfn = mb86904_init, + }, + { + .iu_version = 0x10 << 24, /* Impl 1, ver 0 */ + .name = "LSI,L64811", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x11 << 24, /* Impl 1, ver 1 */ + .name = "CY,CY7C601", + .psr_impl = 1, + .psr_vers = 1, + .impl = 1, + .vers = 1, + .mmu_nctx = 0x10, + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x13 << 24, /* Impl 1, ver 3 */ + .name = "CY,CY7C611", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x40000000, + .name = "TI,TMS390Z55", + .psr_impl = 4, + .psr_vers = 0, + .impl = 0, + .vers = 4, + .dcache_line_size = 0x20, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x40, + .icache_lines = 0x40, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { + .iu_version = 0x41000000, + .name = "TI,TMS390S10", + .psr_impl = 4, + .psr_vers = 1, + .impl = 4, + .vers = 1, + .dcache_line_size = 0x10, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x20, + .icache_lines = 0x80, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { + .iu_version = 0x42000000, + .name = "TI,TMS390S10", + .psr_impl = 4, + .psr_vers = 2, + .impl = 4, + .vers = 2, + .dcache_line_size = 0x10, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x20, + .icache_lines = 0x80, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { + .iu_version = 0x43000000, + .name = "TI,TMS390S10", + .psr_impl = 4, + .psr_vers = 3, + .impl = 4, + .vers = 3, + .dcache_line_size = 0x10, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x20, + .icache_lines = 0x80, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { + .iu_version = 0x44000000, + .name = "TI,TMS390S10", + .psr_impl = 4, + .psr_vers = 4, + .impl = 4, + .vers = 4, + .dcache_line_size = 0x10, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x20, + .icache_lines = 0x80, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = tms390z55_init, + }, + { + .iu_version = 0x1e000000, + .name = "Ross,RT625", + .psr_impl = 1, + .psr_vers = 14, + .impl = 1, + .vers = 7, + .dcache_line_size = 0x20, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x40, + .icache_lines = 0x40, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = rt625_init, + }, + { + .iu_version = 0x1f000000, + .name = "Ross,RT620", + .psr_impl = 1, + .psr_vers = 15, + .impl = 1, + .vers = 7, + .dcache_line_size = 0x20, + .dcache_lines = 0x80, + .dcache_assoc = 4, + .icache_line_size = 0x40, + .icache_lines = 0x40, + .icache_assoc = 5, + .ecache_line_size = 0x20, + .ecache_lines = 0x8000, + .ecache_assoc = 1, + .mmu_nctx = 0x10000, + .initfn = rt625_init, + }, + { + .iu_version = 0x20000000, + .name = "BIT,B5010", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x50000000, + .name = "MC,MN10501", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0x90 << 24, /* Impl 9, ver 0 */ + .name = "Weitek,W8601", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0xf2000000, + .name = "GR,LEON2", + .initfn = bad_cpu_init, + }, + { + .iu_version = 0xf3000000, + .name = "GR,LEON3", + .initfn = bad_cpu_init, + }, +}; + +static const struct cpudef * +id_cpu(void) +{ + unsigned long iu_version; + unsigned int i; + + asm("rd %%psr, %0\n" + : "=r"(iu_version) :); + iu_version &= 0xff000000; + + for (i = 0; i < sizeof(sparc_defs)/sizeof(struct cpudef); i++) { + if (iu_version == sparc_defs[i].iu_version) + return &sparc_defs[i]; + } + printk("Unknown cpu (psr %lx), freezing!\n", iu_version); + for (;;); +} + +static void setup_cpu(int mid_offset) +{ + uint32_t temp; + unsigned int i; + const struct cpudef *cpu; + + // Add cpus + temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); + + printk("CPUs: %x", temp); + cpu = id_cpu(); + printk(" x %s\n", cpu->name); + for (i = 0; i < temp; i++) { + push_str("/"); + fword("find-device"); + + fword("new-device"); + + push_str(cpu->name); + fword("device-name"); + + push_str("cpu"); + fword("device-type"); + + PUSH(cpu->psr_impl); + fword("encode-int"); + push_str("psr-implementation"); + fword("property"); + + PUSH(cpu->psr_vers); + fword("encode-int"); + push_str("psr-version"); + fword("property"); + + PUSH(cpu->impl); + fword("encode-int"); + push_str("implementation"); + fword("property"); + + PUSH(cpu->vers); + fword("encode-int"); + push_str("version"); + fword("property"); + + PUSH(4096); + fword("encode-int"); + push_str("page-size"); + fword("property"); + + PUSH(cpu->dcache_line_size); + fword("encode-int"); + push_str("dcache-line-size"); + fword("property"); + + PUSH(cpu->dcache_lines); + fword("encode-int"); + push_str("dcache-nlines"); + fword("property"); + + PUSH(cpu->dcache_assoc); + fword("encode-int"); + push_str("dcache-associativity"); + fword("property"); + + PUSH(cpu->icache_line_size); + fword("encode-int"); + push_str("icache-line-size"); + fword("property"); + + PUSH(cpu->icache_lines); + fword("encode-int"); + push_str("icache-nlines"); + fword("property"); + + PUSH(cpu->icache_assoc); + fword("encode-int"); + push_str("icache-associativity"); + fword("property"); + + PUSH(cpu->ecache_line_size); + fword("encode-int"); + push_str("ecache-line-size"); + fword("property"); + + PUSH(cpu->ecache_lines); + fword("encode-int"); + push_str("ecache-nlines"); + fword("property"); + + PUSH(cpu->ecache_assoc); + fword("encode-int"); + push_str("ecache-associativity"); + fword("property"); + + PUSH(2); + fword("encode-int"); + push_str("ncaches"); + fword("property"); + + PUSH(cpu->mmu_nctx); + fword("encode-int"); + push_str("mmu-nctx"); + fword("property"); + + PUSH(8); + fword("encode-int"); + push_str("sparc-version"); + fword("property"); + + push_str(""); + fword("encode-string"); + push_str("cache-coherence?"); + fword("property"); + + PUSH(i + mid_offset); + fword("encode-int"); + push_str("mid"); + fword("property"); + + cpu->initfn(); + + fword("finish-device"); + } +} + /* Add /uuid */ static void setup_uuid(void) { @@ -220,6 +705,28 @@ static char cmdline[128]; int size = 0; const char *kernel_cmdline; + uint32_t temp; + uint16_t machine_id; + char buf[256]; + + fw_cfg_init(); + + fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); + buf[4] = '\0'; + + printk("Configuration device id %s", buf); + + temp = fw_cfg_read_i32(FW_CFG_ID); + machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + + printk(" version %d machine id %d\n", temp, machine_id); + + if (temp != 1) { + printk("Incompatible configuration device version, freezing\n"); + for(;;); + } + + graphic_depth = fw_cfg_read_i16(FW_CFG_SUN4M_DEPTH); openbios_init(); modules_init(); @@ -239,6 +746,8 @@ #endif device_end(); + setup_cpu(hwdef->mid_offset); + setup_stdio(); /* Initialiase openprom romvec */ romvec = init_openprom(); Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Aug 8 22:03:38 2010 (r844) +++ trunk/openbios-devel/drivers/obio.c Sun Aug 8 23:20:15 2010 (r845) @@ -169,361 +169,6 @@ return NVRAM_OB_SIZE; } -static void mb86904_init(void) -{ - PUSH(32); - fword("encode-int"); - push_str("cache-line-size"); - fword("property"); - - PUSH(512); - fword("encode-int"); - push_str("cache-nlines"); - fword("property"); - - PUSH(0x23); - fword("encode-int"); - push_str("mask_rev"); - fword("property"); -} - -static void tms390z55_init(void) -{ - push_str(""); - fword("encode-string"); - push_str("ecache-parity?"); - fword("property"); - - push_str(""); - fword("encode-string"); - push_str("bfill?"); - fword("property"); - - push_str(""); - fword("encode-string"); - push_str("bcopy?"); - fword("property"); - - push_str(""); - fword("encode-string"); - push_str("cache-physical?"); - fword("property"); - - PUSH(0xf); - fword("encode-int"); - PUSH(0xf8fffffc); - fword("encode-int"); - fword("encode+"); - PUSH(4); - fword("encode-int"); - fword("encode+"); - - PUSH(0xf); - fword("encode-int"); - fword("encode+"); - PUSH(0xf8c00000); - fword("encode-int"); - fword("encode+"); - PUSH(0x1000); - fword("encode-int"); - fword("encode+"); - - PUSH(0xf); - fword("encode-int"); - fword("encode+"); - PUSH(0xf8000000); - fword("encode-int"); - fword("encode+"); - PUSH(0x1000); - fword("encode-int"); - fword("encode+"); - - PUSH(0xf); - fword("encode-int"); - fword("encode+"); - PUSH(0xf8800000); - fword("encode-int"); - fword("encode+"); - PUSH(0x1000); - fword("encode-int"); - fword("encode+"); - push_str("reg"); - fword("property"); -} - -static void rt625_init(void) -{ - PUSH(32); - fword("encode-int"); - push_str("cache-line-size"); - fword("property"); - - PUSH(512); - fword("encode-int"); - push_str("cache-nlines"); - fword("property"); - -} - -static void bad_cpu_init(void) -{ - printk("This CPU is not supported yet, freezing.\n"); - for(;;); -} - -struct cpudef { - unsigned long iu_version; - const char *name; - int psr_impl, psr_vers, impl, vers; - int dcache_line_size, dcache_lines, dcache_assoc; - int icache_line_size, icache_lines, icache_assoc; - int ecache_line_size, ecache_lines, ecache_assoc; - int mmu_nctx; - void (*initfn)(void); -}; - -static const struct cpudef sparc_defs[] = { - { - .iu_version = 0x00 << 24, /* Impl 0, ver 0 */ - .name = "FMI,MB86900", - .initfn = bad_cpu_init, - }, - { - .iu_version = 0x04 << 24, /* Impl 0, ver 4 */ - .name = "FMI,MB86904", - .psr_impl = 0, - .psr_vers = 5, - .impl = 0, - .vers = 5, - .dcache_line_size = 0x10, - .dcache_lines = 0x200, - .dcache_assoc = 1, - .icache_line_size = 0x20, - .icache_lines = 0x200, - .icache_assoc = 1, - .ecache_line_size = 0x20, - .ecache_lines = 0x4000, - .ecache_assoc = 1, - .mmu_nctx = 0x100, - .initfn = mb86904_init, - }, - { - .iu_version = 0x05 << 24, /* Impl 0, ver 5 */ - .name = "FMI,MB86907", - .psr_impl = 0, - .psr_vers = 5, - .impl = 0, - .vers = 5, - .dcache_line_size = 0x20, - .dcache_lines = 0x200, - .dcache_assoc = 1, - .icache_line_size = 0x20, - .icache_lines = 0x200, - .icache_assoc = 1, - .ecache_line_size = 0x20, - .ecache_lines = 0x4000, - .ecache_assoc = 1, - .mmu_nctx = 0x100, - .initfn = mb86904_init, - }, - { - .iu_version = 0x10 << 24, /* Impl 1, ver 0 */ - .name = "LSI,L64811", - .initfn = bad_cpu_init, - }, - { - .iu_version = 0x11 << 24, /* Impl 1, ver 1 */ - .name = "CY,CY7C601", - .psr_impl = 1, - .psr_vers = 1, - .impl = 1, - .vers = 1, - .mmu_nctx = 0x10, - .initfn = bad_cpu_init, - }, - { - .iu_version = 0x13 << 24, /* Impl 1, ver 3 */ - .name = "CY,CY7C611", - .initfn = bad_cpu_init, - }, - { - .iu_version = 0x40000000, - .name = "TI,TMS390Z55", - .psr_impl = 4, - .psr_vers = 0, - .impl = 0, - .vers = 4, - .dcache_line_size = 0x20, - .dcache_lines = 0x80, - .dcache_assoc = 4, - .icache_line_size = 0x40, - .icache_lines = 0x40, - .icache_assoc = 5, - .ecache_line_size = 0x20, - .ecache_lines = 0x8000, - .ecache_assoc = 1, - .mmu_nctx = 0x10000, - .initfn = tms390z55_init, - }, - { - .iu_version = 0x41000000, - .name = "TI,TMS390S10", - .psr_impl = 4, - .psr_vers = 1, - .impl = 4, - .vers = 1, - .dcache_line_size = 0x10, - .dcache_lines = 0x80, - .dcache_assoc = 4, - .icache_line_size = 0x20, - .icache_lines = 0x80, - .icache_assoc = 5, - .ecache_line_size = 0x20, - .ecache_lines = 0x8000, - .ecache_assoc = 1, - .mmu_nctx = 0x10000, - .initfn = tms390z55_init, - }, - { - .iu_version = 0x42000000, - .name = "TI,TMS390S10", - .psr_impl = 4, - .psr_vers = 2, - .impl = 4, - .vers = 2, - .dcache_line_size = 0x10, - .dcache_lines = 0x80, - .dcache_assoc = 4, - .icache_line_size = 0x20, - .icache_lines = 0x80, - .icache_assoc = 5, - .ecache_line_size = 0x20, - .ecache_lines = 0x8000, - .ecache_assoc = 1, - .mmu_nctx = 0x10000, - .initfn = tms390z55_init, - }, - { - .iu_version = 0x43000000, - .name = "TI,TMS390S10", - .psr_impl = 4, - .psr_vers = 3, - .impl = 4, - .vers = 3, - .dcache_line_size = 0x10, - .dcache_lines = 0x80, - .dcache_assoc = 4, - .icache_line_size = 0x20, - .icache_lines = 0x80, - .icache_assoc = 5, - .ecache_line_size = 0x20, - .ecache_lines = 0x8000, - .ecache_assoc = 1, - .mmu_nctx = 0x10000, - .initfn = tms390z55_init, - }, - { - .iu_version = 0x44000000, - .name = "TI,TMS390S10", - .psr_impl = 4, - .psr_vers = 4, - .impl = 4, - .vers = 4, - .dcache_line_size = 0x10, - .dcache_lines = 0x80, - .dcache_assoc = 4, - .icache_line_size = 0x20, - .icache_lines = 0x80, - .icache_assoc = 5, - .ecache_line_size = 0x20, - .ecache_lines = 0x8000, - .ecache_assoc = 1, - .mmu_nctx = 0x10000, - .initfn = tms390z55_init, - }, - { - .iu_version = 0x1e000000, - .name = "Ross,RT625", - .psr_impl = 1, - .psr_vers = 14, - .impl = 1, - .vers = 7, - .dcache_line_size = 0x20, - .dcache_lines = 0x80, - .dcache_assoc = 4, - .icache_line_size = 0x40, - .icache_lines = 0x40, - .icache_assoc = 5, - .ecache_line_size = 0x20, - .ecache_lines = 0x8000, - .ecache_assoc = 1, - .mmu_nctx = 0x10000, - .initfn = rt625_init, - }, - { - .iu_version = 0x1f000000, - .name = "Ross,RT620", - .psr_impl = 1, - .psr_vers = 15, - .impl = 1, - .vers = 7, - .dcache_line_size = 0x20, - .dcache_lines = 0x80, - .dcache_assoc = 4, - .icache_line_size = 0x40, - .icache_lines = 0x40, - .icache_assoc = 5, - .ecache_line_size = 0x20, - .ecache_lines = 0x8000, - .ecache_assoc = 1, - .mmu_nctx = 0x10000, - .initfn = rt625_init, - }, - { - .iu_version = 0x20000000, - .name = "BIT,B5010", - .initfn = bad_cpu_init, - }, - { - .iu_version = 0x50000000, - .name = "MC,MN10501", - .initfn = bad_cpu_init, - }, - { - .iu_version = 0x90 << 24, /* Impl 9, ver 0 */ - .name = "Weitek,W8601", - .initfn = bad_cpu_init, - }, - { - .iu_version = 0xf2000000, - .name = "GR,LEON2", - .initfn = bad_cpu_init, - }, - { - .iu_version = 0xf3000000, - .name = "GR,LEON3", - .initfn = bad_cpu_init, - }, -}; - -static const struct cpudef * -id_cpu(void) -{ - unsigned long iu_version; - unsigned int i; - - asm("rd %%psr, %0\n" - : "=r"(iu_version) :); - iu_version &= 0xff000000; - - for (i = 0; i < sizeof(sparc_defs)/sizeof(struct cpudef); i++) { - if (iu_version == sparc_defs[i].iu_version) - return &sparc_defs[i]; - } - printk("Unknown cpu (psr %lx), freezing!\n", iu_version); - for (;;); -} - static void dummy_mach_init(uint64_t base) { } @@ -543,7 +188,6 @@ const char *banner_name; const char *model; const char *name; - int mid_offset; void (*initfn)(uint64_t base); }; @@ -553,7 +197,6 @@ .banner_name = "SPARCstation 5", .model = "SUNW,501-3059", .name = "SUNW,SPARCstation-5", - .mid_offset = 0, .initfn = ss5_init, }, { @@ -561,7 +204,6 @@ .banner_name = "SPARCstation Voyager", .model = "SUNW,501-2581", .name = "SUNW,SPARCstation-Voyager", - .mid_offset = 0, .initfn = dummy_mach_init, }, { @@ -569,7 +211,6 @@ .banner_name = "SPARCstation LX", .model = "SUNW,501-2031", .name = "SUNW,SPARCstation-LX", - .mid_offset = 0, .initfn = dummy_mach_init, }, { @@ -577,7 +218,6 @@ .banner_name = "SPARCstation 4", .model = "SUNW,501-2572", .name = "SUNW,SPARCstation-4", - .mid_offset = 0, .initfn = ss5_init, }, { @@ -585,7 +225,6 @@ .banner_name = "SPARCstation Classic", .model = "SUNW,501-2326", .name = "SUNW,SPARCstation-Classic", - .mid_offset = 0, .initfn = dummy_mach_init, }, { @@ -593,7 +232,6 @@ .banner_name = "Tadpole S3 GX", .model = "S3", .name = "Tadpole_S3GX", - .mid_offset = 0, .initfn = ss5_init, }, { @@ -601,7 +239,6 @@ .banner_name = "SPARCstation 10 (1 X 390Z55)", .model = "SUNW,S10,501-2365", .name = "SUNW,SPARCstation-10", - .mid_offset = 8, .initfn = ob_eccmemctl_init, }, { @@ -609,7 +246,6 @@ .banner_name = "SPARCstation 20 (1 X 390Z55)", .model = "SUNW,S20,501-2324", .name = "SUNW,SPARCstation-20", - .mid_offset = 8, .initfn = ob_eccmemctl_init, }, { @@ -617,7 +253,6 @@ .banner_name = "SPARCsystem 600(1 X 390Z55)", .model = NULL, .name = "SUNW,SPARCsystem-600", - .mid_offset = 8, .initfn = ob_eccmemctl_init, }, }; @@ -635,61 +270,16 @@ for (;;); } -static void -ob_nvram_init(uint64_t base, uint64_t offset) +static void setup_machine(uint64_t base) { - unsigned int i; uint16_t machine_id; - const struct cpudef *cpu; const struct machdef *mach; - char buf[256]; - uint32_t temp; - - ob_new_obio_device("eeprom", NULL); - - nvram = (unsigned char *)ob_reg(base, offset, NVRAM_SIZE, 1); - - PUSH((unsigned long)nvram); - fword("encode-int"); - push_str("address"); - fword("property"); - - push_str("mk48t08"); - fword("model"); - fword("finish-device"); - - fw_cfg_init(); - - fw_cfg_read(FW_CFG_SIGNATURE, buf, 4); - buf[4] = '\0'; - - printk("Configuration device id %s", buf); - - temp = fw_cfg_read_i32(FW_CFG_ID); machine_id = fw_cfg_read_i16(FW_CFG_MACHINE_ID); + mach = id_machine(machine_id); - printk(" version %d machine id %d\n", temp, machine_id); - - if (temp != 1) { - printk("Incompatible configuration device version, freezing\n"); - for(;;); - } - - graphic_depth = fw_cfg_read_i16(FW_CFG_SUN4M_DEPTH); - - // Add /idprom push_str("/"); fword("find-device"); - - PUSH((long)&nvram[NVRAM_IDPROM]); - PUSH(32); - fword("encode-bytes"); - push_str("idprom"); - fword("property"); - - mach = id_machine(machine_id); - push_str(mach->banner_name); fword("encode-string"); push_str("banner-name"); @@ -707,124 +297,34 @@ fword("property"); mach->initfn(base); +} - // Add cpus - temp = fw_cfg_read_i32(FW_CFG_NB_CPUS); - - printk("CPUs: %x", temp); - cpu = id_cpu(); - printk(" x %s\n", cpu->name); - for (i = 0; i < temp; i++) { - push_str("/"); - fword("find-device"); - - fword("new-device"); - - push_str(cpu->name); - fword("device-name"); - - push_str("cpu"); - fword("device-type"); - - PUSH(cpu->psr_impl); - fword("encode-int"); - push_str("psr-implementation"); - fword("property"); - - PUSH(cpu->psr_vers); - fword("encode-int"); - push_str("psr-version"); - fword("property"); - - PUSH(cpu->impl); - fword("encode-int"); - push_str("implementation"); - fword("property"); - - PUSH(cpu->vers); - fword("encode-int"); - push_str("version"); - fword("property"); - - PUSH(4096); - fword("encode-int"); - push_str("page-size"); - fword("property"); - - PUSH(cpu->dcache_line_size); - fword("encode-int"); - push_str("dcache-line-size"); - fword("property"); - - PUSH(cpu->dcache_lines); - fword("encode-int"); - push_str("dcache-nlines"); - fword("property"); - - PUSH(cpu->dcache_assoc); - fword("encode-int"); - push_str("dcache-associativity"); - fword("property"); - - PUSH(cpu->icache_line_size); - fword("encode-int"); - push_str("icache-line-size"); - fword("property"); - - PUSH(cpu->icache_lines); - fword("encode-int"); - push_str("icache-nlines"); - fword("property"); - - PUSH(cpu->icache_assoc); - fword("encode-int"); - push_str("icache-associativity"); - fword("property"); - - PUSH(cpu->ecache_line_size); - fword("encode-int"); - push_str("ecache-line-size"); - fword("property"); - - PUSH(cpu->ecache_lines); - fword("encode-int"); - push_str("ecache-nlines"); - fword("property"); - - PUSH(cpu->ecache_assoc); - fword("encode-int"); - push_str("ecache-associativity"); - fword("property"); - - PUSH(2); - fword("encode-int"); - push_str("ncaches"); - fword("property"); +static void +ob_nvram_init(uint64_t base, uint64_t offset) +{ + ob_new_obio_device("eeprom", NULL); - PUSH(cpu->mmu_nctx); - fword("encode-int"); - push_str("mmu-nctx"); - fword("property"); + nvram = (unsigned char *)ob_reg(base, offset, NVRAM_SIZE, 1); - PUSH(8); - fword("encode-int"); - push_str("sparc-version"); - fword("property"); + PUSH((unsigned long)nvram); + fword("encode-int"); + push_str("address"); + fword("property"); - push_str(""); - fword("encode-string"); - push_str("cache-coherence?"); - fword("property"); + push_str("mk48t08"); + fword("model"); - PUSH(i + mach->mid_offset); - fword("encode-int"); - push_str("mid"); - fword("property"); + fword("finish-device"); - cpu->initfn(); + // Add /idprom + push_str("/"); + fword("find-device"); - fword("finish-device"); - } + PUSH((long)&nvram[NVRAM_IDPROM]); + PUSH(32); + fword("encode-bytes"); + push_str("idprom"); + fword("property"); } static void @@ -1132,6 +632,8 @@ #endif ob_set_obio_ranges(slavio_base); + setup_machine(slavio_base); + // Zilog Z8530 serial ports, see http://www.zilog.com // Must be before zs@0,0 or Linux won't boot ob_zs_init(slavio_base, SLAVIO_ZS1, ZS_INTR, 0, 0); Modified: trunk/openbios-devel/drivers/obio.h ============================================================================== --- trunk/openbios-devel/drivers/obio.h Sun Aug 8 22:03:38 2010 (r844) +++ trunk/openbios-devel/drivers/obio.h Sun Aug 8 23:20:15 2010 (r845) @@ -38,7 +38,6 @@ #define CFG_ADDR 0xd00000510ULL #define CFG_SIZE 3 -#define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00) /* linux/include/asm-sparc/timer.h */

1 0

[commit] r844 - in trunk/openbios-devel: arch/sparc32 drivers include/drivers
by repository service 08 Aug '10

08 Aug '10

Author: blueswirl Date: Sun Aug 8 22:03:38 2010 New Revision: 844 URL: http://tracker.coreboot.org/trac/openbios/changeset/844 Log: sparc32: move stdio setup to openbios.c Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/boot.h 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/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Aug 8 21:54:06 2010 (r843) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Aug 8 22:03:38 2010 (r844) @@ -31,6 +31,8 @@ // romvec.c extern struct linux_arguments_v0 obp_arg; extern const void *romvec; +extern const char *obp_stdin_path, *obp_stdout_path; +extern char obp_stdin, obp_stdout; // openbios.c extern int qemu_machine_type; Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 8 21:54:06 2010 (r843) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 8 22:03:38 2010 (r844) @@ -140,6 +140,65 @@ fword("property"); } +static void setup_stdio(void) +{ + char nographic; + const char *stdin, *stdout; + phandle_t chosen; + + fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1); + if (nographic) { + obp_stdin = PROMDEV_TTYA; + obp_stdout = PROMDEV_TTYA; + stdin = "ttya"; + stdout = "ttya"; + } else { + obp_stdin = PROMDEV_KBD; + obp_stdout = PROMDEV_SCREEN; + stdin = "keyboard"; + stdout = "screen"; + } + + push_str("/"); + fword("find-device"); + + push_str(stdin); + fword("pathres-resolve-aliases"); + fword("encode-string"); + push_str("stdin-path"); + fword("property"); + + push_str(stdout); + fword("pathres-resolve-aliases"); + fword("encode-string"); + push_str("stdout-path"); + fword("property"); + + chosen = find_dev("/chosen"); + push_str(stdin); + fword("open-dev"); + set_int_property(chosen, "stdin", POP()); + + chosen = find_dev("/chosen"); + push_str(stdout); + fword("open-dev"); + set_int_property(chosen, "stdout", POP()); + + push_str(stdin); + push_str("input-device"); + fword("$setenv"); + + push_str(stdout); + push_str("output-device"); + fword("$setenv"); + + push_str(stdin); + fword("input"); + + obp_stdin_path = stdin; + obp_stdout_path = stdout; +} + static void init_memory(void) { memory = malloc(MEMORY_SIZE); @@ -180,6 +239,7 @@ #endif device_end(); + setup_stdio(); /* Initialiase openprom romvec */ romvec = init_openprom(); Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Aug 8 21:54:06 2010 (r843) +++ trunk/openbios-devel/drivers/obio.c Sun Aug 8 22:03:38 2010 (r844) @@ -638,15 +638,12 @@ static void ob_nvram_init(uint64_t base, uint64_t offset) { - const char *stdin, *stdout; unsigned int i; - char nographic; uint16_t machine_id; const struct cpudef *cpu; const struct machdef *mach; char buf[256]; uint32_t temp; - phandle_t chosen; ob_new_obio_device("eeprom", NULL); @@ -679,7 +676,6 @@ for(;;); } - fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1); graphic_depth = fw_cfg_read_i16(FW_CFG_SUN4M_DEPTH); // Add /idprom @@ -829,57 +825,6 @@ fword("finish-device"); } - - if (nographic) { - obp_stdin = PROMDEV_TTYA; - obp_stdout = PROMDEV_TTYA; - stdin = "ttya"; - stdout = "ttya"; - } else { - obp_stdin = PROMDEV_KBD; - obp_stdout = PROMDEV_SCREEN; - stdin = "keyboard"; - stdout = "screen"; - } - - push_str("/"); - fword("find-device"); - - push_str(stdin); - fword("pathres-resolve-aliases"); - fword("encode-string"); - push_str("stdin-path"); - fword("property"); - - push_str(stdout); - fword("pathres-resolve-aliases"); - fword("encode-string"); - push_str("stdout-path"); - fword("property"); - - chosen = find_dev("/chosen"); - push_str(stdin); - fword("open-dev"); - set_int_property(chosen, "stdin", POP()); - - chosen = find_dev("/chosen"); - push_str(stdout); - fword("open-dev"); - set_int_property(chosen, "stdout", POP()); - - push_str(stdin); - push_str("input-device"); - fword("$setenv"); - - push_str(stdout); - push_str("output-device"); - fword("$setenv"); - - push_str(stdin); - fword("input"); - - obp_stdin_path = stdin; - obp_stdout_path = stdout; } static void Modified: trunk/openbios-devel/include/drivers/drivers.h ============================================================================== --- trunk/openbios-devel/include/drivers/drivers.h Sun Aug 8 21:54:06 2010 (r843) +++ trunk/openbios-devel/include/drivers/drivers.h Sun Aug 8 22:03:38 2010 (r844) @@ -84,10 +84,6 @@ unsigned long ob_reg(uint64_t base, uint64_t offset, unsigned long size, int map); void ob_intr(int intr); -/* arch/sparc32/romvec.c */ -extern const char *obp_stdin_path, *obp_stdout_path; -extern char obp_stdin, obp_stdout; - /* arch/sparc32/boot.c */ extern uint32_t kernel_image; extern uint32_t kernel_size;

1 0

[commit] r843 - in trunk/openbios-devel: arch/sparc32 drivers
by repository service 08 Aug '10

08 Aug '10

Author: blueswirl Date: Sun Aug 8 21:54:06 2010 New Revision: 843 URL: http://tracker.coreboot.org/trac/openbios/changeset/843 Log: sparc32: move /uuid property setup to openbios.c Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/drivers/obio.c Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 8 20:50:22 2010 (r842) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 8 21:54:06 2010 (r843) @@ -27,6 +27,7 @@ #define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ +#define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" static ucell *memory; @@ -116,6 +117,29 @@ { } +/* Add /uuid */ +static void setup_uuid(void) +{ + static uint8_t qemu_uuid[16]; + + fw_cfg_read(FW_CFG_UUID, (char *)qemu_uuid, 16); + + printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], + qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], + qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], + qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], + qemu_uuid[15]); + + push_str("/"); + fword("find-device"); + + PUSH((long)&qemu_uuid); + PUSH(16); + fword("encode-bytes"); + push_str("uuid"); + fword("property"); +} + static void init_memory(void) { memory = malloc(MEMORY_SIZE); @@ -208,6 +232,8 @@ bind_func("platform-boot", boot ); bind_func("(go)", go ); + + setup_uuid(); } int openbios(void) Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Sun Aug 8 20:50:22 2010 (r842) +++ trunk/openbios-devel/drivers/obio.c Sun Aug 8 21:54:06 2010 (r843) @@ -24,8 +24,6 @@ #include "arch/common/fw_cfg.h" #include "escc.h" -#define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x" - #define PROMDEV_KBD 0 /* input from keyboard */ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ @@ -637,8 +635,6 @@ for (;;); } -static uint8_t qemu_uuid[16]; - static void ob_nvram_init(uint64_t base, uint64_t offset) { @@ -686,24 +682,6 @@ fw_cfg_read(FW_CFG_NOGRAPHIC, &nographic, 1); graphic_depth = fw_cfg_read_i16(FW_CFG_SUN4M_DEPTH); - // Add /uuid - fw_cfg_read(FW_CFG_UUID, (char *)qemu_uuid, 16); - - printk("UUID: " UUID_FMT "\n", qemu_uuid[0], qemu_uuid[1], qemu_uuid[2], - qemu_uuid[3], qemu_uuid[4], qemu_uuid[5], qemu_uuid[6], - qemu_uuid[7], qemu_uuid[8], qemu_uuid[9], qemu_uuid[10], - qemu_uuid[11], qemu_uuid[12], qemu_uuid[13], qemu_uuid[14], - qemu_uuid[15]); - - push_str("/"); - fword("find-device"); - - PUSH((long)&qemu_uuid); - PUSH(16); - fword("encode-bytes"); - push_str("uuid"); - fword("property"); - // Add /idprom push_str("/"); fword("find-device");

1 0

[commit] r842 - in trunk/openbios-devel/fs: ext2 grubfs hfs hfsplus iso9660
by repository service 08 Aug '10

08 Aug '10

Author: blueswirl Date: Sun Aug 8 20:50:22 2010 New Revision: 842 URL: http://tracker.coreboot.org/trac/openbios/changeset/842 Log: Add checks for open_ih() return value Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Aug 8 20:28:48 2010 (r841) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Aug 8 20:50:22 2010 (r842) @@ -267,10 +267,14 @@ int fd, ret = 0; fd = open_ih(ih); - if (ext2_probe(fd, offs)) - ret = -1; - - close_io(fd); + if (fd >= 0) { + if (ext2_probe(fd, offs)) { + ret = -1; + } + close_io(fd); + } else { + ret = -1; + } RET (ret); } Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Aug 8 20:28:48 2010 (r841) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Aug 8 20:50:22 2010 (r842) @@ -336,6 +336,9 @@ int i; curfs->dev_fd = open_ih(ih); + if (curfs->dev_fd == -1) { + RET( -1 ); + } curfs->offset = offs; for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) { Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Aug 8 20:28:48 2010 (r841) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Aug 8 20:50:22 2010 (r842) @@ -479,8 +479,12 @@ char *volname = malloc(VOLNAME_SIZE); fd = open_ih(my_self()); - get_hfs_vol_name(fd, volname, VOLNAME_SIZE); - close_io(fd); + if (fd >= 0) { + get_hfs_vol_name(fd, volname, VOLNAME_SIZE); + close_io(fd); + } else { + volname[0] = '\0'; + } PUSH ((ucell)volname); } @@ -546,10 +550,14 @@ int fd, ret = 0; fd = open_ih(ih); - if (hfs_probe(fd, offs)) - ret = -1; - - close_io(fd); + if (fd >= 0) { + if (hfs_probe(fd, offs)) { + ret = -1; + } + close_io(fd); + } else { + ret = -1; + } RET (ret); } Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Aug 8 20:28:48 2010 (r841) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Aug 8 20:50:22 2010 (r842) @@ -427,8 +427,12 @@ char *volname = malloc(VOLNAME_SIZE); fd = open_ih(my_self()); - get_hfs_vol_name(fd, volname, VOLNAME_SIZE); - close_io(fd); + if (fd >= 0) { + get_hfs_vol_name(fd, volname, VOLNAME_SIZE); + close_io(fd); + } else { + volname[0] = '\0'; + } PUSH ((ucell)volname); } @@ -452,10 +456,14 @@ int fd, ret = 0; fd = open_ih(ih); - if (volume_probe(fd, offs)) - ret = -1; - - close_io(fd); + if (fd >= 0) { + if (volume_probe(fd, offs)) { + ret = -1; + } + close_io(fd); + } else { + ret = -1; + } RET (ret); } Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Aug 8 20:28:48 2010 (r841) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Aug 8 20:50:22 2010 (r842) @@ -219,10 +219,14 @@ int fd, ret = 0; fd = open_ih(ih); - if (iso9660_probe(fd, offs)) - ret = -1; - - close_io(fd); + if (fd >= 0) { + if (iso9660_probe(fd, offs)) { + ret = -1; + } + close_io(fd); + } else { + ret = -1; + } RET (ret); }

1 0

[commit] r841 - in trunk/openbios-devel/arch: sparc32 sparc64 x86
by repository service 08 Aug '10

08 Aug '10

Author: blueswirl Date: Sun Aug 8 20:28:48 2010 New Revision: 841 URL: http://tracker.coreboot.org/trac/openbios/changeset/841 Log: linux_load: fix open_io return value checks open_io() returns -1 on error and 0 is a valid return value. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/x86/linux_load.c Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sat Aug 7 14:49:53 2010 (r840) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Aug 8 20:28:48 2010 (r841) @@ -461,7 +461,7 @@ uint64_t forced; fd = open_io(initrd_file); - if (!fd) { + if (fd == -1) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -609,8 +609,9 @@ char *initrd_file = NULL; fd = open_io(file); - if (!fd) + if (fd == -1) { return -1; + } kern_addr = load_linux_header(&hdr); if (kern_addr == 0) { Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sat Aug 7 14:49:53 2010 (r840) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Aug 8 20:28:48 2010 (r841) @@ -461,7 +461,7 @@ uint64_t forced; fd = open_io(initrd_file); - if (!fd) { + if (fd == -1) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -609,7 +609,7 @@ char *initrd_file = NULL; fd = open_io(file); - if (!fd) + if (fd == -1) return -1; kern_addr = load_linux_header(&hdr); Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sat Aug 7 14:49:53 2010 (r840) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Aug 8 20:28:48 2010 (r841) @@ -462,7 +462,7 @@ uint64_t forced; fd = open_io(initrd_file); - if (!fd) { + if (fd == -1) { printf("Can't open initrd: %s\n", initrd_file); return -1; } @@ -634,8 +634,9 @@ char *initrd_file = NULL; fd = open_io(file); - if (!fd) + if (fd == -1) { return -1; + } kern_addr = load_linux_header(&hdr); if (kern_addr == 0)

1 0

[commit] r840 - trunk/openbios-devel/packages
by repository service 07 Aug '10

07 Aug '10

Author: blueswirl Date: Sat Aug 7 14:49:53 2010 New Revision: 840 URL: http://tracker.coreboot.org/trac/openbios/changeset/840 Log: sun-parts: fix id and flag sizes Also use __bexx_to_cpu() to access the fields. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sat Aug 7 14:49:52 2010 (r839) +++ trunk/openbios-devel/packages/sun-parts.c Sat Aug 7 14:49:53 2010 (r840) @@ -46,10 +46,8 @@ uint8_t info[128]; /* Informative text string */ uint8_t spare0[14]; struct sun_info { - uint8_t spare1; - uint8_t id; - uint8_t spare2; - uint8_t flags; + uint16_t id; + uint16_t flags; } infos[8]; uint8_t spare[246]; /* Boot information etc. */ uint16_t rspeed; /* Disk rotational speed */ @@ -172,8 +170,11 @@ p = (struct sun_disklabel *)buf; for (i = 0; i < 8; i++) { - DPRINTF("%c: %d + %d, id %x, flags %x\n", 'a' + i, p->partitions[i].start_cylinder, - p->partitions[i].num_sectors, p->infos[i].id, p->infos[i].flags); + DPRINTF("%c: %d + %d, id %x, flags %x\n", 'a' + i, + __be32_to_cpu(p->partitions[i].start_cylinder), + __be32_to_cpu(p->partitions[i].num_sectors), + __be16_to_cpu(p->infos[i].id), + __be16_to_cpu(p->infos[i].flags)); if (parnum < 0) { if (p->partitions[i].num_sectors != 0 && p->infos[i].id != 0) parnum = i; @@ -193,7 +194,7 @@ size = (long long)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; - di->type = __be32_to_cpu(p->infos[parnum].id); + di->type = __be16_to_cpu(p->infos[parnum].id); DPRINTF("Found Sun partition, offs %lld size %lld\n", (long long)offs, (long long)size);

1 0

[commit] r839 - trunk/openbios-devel/libopenbios
by repository service 07 Aug '10

07 Aug '10

Author: blueswirl Date: Sat Aug 7 14:49:52 2010 New Revision: 839 URL: http://tracker.coreboot.org/trac/openbios/changeset/839 Log: loaders: fix open_ih return value checks open_ih() returns -1 on error and 0 is a valid return value. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/aout_load.c trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/libopenbios/fcode_load.c trunk/openbios-devel/libopenbios/forth_load.c Modified: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/aout_load.c Sat Aug 7 14:49:50 2010 (r838) +++ trunk/openbios-devel/libopenbios/aout_load.c Sat Aug 7 14:49:52 2010 (r839) @@ -81,8 +81,9 @@ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } for (offset = 0; offset < 16 * 512; offset += 512) { seek_io(fd, offset); Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Sat Aug 7 14:49:50 2010 (r838) +++ trunk/openbios-devel/libopenbios/elf_load.c Sat Aug 7 14:49:52 2010 (r839) @@ -383,8 +383,9 @@ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } offset = find_elf(&ehdr); if (!offset) { Modified: trunk/openbios-devel/libopenbios/fcode_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/fcode_load.c Sat Aug 7 14:49:50 2010 (r838) +++ trunk/openbios-devel/libopenbios/fcode_load.c Sat Aug 7 14:49:52 2010 (r839) @@ -35,8 +35,9 @@ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } for (offset = 0; offset < 16 * 512; offset += 512) { seek_io(fd, offset); Modified: trunk/openbios-devel/libopenbios/forth_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/forth_load.c Sat Aug 7 14:49:50 2010 (r838) +++ trunk/openbios-devel/libopenbios/forth_load.c Sat Aug 7 14:49:52 2010 (r839) @@ -33,8 +33,9 @@ feval("0 state-valid !"); fd = open_ih(dev); - if (!fd) + if (fd == -1) { goto out; + } if (read_io(fd, magic, 2) != 2) { debug("Can't read magic header\n");

1 0

[commit] r838 - trunk/openbios-devel/libc
by repository service 07 Aug '10

07 Aug '10

Author: blueswirl Date: Sat Aug 7 14:49:50 2010 New Revision: 838 URL: http://tracker.coreboot.org/trac/openbios/changeset/838 Log: diskio: add debugging Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libc/diskio.c Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sat Aug 7 14:05:02 2010 (r837) +++ trunk/openbios-devel/libc/diskio.c Sat Aug 7 14:49:50 2010 (r838) @@ -18,6 +18,14 @@ #include "libopenbios/bindings.h" #include "libc/diskio.h" +//#define CONFIG_DEBUG_DISKIO +#ifdef CONFIG_DEBUG_DISKIO +#define DPRINTF(fmt, args...) \ + do { printk(fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) +#endif + typedef struct { ihandle_t ih; int do_close; @@ -73,6 +81,7 @@ fdp->do_close = 0; file_descriptors[fd]=fdp; + DPRINTF("%s(0x%lx) = %d\n", __func__, (unsigned long)ih, fd); return fd; } @@ -83,6 +92,7 @@ ihandle_t ih = open_dev( spec ); priv_fd_t *fdp; + DPRINTF("%s(%s)\n", __func__, spec); if( !ih ) return -1; @@ -110,6 +120,7 @@ call_package( fdp->reopen_xt, fdp->ih ); ret = (POP() == (ucell)-1)? 0 : -1; + DPRINTF("%s(%d, %s) = %d\n", __func__, fd, filename, ret); return ret; } @@ -118,6 +129,7 @@ { priv_fd_t *fdp = file_descriptors[fd]; + DPRINTF("%s(%d)\n", __func__, fd); if( lookup_xt(fdp->ih, "open-nwrom", &fdp->open_nwrom_xt) ) return -1; call_package( fdp->open_nwrom_xt, fdp->ih ); @@ -167,6 +179,7 @@ priv_fd_t *fdp; ucell ret; + DPRINTF("%s(%d, %p, %u)\n", __func__, fd, buf, cnt); if (fd != -1) { fdp = file_descriptors[fd]; @@ -189,6 +202,7 @@ { priv_fd_t *fdp; + DPRINTF("%s(%d, %lld)\n", __func__, fd, offs); if (fd != -1) { fdp = file_descriptors[fd]; @@ -210,6 +224,7 @@ return -1; call_package( fdp->tell_xt, fdp->ih ); offs = DPOP(); + DPRINTF("%s(%d) = %lld\n", __func__, fd, offs); return offs; } @@ -218,6 +233,7 @@ { priv_fd_t *fdp; + DPRINTF("%s(%d)\n", __func__, fd); if (fd != -1) { fdp = file_descriptors[fd];

1 0

[commit] r837 - trunk/openbios-devel/arch/x86
by repository service 07 Aug '10

07 Aug '10

Author: mcayland Date: Sat Aug 7 14:05:02 2010 New Revision: 837 URL: http://tracker.coreboot.org/trac/openbios/changeset/837 Log: Bind the (go) function into the C equivalent go function arch/x86/boot.c (this should re-enable load/boot with the new unified loader). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/x86/openbios.c Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sat Aug 7 14:02:42 2010 (r836) +++ trunk/openbios-devel/arch/x86/openbios.c Sat Aug 7 14:05:02 2010 (r837) @@ -18,8 +18,8 @@ #include "libopenbios/sys_info.h" #include "openbios.h" #include "relocate.h" +#include "boot.h" -void boot(void); void collect_sys_info(struct sys_info *info); #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ @@ -71,6 +71,7 @@ #endif device_end(); bind_func("platform-boot", boot ); + bind_func("(go)", go ); } int openbios(void)

1 0

[commit] r836 - trunk/openbios-devel/arch/unix
by repository service 07 Aug '10

07 Aug '10

Author: mcayland Date: Sat Aug 7 14:02:42 2010 New Revision: 836 URL: http://tracker.coreboot.org/trac/openbios/changeset/836 Log: Stop openbios-unix from crashing when auto-boot? is enabled. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/unix/boot.c Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Fri Aug 6 18:49:32 2010 (r835) +++ trunk/openbios-devel/arch/unix/boot.c Sat Aug 7 14:02:42 2010 (r836) @@ -64,9 +64,13 @@ void boot( void ) { - char *path=pop_fstr_copy(); + char *path; void *entry; + /* Copy the incoming path */ + fword("2dup"); + path = pop_fstr_copy(); + if(!path) { printk("[unix] Booting default not supported.\n"); return;

1 0

[commit] r835 - trunk/openbios-devel/drivers
by repository service 06 Aug '10

06 Aug '10

Author: blueswirl Date: Fri Aug 6 18:49:32 2010 New Revision: 835 URL: http://tracker.coreboot.org/trac/openbios/changeset/835 Log: vga_load_regs: check return value for errors Fixes a warning with GCC 4.0.2: CC target/drivers/vga_load_regs.o cc1: warnings being treated as errors ../drivers/vga_load_regs.c: In function 'vga_load_regs': ../drivers/vga_load_regs.c:491: warning: 'par.misc' may be used uninitialized in this function Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/vga_load_regs.c Modified: trunk/openbios-devel/drivers/vga_load_regs.c ============================================================================== --- trunk/openbios-devel/drivers/vga_load_regs.c Fri Aug 6 18:35:44 2010 (r834) +++ trunk/openbios-devel/drivers/vga_load_regs.c Fri Aug 6 18:49:32 2010 (r835) @@ -490,6 +490,7 @@ { struct vga_par par; - vga_decode_var(&vga_settings, &par); - vga_set_regs(&par); + if (vga_decode_var(&vga_settings, &par) == 0) { + vga_set_regs(&par); + } }

1 0

[commit] r834 - trunk/openbios-devel/arch/x86
by repository service 06 Aug '10

06 Aug '10

Author: blueswirl Date: Fri Aug 6 18:35:44 2010 New Revision: 834 URL: http://tracker.coreboot.org/trac/openbios/changeset/834 Log: Fix x86 build CC target/arch/x86/boot.o ../arch/x86/boot.c: In function 'go': ../arch/x86/boot.c:35: error: 'boot_notes' undeclared (first use in this function) Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/x86/boot.c Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Wed Aug 4 22:53:22 2010 (r833) +++ trunk/openbios-devel/arch/x86/boot.c Fri Aug 6 18:35:44 2010 (r834) @@ -32,7 +32,7 @@ switch (type) { case 0x0: /* Start ELF boot image */ - image_retval = start_elf(address, (uint32_t)&boot_notes); + image_retval = start_elf(address, (uint32_t)&elf_boot_notes); break; case 0x1:

1 0

[commit] r833 - trunk/openbios-devel/packages
by repository service 04 Aug '10

04 Aug '10

Author: mcayland Date: Wed Aug 4 22:53:22 2010 New Revision: 833 URL: http://tracker.coreboot.org/trac/openbios/changeset/833 Log: Improve packages/mac-parts partition detection for the cases where no partition is specified but a filename argument is, e.g hd:,%BOOT or cd:,\ofwboot.xcf. This latter form allows booting NetBSD PPC in a similar manner as described in the NetBSD documentation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/packages/mac-parts.c Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Tue Aug 3 22:48:23 2010 (r832) +++ trunk/openbios-devel/packages/mac-parts.c Wed Aug 4 22:53:22 2010 (r833) @@ -102,10 +102,8 @@ parnum = atol(parstr); /* Detect if we are looking for the bootcode */ - if (strcmp(argstr, "%BOOT") == 0) { + if (strcmp(argstr, "%BOOT") == 0) want_bootcode = 1; - argstr = strdup(""); - } } } @@ -158,11 +156,12 @@ ret = -1; goto out; - } else if (parnum == -1) { + } else if (parnum == -1 && strlen(argstr)) { DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); - /* No partition was explicitly requested, so find one */ + /* No partition was explicitly requested, but an argstr was passed in. + So let's find a suitable partition... */ for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { SEEK( bs * parnum ); READ( &par, sizeof(par) ); @@ -172,15 +171,29 @@ DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - /* Ignore any partition maps when searching */ - if (strcmp(par.pmPartType, "Apple_partition_map")) { - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; - + /* If we have a valid, allocated and readable partition... */ + if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; + + /* If the filename was set to %BOOT, we actually want the bootcode */ + if (want_bootcode && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid)) { + offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + size = (long long)__be32_to_cpu(par.pmBootSize); + goto found; + } else { + /* Otherwise we were passed a filename and path. So let's + choose the first partition with a valid filesystem */ + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + + ph = POP_ph(); + if (ph) + goto found; } } } @@ -207,12 +220,6 @@ found: - /* If the filename was set to %BOOT, we actually want the bootcode instead */ - if (want_bootcode) { - offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; - size = (long long)__be32_to_cpu(par.pmBootSize); - } - ret = -1; di->blocksize = (unsigned int)bs; @@ -234,6 +241,11 @@ DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); di->filesystem_ph = ph; + /* If the filename was %BOOT then it's not a real filename, so clear argstr before + attempting interpose */ + if (want_bootcode) + argstr = strdup(""); + /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ if (strlen(argstr)) {

1 0

[commit] r831 - trunk/openbios-devel/arch/sparc32
by repository service 04 Aug '10

04 Aug '10

Author: blueswirl Date: Tue Aug 3 20:39:27 2010 New Revision: 831 URL: http://tracker.coreboot.org/trac/openbios/changeset/831 Log: sparc32: fix NetBSD crash Fix NetBSD crash when printing bootpath. Also fix generation of compatibility paths when the bootpath includes partition letter (e.g. 'disk:d'). Consider also 'cd' alias of 'cdrom'. See also r244. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/boot.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 23:25:08 2010 (r830) +++ trunk/openbios-devel/arch/sparc32/boot.c Tue Aug 3 20:39:27 2010 (r831) @@ -48,9 +48,12 @@ strncpy(bootargsbuf, prop, proplen); /* Set bootpath pointer used in romvec table to the bootpath */ - bootpath = bootpathbuf; + push_str(bootpathbuf); + fword("pathres-resolve-aliases"); + bootpath = pop_fstr_copy(); + printk("bootpath: %s\n", bootpath); - if (!strcmp(bootpathbuf, "cdrom") || !strcmp(bootpathbuf, "disk")) { + if (!strncmp(bootpathbuf, "cd", 2) || !strncmp(bootpathbuf, "disk", 4)) { /* Controller currently always 0 */ obp_arg.boot_dev_ctrl = 0; @@ -70,10 +73,11 @@ /* Generate the "oldpath" FIXME: hardcoding this looks almost definitely wrong. With sd(0,2,0):b we get to see the solaris kernel though */ - if (!strcmp(bootpathbuf, "disk")) + if (!strncmp(bootpathbuf, "disk", 4)) { bootid = 'd'; - else + } else { bootid = 'b'; + } snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", unit, part, bootid); @@ -82,7 +86,7 @@ obp_arg.argv[0] = buf; obp_arg.argv[1] = bootargsbuf; - } else if (!strcmp(bootpathbuf, "floppy")) { + } else if (!strncmp(bootpathbuf, "floppy", 6)) { obp_arg.boot_dev_ctrl = 0; obp_arg.boot_dev_unit = 0; @@ -95,7 +99,7 @@ obp_arg.argv[0] = buf; obp_arg.argv[1] = bootargsbuf; - } else if (!strcmp(bootpathbuf, "net")) { + } else if (!strncmp(bootpathbuf, "net", 3)) { obp_arg.boot_dev_ctrl = 0; obp_arg.boot_dev_unit = 0;

2 1

[commit] r828 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 forth/admin forth/debugging include/libopenbios libopenbios
by repository service 03 Aug '10

03 Aug '10

Author: mcayland Date: Sun Aug 1 17:13:48 2010 New Revision: 828 URL: http://tracker.coreboot.org/trac/openbios/changeset/828 Log: Rework the OpenBIOS internals so that boot, load and init-program now all use the unified libopenbios loader code with improved IEEE-1275 spec compliance. This patch implements the following: 1) Fix bootpath/bootargs handling so that default values are read from NVRAM, and allow multiple space-separated values to be specified. 2) With correct bootargs handling in place, move the ELF loader over to the new libopenbios unified loaders. 3) Remove all the loader code from all architecture directories sine we don't need it anymore. 4) Simplify the boot word so it invokes platform-specific code where required, then calls load and go as per the specification. Tested on all my available images for SPARC32, SPARC64 and PPC, and compile-tested on x86. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/forth/admin/userboot.fs trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/include/libopenbios/elf_load.h trunk/openbios-devel/include/libopenbios/sys_info.h trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/libopenbios/load.c Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Aug 1 17:13:48 2010 (r828) @@ -527,7 +527,7 @@ uint64_t ram_size; const struct cpudef *cpu; char buf[64], qemu_uuid[16]; - const char *stdin_path, *stdout_path; + const char *stdin_path, *stdout_path, *boot_path; uint32_t temp = 0; ofmem_t *ofmem = ofmem_arch_get_private(); @@ -721,14 +721,17 @@ uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { case 'c': - push_str("hd:"); + boot_path = "hd"; break; default: case 'd': - push_str("cd:"); + boot_path = "cd"; break; } + /* Setup default boot devices */ + snprintf(buf, sizeof(buf), "%s:,\\\\:tbxi %s:,\\ppc\\bootinfo.txt", boot_path, boot_path); + push_str(buf); fword("encode-string"); push_str("boot-device"); fword("property"); @@ -737,16 +740,6 @@ push_str("/chosen"); fword("find-device"); - /* bootpath/bootargs should be set to NVRAM default */ - fword("boot-device"); - fword("encode-string"); - push_str("bootpath"); - fword("property"); - fword("boot-args"); - fword("encode-string"); - push_str("bootargs"); - fword("property"); - push_str(stdin_path); fword("open-dev"); fword("encode-int"); Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Aug 1 17:13:48 2010 (r828) @@ -39,16 +39,9 @@ #define ELF_DPRINTF(fmt, args...) SUBSYS_DPRINTF("ELF", fmt, ##args) #define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args) -static void -load(const char *path, const char *param) -{ - char buffer[1024]; - if (param) - sprintf(buffer, "load %s %s", path, param); - else - sprintf(buffer, "load %s", path); - feval(buffer); -} +struct sys_info sys_info; +void *elf_boot_notes = NULL; + static char * get_device( const char *path ) @@ -115,6 +108,7 @@ return filename; } + static void encode_bootpath( const char *spec, const char *args ) { @@ -123,6 +117,9 @@ char *filename, *directory; int partition; + if (spec) + return; + filename = get_filename(spec, &directory); partition = get_partition(spec); if (partition == -1) @@ -138,28 +135,6 @@ set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); } -/************************************************************************/ -/* qemu booting */ -/************************************************************************/ -static void -try_path(const char *device, const char* filename, const char *param) -{ - char path[1024]; - - if (filename) - snprintf(path, sizeof(path), "%s%s", device, filename); - else - snprintf(path, sizeof(path), "%s", device); - - ELF_DPRINTF("Trying %s %s\n", path, param); - - load(path, param); - update_nvram(); - ELF_DPRINTF("Transfering control to %s %s\n", - path, param); - feval("go"); -} - #define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000) static void @@ -203,46 +178,6 @@ return; } -static void -newworld_boot( void ) -{ - static const char * const chrp_path[] = { "\\\\:tbxi", - "ppc\\bootinfo.txt", - NULL - }; - char *path = pop_fstr_copy(), *param; - int i; - - param = strchr(path, ' '); - if (param) { - *param = 0; - param++; - } - - if (!path) { - NEWWORLD_DPRINTF("Entering boot, no path\n"); - - /* No path specified, so grab defaults from /chosen */ - push_str("bootpath"); - push_str("/chosen"); - fword("(find-dev)"); - POP(); - fword("get-package-property"); - POP(); - path = pop_fstr_copy(); - - for (i = 0; chrp_path[i]; i++) - try_path(path, chrp_path[i], param); - - } else { - NEWWORLD_DPRINTF("Entering boot, path %s\n", path); - try_path(path, NULL, param); - for (i = 0; chrp_path[i]; i++) - try_path(path, chrp_path[i], param); - } - printk("*** Boot failure! No secondary bootloader specified ***\n"); -} - static void check_preloaded_kernel(void) { unsigned long kernel_image, kernel_size; @@ -281,8 +216,10 @@ if (boot_device == 'm') { check_preloaded_kernel(); } + if (boot_device == 'c') { oldworld_boot(); } - newworld_boot(); + + update_nvram(); } Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 17:13:48 2010 (r828) @@ -9,10 +9,6 @@ #include "libc/diskio.h" #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" -#include "libopenbios/elf_load.h" -#include "libopenbios/aout_load.h" -#include "libopenbios/fcode_load.h" -#include "libopenbios/forth_load.h" #include "openprom.h" #include "boot.h" #include "context.h" @@ -22,76 +18,16 @@ uint32_t qemu_cmdline; uint32_t cmdline_size; char boot_device; -static const void *romvec; - -static int try_path(const char *path, char *param) -{ - void *boot_notes = NULL; - ucell valid; - ihandle_t dev; - - push_str(path); - fword("pathres-resolve-aliases"); - bootpath = pop_fstr_copy(); - printk("Trying %s (%s)\n", path, bootpath); - - /* Open device used by this path */ - dev = open_dev(path); - -#ifdef CONFIG_LOADER_ELF - /* ELF Boot loader */ - elf_load(&sys_info, path, param, &boot_notes); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - - /* Linux loader (not using Forth) */ - linux_load(&sys_info, path, param); - -#ifdef CONFIG_LOADER_AOUT - /* a.out loader */ - aout_load(&sys_info, dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - -#ifdef CONFIG_LOADER_FCODE - /* Fcode loader */ - fcode_load(dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - -#ifdef CONFIG_LOADER_FORTH - /* Forth loader */ - forth_load(dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - - close_dev(dev); - - return 0; - - -start_image: - go(); - return -1; -} - +void *elf_boot_notes = NULL; +const void *romvec; void go(void) { ucell address, type, size; - int image_retval = 0; + int image_retval = 0, proplen, unit, part; + phandle_t chosen; + char *prop, *id, bootid; + static char bootpathbuf[128], bootargsbuf[128], buf[128]; /* Get the entry point and the type (see forth/debugging/client.fs) */ feval("saved-program-state >sps.entry @"); @@ -101,6 +37,80 @@ feval("saved-program-state >sps.file-size @"); size = POP(); + /* SPARC32 is slightly unusual in that before invoking any loaders, a romvec array + needs to be set up to pass certain parameters using a C struct. Hence this section + extracts the relevant boot information and places it in obp_arg. */ + + /* Get the name of the selected boot device, along with the device and unit number */ + chosen = find_dev("/chosen"); + prop = get_property(chosen, "bootpath", &proplen); + strncpy(bootpathbuf, prop, proplen); + prop = get_property(chosen, "bootargs", &proplen); + strncpy(bootargsbuf, prop, proplen); + + /* Set bootpath pointer used in romvec table to the bootpath */ + bootpath = bootpathbuf; + + if (!strcmp(bootpathbuf, "cdrom") || !strcmp(bootpathbuf, "disk")) { + + /* Controller currently always 0 */ + obp_arg.boot_dev_ctrl = 0; + + /* Grab the device and unit number string (in form unit,partition) */ + push_str(bootpathbuf); + feval("pathres-resolve-aliases ascii @ right-split 2drop"); + id = pop_fstr_copy(); + + /* A bit hacky, but we have no atoi() function */ + unit = id[0] - '0'; + part = id[2] - '0'; + + obp_arg.boot_dev_unit = unit; + obp_arg.dev_partition = part; + + /* Generate the "oldpath" + FIXME: hardcoding this looks almost definitely wrong. + With sd(0,2,0):b we get to see the solaris kernel though */ + if (!strcmp(bootpathbuf, "disk")) + bootid = 'd'; + else + bootid = 'b'; + + snprintf(buf, sizeof(buf), "sd(0,%d,%d):%c", unit, part, bootid); + + obp_arg.boot_dev[0] = buf[0]; + obp_arg.boot_dev[1] = buf[1]; + obp_arg.argv[0] = buf; + obp_arg.argv[1] = bootargsbuf; + + } else if (!strcmp(bootpathbuf, "floppy")) { + + obp_arg.boot_dev_ctrl = 0; + obp_arg.boot_dev_unit = 0; + obp_arg.dev_partition = 0; + + strcpy(buf, "fd()"); + + obp_arg.boot_dev[0] = buf[0]; + obp_arg.boot_dev[1] = buf[1]; + obp_arg.argv[0] = buf; + obp_arg.argv[1] = bootargsbuf; + + } else if (!strcmp(bootpathbuf, "net")) { + + obp_arg.boot_dev_ctrl = 0; + obp_arg.boot_dev_unit = 0; + obp_arg.dev_partition = 0; + + strcpy(buf, "le()"); + + obp_arg.boot_dev[0] = buf[0]; + obp_arg.boot_dev[1] = buf[1]; + obp_arg.argv[0] = buf; + obp_arg.argv[1] = bootargsbuf; + + } + printk("\nJumping to entry point " FMT_ucellx " for type " FMT_ucellx "...\n", address, type); switch (type) { @@ -149,89 +159,9 @@ void boot(void) { - char *path = pop_fstr_copy(), *param, altpath[256]; - const char *oldpath = path; - int unit = 0; - int result; - - if(!path) { - /* No path specified, so grab defaults from firmware */ - switch (boot_device) { - case 'a': - path = strdup("/obio/SUNW,fdtwo"); - oldpath = "fd()"; - break; - case 'c': - path = strdup("disk"); - oldpath = "sd(0,0,0):d"; - break; - default: - case 'd': - path = strdup("cdrom"); - // FIXME: hardcoding this looks almost definitely wrong. - // With sd(0,2,0):b we get to see the solaris kernel though - //oldpath = "sd(0,2,0):d"; - oldpath = "sd(0,2,0):b"; - unit = 2; - break; - case 'n': - path = strdup("net"); - oldpath = "le()"; - break; - } - } - - obp_arg.boot_dev_ctrl = 0; - obp_arg.boot_dev_unit = unit; - obp_arg.dev_partition = 0; - obp_arg.boot_dev[0] = oldpath[0]; - obp_arg.boot_dev[1] = oldpath[1]; - obp_arg.argv[0] = oldpath; - obp_arg.argv[1] = (void *)(long)qemu_cmdline; - - param = strchr(path, ' '); - if(param) { - *param = '\0'; - param++; - } else if (cmdline_size) { - param = (char *)qemu_cmdline; - } else { - push_str("boot-args"); - push_str("/options"); - fword("(find-dev)"); - POP(); - fword("get-package-property"); - POP(); - param = pop_fstr_copy(); - obp_arg.argv[1] = param; - } - - romvec = init_openprom(); - + /* Boot preloaded kernel */ if (kernel_size) { printk("[sparc] Kernel already loaded\n"); start_elf(kernel_image, (unsigned long)romvec); } - - printk("[sparc] Booting file '%s' ", path); - if (param) - printk("with parameters '%s'\n", param); - else - printk("without parameters.\n"); - - result = try_path(path, param); - if (!result) { - push_str(path); - PUSH(':'); - fword("left-split"); - snprintf(altpath, sizeof(altpath), "%s:d", pop_fstr_copy()); - POP(); - POP(); - - try_path(altpath, param); - } - - printk("Unsupported image format\n"); - - free(path); } Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Aug 1 17:13:48 2010 (r828) @@ -30,6 +30,7 @@ // romvec.c extern struct linux_arguments_v0 obp_arg; +extern const void *romvec; // openbios.c extern int qemu_machine_type; Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/sparc32/openbios.c Sun Aug 1 17:13:48 2010 (r828) @@ -133,6 +133,9 @@ static void arch_init( void ) { + static char cmdline[128]; + int size; + openbios_init(); modules_init(); ob_init_mmu(); @@ -151,23 +154,57 @@ #endif device_end(); - /* Set up other properties */ - push_str("/chosen"); - fword("find-device"); + kernel_size = fw_cfg_read_i32(FW_CFG_KERNEL_SIZE); + if (kernel_size) + kernel_image = fw_cfg_read_i32(FW_CFG_KERNEL_ADDR); + + size = fw_cfg_read_i32(FW_CFG_CMDLINE_SIZE); + if (size) { + fw_cfg_read(FW_CFG_CMDLINE_DATA, cmdline, size); + } + cmdline[size] = '\0'; + qemu_cmdline = (uint32_t)cmdline; + + boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); + + /* Initialiase openprom romvec */ + romvec = init_openprom(); + + /* Setup nvram variables */ + push_str("/options"); + fword("find-device"); + + switch (boot_device) { + case 'a': + push_str("floppy"); + break; + case 'c': + push_str("disk"); + break; + default: + case 'd': + push_str("cdrom"); + break; + case 'n': + push_str("net"); + break; + } - /* bootpath/bootargs should be set to NVRAM default */ - fword("boot-device"); fword("encode-string"); - push_str("bootpath"); + push_str("boot-device"); fword("property"); - fword("boot-args"); + + push_str(""); fword("encode-string"); - push_str("bootargs"); + push_str("boot-file"); fword("property"); - boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); + /* Set up other properties */ + push_str("/chosen"); + fword("find-device"); bind_func("platform-boot", boot ); + bind_func("(go)", go ); } int openbios(void) Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Aug 1 17:13:48 2010 (r828) @@ -8,10 +8,6 @@ #include "libc/diskio.h" #include "libc/vsprintf.h" #include "libopenbios/sys_info.h" -#include "libopenbios/elf_load.h" -#include "libopenbios/aout_load.h" -#include "libopenbios/fcode_load.h" -#include "libopenbios/forth_load.h" #include "boot.h" uint64_t kernel_image; @@ -19,68 +15,10 @@ uint64_t qemu_cmdline; uint64_t cmdline_size; char boot_device; -void *boot_notes = NULL; +void *elf_boot_notes = NULL; extern int sparc64_of_client_interface( int *params ); -static int try_path(const char *path, char *param) -{ - ucell valid; - ihandle_t dev; - - /* Open device used by this path */ - dev = open_dev(path); - -#ifdef CONFIG_LOADER_ELF - /* ELF Boot loader */ - elf_load(&sys_info, path, param, &boot_notes); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - - /* Linux loader (not using Forth) */ - linux_load(&sys_info, path, param); - -#ifdef CONFIG_LOADER_AOUT - /* a.out loader */ - aout_load(&sys_info, dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - -#ifdef CONFIG_LOADER_FCODE - /* Fcode loader */ - fcode_load(dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - -#ifdef CONFIG_LOADER_FORTH - /* Forth loader */ - forth_load(dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - - close_dev(dev); - - return 0; - - -start_image: - go(); - return -1; -} - - void go(void) { ucell address, type, size; @@ -99,7 +37,7 @@ switch (type) { case 0x0: /* Start ELF boot image */ - image_retval = start_elf(address, (uint64_t)&boot_notes); + image_retval = start_elf(address, (uint64_t)&elf_boot_notes); break; case 0x1: @@ -136,19 +74,23 @@ void boot(void) { - char *path=pop_fstr_copy(), *param; - char altpath[256]; - int result; + char *path, *param; + /* Copy the incoming path */ + fword("2dup"); + path = pop_fstr_copy(); + + /* Boot preloaded kernel */ if (kernel_size) { void (*entry)(unsigned long p1, unsigned long p2, unsigned long p3, - unsigned long p4, unsigned long p5);; + unsigned long p4, unsigned long p5); printk("[sparc64] Kernel already loaded\n"); entry = (void *) (unsigned long)kernel_image; entry(0, 0, 0, 0, (unsigned long)&sparc64_of_client_interface); } + /* Invoke Linux directly -- probably not supported */ if(!path) { /* No path specified, so grab defaults from /chosen */ push_str("bootpath"); @@ -175,20 +117,9 @@ POP(); param = pop_fstr_copy(); } - - printk("[sparc64] Booting file '%s' ", path); - if (param) - printk("with parameters '%s'\n", param); - else - printk("without parameters.\n"); - - result = try_path(path, param); - if (!result) { - snprintf(altpath, sizeof(altpath), "%s:f", path); - try_path(altpath, param); - } - - printk("Unsupported image format\n"); + + /* Invoke platform-specific Linux loader */ + linux_load(&sys_info, path, param); free(path); } Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Aug 1 17:13:48 2010 (r828) @@ -618,6 +618,12 @@ return LOADER_NOT_SUPPORT; } + debug("[sparc64] Booting kernel '%s' ", file); + if (cmdline) + debug("with parameters '%s'\n", cmdline); + else + debug("without parameters.\n"); + params = phys_to_virt(LINUX_PARAM_LOC); init_linux_params(params, &hdr); set_memory_size(params, info); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/sparc64/openbios.c Sun Aug 1 17:13:48 2010 (r828) @@ -374,7 +374,6 @@ { uint32_t size = 0; const struct cpudef *cpu; - const char *bootpath; char buf[256]; uint32_t temp; uint64_t ram_size; @@ -492,34 +491,15 @@ push_str("boot-device"); fword("property"); - /* Set up other properties */ - push_str("/chosen"); - fword("find-device"); - - if (boot_device == 'c') - bootpath = "disk:a"; - else - bootpath = "cdrom:a"; - push_str(bootpath); - fword("encode-string"); - push_str("bootpath"); - fword("property"); - - /* bootpath/bootargs should be set to NVRAM default */ - fword("boot-device"); - fword("encode-string"); - push_str("bootpath"); - fword("property"); - fword("boot-args"); - fword("encode-string"); - push_str("bootargs"); - fword("property"); - push_str(obio_cmdline); fword("encode-string"); - push_str("bootargs"); + push_str("boot-file"); fword("property"); + /* Set up other properties */ + push_str("/chosen"); + fword("find-device"); + if (fw_cfg_read_i16(FW_CFG_NOGRAPHIC)) { stdin_path = stdout_path = "ttya"; } else { Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/arch/x86/boot.c Sun Aug 1 17:13:48 2010 (r828) @@ -12,71 +12,9 @@ #include "arch/common/nvram.h" #include "libc/diskio.h" #include "libopenbios/sys_info.h" -#include "libopenbios/elf_load.h" -#include "libopenbios/aout_load.h" -#include "libopenbios/fcode_load.h" -#include "libopenbios/forth_load.h" #include "boot.h" -void *boot_notes = NULL; - -static int try_path(const char *path, char *param) -{ - ucell valid; - ihandle_t dev; - - /* Open device used by this path */ - dev = open_dev(path); - -#ifdef CONFIG_LOADER_ELF - /* ELF Boot loader */ - elf_load(&sys_info, path, param, &boot_notes); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - - /* Linux loader (not using Forth) */ - linux_load(&sys_info, path, param); - -#ifdef CONFIG_LOADER_AOUT - /* a.out loader */ - aout_load(&sys_info, dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - -#ifdef CONFIG_LOADER_FCODE - /* Fcode loader */ - fcode_load(dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - -#ifdef CONFIG_LOADER_FORTH - /* Forth loader */ - forth_load(dev); - feval("state-valid @"); - valid = POP(); - if (valid) - goto start_image; -#endif - - close_dev(dev); - - return 0; - - -start_image: - go(); - return -1; -} - +void *elf_boot_notes = NULL; void go(void) { @@ -133,24 +71,6 @@ void boot(void) { - char *path=pop_fstr_copy(), *param; - - if(!path) { - printk("[x86] Booting default not supported.\n"); - return; - } - - param = strchr(path, ' '); - if(param) { - *param = '\0'; - param++; - } - - printk("[x86] Booting file '%s' with parameters '%s'\n",path, param); - - try_path(path, param); - - printk("Unsupported image format\n"); - - free(path); + /* No platform-specific boot code */ + return; } Modified: trunk/openbios-devel/forth/admin/userboot.fs ============================================================================== --- trunk/openbios-devel/forth/admin/userboot.fs Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/forth/admin/userboot.fs Sun Aug 1 17:13:48 2010 (r828) @@ -1,16 +1,15 @@ \ 7.4.3.5 User commands for booting -: boot ( "{param-text}<cr>" -- ) - (encode-bootpath) +: boot ( "{param-text}<cr>" -- ) + (encode-bootpath) \ Setup bootpath/bootargs s" platform-boot" $find if - execute - else - 2drop - cr ." Booting " type cr - ." ... not supported on this system." cr + execute \ Execute platform-specific boot code then + $load \ load and go + go ; + \ : diagnostic-mode? ( -- diag? ) \ ; Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/forth/debugging/client.fs Sun Aug 1 17:13:48 2010 (r828) @@ -58,24 +58,55 @@ : (encode-bootpath) ( "{params}<cr>" -- bootpath-str bootpath-len) \ Parse the current input buffer of a load/boot command and set both \ the bootargs and bootpath properties as appropriate. - bl parse dup if - 2dup encode-string - " /chosen" (find-dev) if - " bootpath" rot (property) - then - then - linefeed parse dup if - encode-string - " /chosen" (find-dev) if - " bootargs" rot (property) - then - else + cr + + \ bootpath + bl parse dup 0= if + + \ None specified. As per IEEE-1275 specification, search through each value + \ in boot-device and use the first that returns a valid ihandle on open. + s" boot-device" $find drop execute + bl left-split + begin + dup + while + 2dup s" Trying " type type s" ..." type cr + 2dup open-dev ?dup if + close-dev + 2swap drop 0 \ Fake end of string so we exit loop + else + 2drop + bl left-split + then + repeat 2drop + else + 0 0 2swap \ Fake (empty) parse string + then + + \ Set the bootpath property + 2dup encode-string + " /chosen" (find-dev) if + " bootpath" rot (property) + then + + \ bootargs + linefeed parse dup 0= if + \ None specified, use default from nvram + 2drop s" boot-file" $find drop execute then + + \ Set the bootargs property + encode-string + " /chosen" (find-dev) if + " bootargs" rot (property) + then + + \ Remove the remaining string + 2swap 2drop ; -: load ( "{params}<cr>" -- ) - (encode-bootpath) +: $load ( devstr len ) open-dev ( ihandle ) dup 0= if drop @@ -89,6 +120,11 @@ init-program ; +: load ( "{params}<cr>" -- ) + (encode-bootpath) + $load +; + : dir ( "{paths}<cr>" -- ) linefeed parse split-path-device Modified: trunk/openbios-devel/include/libopenbios/elf_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/elf_load.h Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/include/libopenbios/elf_load.h Sun Aug 1 17:13:48 2010 (r828) @@ -21,7 +21,7 @@ #include "asm/elf.h" #include "libopenbios/sys_info.h" -extern int elf_load(struct sys_info *info, const char *filename, const char *cmdline, void **boot_notes); +extern int elf_load(struct sys_info *info, ihandle_t dev, const char *cmdline, void **boot_notes); extern void elf_init_program(void); extern int is_elf(Elf_ehdr *ehdr); extern int find_elf(Elf_ehdr *ehdr); Modified: trunk/openbios-devel/include/libopenbios/sys_info.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/sys_info.h Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/include/libopenbios/sys_info.h Sun Aug 1 17:13:48 2010 (r828) @@ -22,6 +22,7 @@ unsigned long *dict_end; }; +extern void *elf_boot_notes; extern struct sys_info sys_info; void collect_elfboot_info(struct sys_info *info); Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/libopenbios/elf_load.c Sun Aug 1 17:13:48 2010 (r828) @@ -368,7 +368,7 @@ } int -elf_load(struct sys_info *info, const char *filename, const char *cmdline, void **boot_notes) +elf_load(struct sys_info *info, ihandle_t dev, const char *cmdline, void **boot_notes) { Elf_ehdr ehdr; Elf_phdr *phdr = NULL; @@ -382,7 +382,7 @@ /* Mark the saved-program-state as invalid */ feval("0 state-valid !"); - fd = open_io(filename); + fd = open_ih(dev); if (!fd) goto out; Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Sun Aug 1 16:37:04 2010 (r827) +++ trunk/openbios-devel/libopenbios/load.c Sun Aug 1 17:13:48 2010 (r828) @@ -20,6 +20,10 @@ #include "libopenbios/sys_info.h" #include "libopenbios/load.h" +#ifdef CONFIG_LOADER_ELF +#include "libopenbios/elf_load.h" +#endif + #ifdef CONFIG_LOADER_AOUT #include "libopenbios/aout_load.h" #endif @@ -38,6 +42,21 @@ void load(ihandle_t dev) { /* Invoke the loaders on the specified device */ + char *param; + +#ifdef CONFIG_LOADER_ELF + + /* Grab the boot arguments */ + push_str("bootargs"); + push_str("/chosen"); + fword("(find-dev)"); + POP(); + fword("get-package-property"); + POP(); + param = pop_fstr_copy(); + + elf_load(&sys_info, dev, param, &elf_boot_notes); +#endif #ifdef CONFIG_LOADER_AOUT aout_load(&sys_info, dev);

3 3

OpenBIOS fails to build on sparc32/64 hosts
by Aurelien Jarno 02 Aug '10

02 Aug '10

Hi, Trying to build OpenBIOS natively on sparc32 or sparc64 host, I get the following error: LINK openbios-unix libopenbios.a(load.o): In function `load': /home/aurel32/openbios-devel/obj-sparc32/../libopenbios/load.c:41: undefined reference to `sys_info' /home/aurel32/openbios-devel/obj-sparc32/../libopenbios/load.c:41: undefined reference to `sys_info' It seems only sparc32/64 have CONFIG_LOADER_AOUT. The sys_info variable is defined in arch/sparc{32,64}/boot.c, but this file is not used to build openbios-unix. Any new what would be a real fix here, besides disabling CONFIG_LOADER_AOUT? Thanks, Aurelien -- Aurelien Jarno GPG: 1024D/F1BCDB73 aurelien(a)aurel32.net http://www.aurel32.net

3 6

[commit] r830 - in trunk/openbios-devel: arch/ppc arch/ppc/briq arch/ppc/mol arch/ppc/pearpc arch/ppc/qemu arch/sparc32 arch/sparc64 arch/unix arch/x86 fs fs/ext2 fs/grubfs fs/hfs fs/hfs/include fs...
by repository service 01 Aug '10

01 Aug '10

Author: blueswirl Date: Sun Aug 1 23:25:08 2010 New Revision: 830 URL: http://tracker.coreboot.org/trac/openbios/changeset/830 Log: Use standard types Replace uchar, uint, ulong, u_char, u_int, u_long, u_int* with their standard equivalents. Fixes warnings like these on OpenBSD: CC target/arch/unix/unix.o In file included from ../arch/unix/unix.c:29: ../include/config.h:26: warning: redefinition of `ulong' /usr/include/sys/types.h:56: warning: `ulong' previously declared here ../include/config.h:26: warning: redundant redeclaration of `ulong' in same scope Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/briq/init.c trunk/openbios-devel/arch/ppc/briq/main.c trunk/openbios-devel/arch/ppc/briq/methods.c trunk/openbios-devel/arch/ppc/mol/init.c trunk/openbios-devel/arch/ppc/mol/main.c trunk/openbios-devel/arch/ppc/mol/methods.c trunk/openbios-devel/arch/ppc/mol/mol.h trunk/openbios-devel/arch/ppc/mol/osi-scsi.c trunk/openbios-devel/arch/ppc/ofmem.c trunk/openbios-devel/arch/ppc/osi_calls.h trunk/openbios-devel/arch/ppc/pearpc/init.c trunk/openbios-devel/arch/ppc/pearpc/main.c trunk/openbios-devel/arch/ppc/pearpc/methods.c trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/kernel.h trunk/openbios-devel/arch/ppc/qemu/methods.c trunk/openbios-devel/arch/ppc/qemu/ofmem.c trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/arch/ppc/start.S trunk/openbios-devel/arch/sparc32/linux_load.c trunk/openbios-devel/arch/sparc64/linux_load.c trunk/openbios-devel/arch/unix/boot.c trunk/openbios-devel/arch/x86/linux_load.c trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/ext2/ext2_utils.c trunk/openbios-devel/fs/ext2/ext2_utils.h trunk/openbios-devel/fs/grubfs/defs.h trunk/openbios-devel/fs/grubfs/dir.h trunk/openbios-devel/fs/grubfs/disk_inode.h trunk/openbios-devel/fs/grubfs/fs.h trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/grubfs/iso9660.h trunk/openbios-devel/fs/hfs/hfs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfs/include/hfs.h trunk/openbios-devel/fs/hfs/include/volume.h trunk/openbios-devel/fs/hfs/volume.c trunk/openbios-devel/fs/hfs_mdb.h trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/hfsplus/include/volume.h trunk/openbios-devel/fs/hfsplus/volume.c trunk/openbios-devel/fs/ioglue.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c trunk/openbios-devel/fs/iso9660/libiso9660.h trunk/openbios-devel/fs/os.h trunk/openbios-devel/include/arch/ppc/processor.h trunk/openbios-devel/include/config.h trunk/openbios-devel/include/fs/fs.h trunk/openbios-devel/include/libc/diskio.h trunk/openbios-devel/include/libopenbios/ofmem.h trunk/openbios-devel/libc/diskio.c trunk/openbios-devel/libopenbios/client.c trunk/openbios-devel/libopenbios/console_common.c trunk/openbios-devel/libopenbios/elf_load.c trunk/openbios-devel/packages/cmdline.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/nvram.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c trunk/openbios-devel/packages/video.c Modified: trunk/openbios-devel/arch/ppc/briq/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/init.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/briq/init.c Sun Aug 1 23:25:08 2010 (r830) @@ -102,8 +102,8 @@ if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { - ulong size = 0x1000; - while( size < (ulong)of_rtas_end - (ulong)of_rtas_start ) + unsigned long size = 0x1000; + while( size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start ) size *= 2; set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); } Modified: trunk/openbios-devel/arch/ppc/briq/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/main.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/briq/main.c Sun Aug 1 23:25:08 2010 (r830) @@ -26,9 +26,9 @@ #include "libopenbios/ofmem.h" static void -transfer_control_to_elf( ulong entry ) +transfer_control_to_elf( unsigned long entry ) { - extern void call_elf( ulong entry ); + extern void call_elf( unsigned long entry ); printk("Starting ELF image at 0x%08lX\n", entry); call_elf( 0x400000 ); //call_elf( entry ); @@ -37,7 +37,7 @@ } static int -load_elf_rom( ulong *entry, int fd ) +load_elf_rom( unsigned long *entry, int fd ) { int i, lszz_offs, elf_offs; char buf[128], *addr; @@ -91,7 +91,7 @@ flush_icache_range( addr, addr+s ); /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", - (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ + (unsigned long)phdr[i].p_vaddr, (unsigned long)phdr[i].p_memsz );*/ } free( phdr ); return lszz_offs; @@ -115,7 +115,7 @@ { const char *paths[] = { "hd:0,\\zImage.chrp", NULL }; const char *args[] = { "root=/dev/hda2 console=ttyS0,115200", NULL }; - ulong entry; + unsigned long entry; int i, fd; for( i=0; paths[i]; i++ ) { Modified: trunk/openbios-devel/arch/ppc/briq/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/briq/methods.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/briq/methods.c Sun Aug 1 23:25:08 2010 (r830) @@ -37,7 +37,7 @@ { int physbase = POP(); int s=0x1000, size = (int)of_rtas_end - (int)of_rtas_start; - ulong virt; + unsigned long virt; while( s < size ) s += 0x1000; @@ -137,10 +137,10 @@ /* ( -- ) */ static void -ciface_quiesce( ulong args[], ulong ret[] ) +ciface_quiesce( unsigned long args[], unsigned long ret[] ) { #if 0 - ulong msr; + unsigned long msr; /* This seems to be the correct thing to do - but I'm not sure */ asm volatile("mfmsr %0" : "=r" (msr) : ); msr &= ~(MSR_IR | MSR_DR); @@ -151,11 +151,11 @@ /* ( -- ms ) */ static void -ciface_milliseconds( ulong args[], ulong ret[] ) +ciface_milliseconds( unsigned long args[], unsigned long ret[] ) { extern unsigned long get_timer_freq(); - static ulong mticks=0, usecs=0; - ulong t; + static unsigned long mticks=0, usecs=0; + unsigned long t; asm volatile("mftb %0" : "=r" (t) : ); if( mticks ) Modified: trunk/openbios-devel/arch/ppc/mol/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/init.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/mol/init.c Sun Aug 1 23:25:08 2010 (r830) @@ -97,8 +97,8 @@ if( (ph=prom_find_device("/rtas")) == -1 ) printk("Warning: No /rtas node\n"); else { - ulong size = 0x1000; - while( size < (ulong)of_rtas_end - (ulong)of_rtas_start ) + unsigned long size = 0x1000; + while( size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start ) size *= 2; prom_set_prop( ph, "rtas-size", (char*)&size, sizeof(size) ); } Modified: trunk/openbios-devel/arch/ppc/mol/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/main.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/mol/main.c Sun Aug 1 23:25:08 2010 (r830) @@ -32,9 +32,9 @@ static void newworld_timer_hack( char *start, size_t size ); static void -transfer_control_to_elf( ulong entry ) +transfer_control_to_elf( unsigned long entry ) { - extern void call_elf( ulong entry ); + extern void call_elf( unsigned long entry ); printk("Starting ELF boot loader\n"); call_elf( entry ); @@ -42,7 +42,7 @@ } static int -load_elf_rom( ulong *entry, int fd ) +load_elf_rom( unsigned long *entry, int fd ) { int i, lszz_offs, elf_offs; char buf[128], *addr; @@ -95,7 +95,7 @@ flush_icache_range( addr, addr+s ); /* printk("ELF ROM-section loaded at %08lX (size %08lX)\n", - (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ + (unsigned long)phdr[i].p_vaddr, (unsigned long)phdr[i].p_memsz );*/ } free( phdr ); return lszz_offs; @@ -113,18 +113,18 @@ patch_newworld_rom( char *start, size_t size ) { int s; - ulong mark[] = { 0x7c7d1b78, /* mr r29,r3 */ - 0x7c9c2378, /* mr r28,r4 */ - 0x7cc33378, /* mr r3,r6 */ - 0x7c864214, /* add r4,r6,r8 <------ BUG -- */ - 0x80b10000, /* lwz r5,0(r17) */ - 0x38a500e8 }; /* addi r5,r5,232 */ + unsigned long mark[] = { 0x7c7d1b78, /* mr r29,r3 */ + 0x7c9c2378, /* mr r28,r4 */ + 0x7cc33378, /* mr r3,r6 */ + 0x7c864214, /* add r4,r6,r8 <------ BUG -- */ + 0x80b10000, /* lwz r5,0(r17) */ + 0x38a500e8 }; /* addi r5,r5,232 */ /* Correcting add r4,r6,r8 ----> addi r4,r6,8 */ for( s=0; s<size-sizeof(mark); s+=4 ) if( memcmp( start+s, mark, sizeof(mark)) == 0 ) { printk("FIXING ROM BUG @ %X!\n", s+12); - ((ulong*)(start+s))[3] = 0x38860008; /* addi r4,r6,8 */ + ((unsigned long*)(start+s))[3] = 0x38860008; /* addi r4,r6,8 */ } } @@ -137,22 +137,22 @@ newworld_timer_hack( char *start, size_t size ) { int s; - ulong mark[] = { 0x7d0000a6, 0x5507045e, 0x7ce00124, 0x4c00012c, - 0x38e00000, 0x3c80000f, 0x6084ffff, 0x98830c00, - 0x7c0006ac, 0x98830a00, 0x7c0006ac, 0x7c9603a6, - 0x4c00012c, 0x7cb602a6, 0x2c050000, 0x4181fff8, - 0x7c0004ac, 0x88830a00, 0x7c0006ac, 0x88a30800, - 0x7c0006ac, 0x88c30a00, 0x7c0006ac, 0x7c043040, - 0x40a2ffe4, 0x5085442e, 0x7ca500d0, 0x54a5043e, - 0x7c053840, 0x7ca72b78, 0x4082ff9c, 0x7ca32b78, - 0x7d000124, 0x4c00012c, 0x4e800020 + unsigned long mark[] = { 0x7d0000a6, 0x5507045e, 0x7ce00124, 0x4c00012c, + 0x38e00000, 0x3c80000f, 0x6084ffff, 0x98830c00, + 0x7c0006ac, 0x98830a00, 0x7c0006ac, 0x7c9603a6, + 0x4c00012c, 0x7cb602a6, 0x2c050000, 0x4181fff8, + 0x7c0004ac, 0x88830a00, 0x7c0006ac, 0x88a30800, + 0x7c0006ac, 0x88c30a00, 0x7c0006ac, 0x7c043040, + 0x40a2ffe4, 0x5085442e, 0x7ca500d0, 0x54a5043e, + 0x7c053840, 0x7ca72b78, 0x4082ff9c, 0x7ca32b78, + 0x7d000124, 0x4c00012c, 0x4e800020 }; /* return #via ticks corresponding to 0xfffff DEC ticks (VIA frequency == 47/60 MHz) */ for( s=0; s < size-sizeof(mark); s+=4 ) { if( !memcmp( start+s, mark, sizeof(mark)) ) { extern char timer_calib_start[], timer_calib_end[]; - extern ulong nw_dec_calibration; + extern unsigned long nw_dec_calibration; int hz = OSI_UsecsToMticks(1000); nw_dec_calibration = OSI_MticksToUsecs(0xfffff*47)/60; memcpy( start + s, timer_calib_start, timer_calib_end - timer_calib_start ); @@ -164,11 +164,11 @@ } } -static ulong +static unsigned long load_newworld_rom( int fd ) { int lszz_offs, lszz_size; - ulong entry, data[2]; + unsigned long entry, data[2]; phandle_t ph; lszz_offs = load_elf_rom( &entry, fd ); @@ -315,7 +315,7 @@ OSI_ABlkBlessDisk( 0 /*channel*/, bootunit ); update_nvram(); - transfer_control_to_elf( (ulong)entry ); + transfer_control_to_elf( (unsigned long)entry ); /* won't come here */ return; } @@ -336,7 +336,7 @@ yaboot_startup( void ) { const char *paths[] = { "pseudo:,ofclient", "pseudo:,yaboot", NULL }; - ulong entry; + unsigned long entry; int i, fd; for( i=0; paths[i]; i++ ) { Modified: trunk/openbios-devel/arch/ppc/mol/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/methods.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/mol/methods.c Sun Aug 1 23:25:08 2010 (r830) @@ -52,7 +52,7 @@ { int physbase = POP(); int s=0x1000, size = (int)of_rtas_end - (int)of_rtas_start; - ulong virt; + unsigned long virt; while( s < size ) s += 0x1000; @@ -159,7 +159,7 @@ char keytable[32]; } kbd_state_t; -static const uchar adb_ascii_table[128] = +static const unsigned char adb_ascii_table[128] = /* 0x00 */ "asdfhgzxcv`bqwer" /* 0x10 */ "yt123465=97-80]o" /* 0x20 */ "u[ip\nlj'k;\\,/nm." @@ -169,7 +169,7 @@ /* 0x60 */ " " /* 0x70 */ " "; -static const uchar adb_shift_table[128] = +static const unsigned char adb_shift_table[128] = /* 0x00 */ "ASDFHGZXCV~BQWER" /* 0x10 */ "YT!@#$^%+(&_*)}O" /* 0x20 */ "U{IP\nLJ\"K:|<?NM>" @@ -273,10 +273,10 @@ /* ( -- ) */ static void -ciface_quiesce( ulong args[], ulong ret[] ) +ciface_quiesce( unsigned long args[], unsigned long ret[] ) { #if 0 - ulong msr; + unsigned long msr; /* This seems to be the correct thing to do - but I'm not sure */ asm volatile("mfmsr %0" : "=r" (msr) : ); msr &= ~(MSR_IR | MSR_DR); @@ -290,10 +290,10 @@ /* ( -- ms ) */ static void -ciface_milliseconds( ulong args[], ulong ret[] ) +ciface_milliseconds( unsigned long args[], unsigned long ret[] ) { - static ulong mticks=0, usecs=0; - ulong t; + static unsigned long mticks=0, usecs=0; + unsigned long t; asm volatile("mftb %0" : "=r" (t) : ); if( mticks ) Modified: trunk/openbios-devel/arch/ppc/mol/mol.h ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/mol.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/mol/mol.h Sun Aug 1 23:25:08 2010 (r830) @@ -21,7 +21,7 @@ extern void init_video( void ); extern int video_get_res( int *w, int *h ); extern void draw_pixel( int x, int y, int colind ); -extern void set_color( int index, ulong color ); +extern void set_color( int index, unsigned long color ); /* console.c */ extern int console_draw_str( const char *str ); Modified: trunk/openbios-devel/arch/ppc/mol/osi-scsi.c ============================================================================== --- trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/mol/osi-scsi.c Sun Aug 1 23:25:08 2010 (r830) @@ -52,7 +52,7 @@ /* memset( dest, 0, len ); */ - if( (uint)prelen > sizeof(prebuf) || (uint)postlen > sizeof(postbuf) ) { + if( (unsigned int)prelen > sizeof(prebuf) || (unsigned int)postlen > sizeof(postbuf) ) { printk("bad pre/post len %d %d\n", prelen, postlen ); return 1; } Modified: trunk/openbios-devel/arch/ppc/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/ofmem.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/ofmem.c Sun Aug 1 23:25:08 2010 (r830) @@ -37,7 +37,7 @@ /* called from assembly */ extern void dsi_exception( void ); extern void isi_exception( void ); -extern void setup_mmu( ulong code_base, ulong code_size, ulong ramsize ); +extern void setup_mmu( unsigned long code_base, unsigned long code_size, unsigned long ramsize ); /**************************************************************** * Memory usage (before of_quiesce is called) @@ -74,13 +74,13 @@ #define IO_BASE 0x80000000 #define OFMEM (&s_ofmem) -static inline ulong +static inline unsigned long get_hash_base( void ) { return HASH_BASE; } -static inline ulong +static inline unsigned long get_hash_size( void ) { return HASH_SIZE; @@ -201,7 +201,7 @@ hash_page( ucell ea, ucell phys, ucell mode ) { static int next_grab_slot=0; - ulong *upte, cmp, hash1; + unsigned long *upte, cmp, hash1; int i, vsid, found; mPTE_t *pp; @@ -213,7 +213,7 @@ hash1 &= (get_hash_size() - 1) >> 6; pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); - upte = (ulong*)pp; + upte = (unsigned long*)pp; /* replace old translation */ for( found=0, i=0; !found && i<8; i++ ) @@ -240,7 +240,7 @@ void dsi_exception( void ) { - ulong dar, dsisr; + unsigned long dar, dsisr; ucell mode; ucell phys; @@ -256,7 +256,7 @@ void isi_exception( void ) { - ulong nip, srr1; + unsigned long nip, srr1; ucell mode; ucell phys; @@ -275,11 +275,11 @@ /************************************************************************/ void -setup_mmu( ulong code_base, ulong code_size, ulong ramsize ) +setup_mmu( unsigned long code_base, unsigned long code_size, unsigned long ramsize ) { - ulong sdr1 = HASH_BASE | ((HASH_SIZE-1) >> 16); - ulong sr_base = (0x20 << 24) | SEGR_BASE; - ulong msr; + unsigned long sdr1 = HASH_BASE | ((HASH_SIZE-1) >> 16); + unsigned long sr_base = (0x20 << 24) | SEGR_BASE; + unsigned long msr; int i; asm volatile("mtsdr1 %0" :: "r" (sdr1) ); Modified: trunk/openbios-devel/arch/ppc/osi_calls.h ============================================================================== --- trunk/openbios-devel/arch/ppc/osi_calls.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/osi_calls.h Sun Aug 1 23:25:08 2010 (r830) @@ -107,7 +107,7 @@ #define _osi_call1( type, name, number, type1, arg1 ) \ type name( type1 arg1 ) \ _oc_head( dreg(r6) ) \ - __oc_r6 = (ulong)arg1; \ + __oc_r6 = (unsigned long)arg1; \ _oc_syscall( number ) \ _oc_input( ir(r6) ) \ _oc_tail @@ -115,8 +115,8 @@ #define _osi_call2( type, name, number, t1, a1, t2, a2 ) \ type name( t1 a1, t2 a2 ) \ _oc_head( dreg(r6), dreg(r7) ) \ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ _oc_syscall( number ) \ _oc_input( ir(r6), ir(r7) ) \ _oc_tail @@ -124,9 +124,9 @@ #define _osi_call3( type, name, number, t1, a1, t2, a2, t3, a3 ) \ type name( t1 a1, t2 a2, t3 a3 ) \ _oc_head( dreg(r6), dreg(r7), dreg(r8) ) \ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ - __oc_r8 = (ulong)a3; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ + __oc_r8 = (unsigned long)a3; \ _oc_syscall( number ) \ _oc_input( ir(r6), ir(r7), ir(r8) ) \ _oc_tail @@ -134,10 +134,10 @@ #define _osi_call4( type, name, number, t1, a1, t2, a2, t3, a3, t4, a4 ) \ type name( t1 a1, t2 a2, t3 a3, t4 a4 ) \ _oc_head( dreg(r6), dreg(r7), dreg(r8), dreg(r9) ) \ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ - __oc_r8 = (ulong)a3; \ - __oc_r9 = (ulong)a4; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ + __oc_r8 = (unsigned long)a3; \ + __oc_r9 = (unsigned long)a4; \ _oc_syscall( number ) \ _oc_input( ir(r6), ir(r7), ir(r8), ir(r9) ) \ _oc_tail @@ -145,11 +145,11 @@ #define _osi_call5( type, name, number, t1, a1, t2, a2, t3, a3, t4, a4, t5, a5 ) \ type name( t1 a1, t2 a2, t3 a3, t4 a4, t5 a5 ) \ _oc_head( dreg(r6), dreg(r7), dreg(r8), dreg(r9), dreg(r10) ) \ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ - __oc_r8 = (ulong)a3; \ - __oc_r9 = (ulong)a4; \ - __oc_r10 = (ulong)a5; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ + __oc_r8 = (unsigned long)a3; \ + __oc_r9 = (unsigned long)a4; \ + __oc_r10 = (unsigned long)a5; \ _oc_syscall( number ) \ _oc_input( ir(r6), ir(r7), ir(r8), ir(r9), ir(r10) ) \ _oc_tail @@ -157,12 +157,12 @@ #define _osi_call6( type, name, number, t1, a1, t2, a2, t3, a3, t4, a4, t5, a5, t6, a6 ) \ type name( t1 a1, t2 a2, t3 a3, t4 a4, t5 a5, t6 a6 ) \ _oc_head( dreg(r6), dreg(r7), dreg(r8), dreg(r9), dreg(r10), dreg(r11) )\ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ - __oc_r8 = (ulong)a3; \ - __oc_r9 = (ulong)a4; \ - __oc_r10 = (ulong)a5; \ - __oc_r11 = (ulong)a6; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ + __oc_r8 = (unsigned long)a3; \ + __oc_r9 = (unsigned long)a4; \ + __oc_r10 = (unsigned long)a5; \ + __oc_r11 = (unsigned long)a6; \ _oc_syscall( number ) \ _oc_input( ir(r6), ir(r7), ir(r8), ir(r9), ir(r10), ir(r11) ) \ _oc_tail @@ -186,8 +186,8 @@ _oc_head() \ _oc_syscall( number, rr(r4), rr(r5) ) \ _oc_input() \ - ((ulong*)retarg1)[0] = __oc_r4; \ - ((ulong*)retarg1)[1] = __oc_r5; \ + ((unsigned long*)retarg1)[0] = __oc_r4; \ + ((unsigned long*)retarg1)[1] = __oc_r5; \ _oc_tail /* r4-r8 returned in retarg1 pointer */ @@ -197,68 +197,68 @@ _oc_syscall( number, \ rr(r4), rr(r5), rr(r6), rr(r7), rr(r8) ) \ _oc_input() \ - ((ulong*)retarg1)[0] = __oc_r4; \ - ((ulong*)retarg1)[1] = __oc_r5; \ - ((ulong*)retarg1)[2] = __oc_r6; \ - ((ulong*)retarg1)[3] = __oc_r7; \ - ((ulong*)retarg1)[4] = __oc_r8; \ + ((unsigned long*)retarg1)[0] = __oc_r4; \ + ((unsigned long*)retarg1)[1] = __oc_r5; \ + ((unsigned long*)retarg1)[2] = __oc_r6; \ + ((unsigned long*)retarg1)[3] = __oc_r7; \ + ((unsigned long*)retarg1)[4] = __oc_r8; \ _oc_tail /* r4 returned in retarg pointer */ #define _osi_call1_w1( type, name, number, t1, a1, t2, retarg ) \ type name( t1 a1, t2 retarg ) \ _oc_head( dreg(r6) ) \ - __oc_r6 = (ulong)a1; \ + __oc_r6 = (unsigned long)a1; \ _oc_syscall( number, rr(r4) ) \ _oc_input( ir(r6) ) \ - ((ulong*)retarg)[0] = __oc_r4; \ + ((unsigned long*)retarg)[0] = __oc_r4; \ _oc_tail /* r4,r5 returned in retarg1, retarg2 */ #define _osi_call1_w1w1( type, name, number, t1, a1, t2, retarg1, t3, retarg2 ) \ type name( t1 a1, t2 retarg1, t3 retarg2 ) \ _oc_head( dreg(r6) ) \ - __oc_r6 = (ulong)a1; \ + __oc_r6 = (unsigned long)a1; \ _oc_syscall( number, rr(r4), rr(r5) ) \ _oc_input( ir(r6) ) \ - ((ulong*)retarg1)[0] = __oc_r4; \ - ((ulong*)retarg2)[0] = __oc_r5; \ + ((unsigned long*)retarg1)[0] = __oc_r4; \ + ((unsigned long*)retarg2)[0] = __oc_r5; \ _oc_tail /* r4,r5 returned in retarg1, retarg2, retarg3 */ #define _osi_call1_w1w1w1( type, name, number, t1, a1, t2, retarg1, t3, retarg2, t4, retarg3 ) \ type name( t1 a1, t2 retarg1, t3 retarg2, t4 retarg3 ) \ _oc_head( dreg(r6) ) \ - __oc_r6 = (ulong)a1; \ + __oc_r6 = (unsigned long)a1; \ _oc_syscall( number, rr(r4), rr(r5), rr(r6) ) \ _oc_input( ir(r6) ) \ - ((ulong*)retarg1)[0] = __oc_r4; \ - ((ulong*)retarg2)[0] = __oc_r5; \ - ((ulong*)retarg3)[0] = __oc_r6; \ + ((unsigned long*)retarg1)[0] = __oc_r4; \ + ((unsigned long*)retarg2)[0] = __oc_r5; \ + ((unsigned long*)retarg3)[0] = __oc_r6; \ _oc_tail /* r4,r5 returned in retarg pointer */ #define _osi_call1_w2( type, name, number, t1, a1, t2, retarg ) \ type name( t1 a1, t2 retarg ) \ _oc_head( dreg(r6) ) \ - __oc_r6 = (ulong)a1; \ + __oc_r6 = (unsigned long)a1; \ _oc_syscall( number, rr(r4), rr(r5) ) \ _oc_input( ir(r6) ) \ - ((ulong*)retarg)[0] = __oc_r4; \ - ((ulong*)retarg)[1] = __oc_r5; \ + ((unsigned long*)retarg)[0] = __oc_r4; \ + ((unsigned long*)retarg)[1] = __oc_r5; \ _oc_tail /* r4-r7 returned in retarg pointer */ #define _osi_call1_w4( type, name, number, t1, a1, t2, retarg ) \ type name( t1 a1, t2 retarg ) \ _oc_head( dreg(r6), dreg(r7) ) \ - __oc_r6 = (ulong)a1; \ + __oc_r6 = (unsigned long)a1; \ _oc_syscall( number, rr(r4), rr(r5), rr(r6), rr(r7) ) \ _oc_input( ir(r6) ) \ - ((ulong*)retarg)[0] = __oc_r4; \ - ((ulong*)retarg)[1] = __oc_r5; \ - ((ulong*)retarg)[2] = __oc_r6; \ - ((ulong*)retarg)[3] = __oc_r7; \ + ((unsigned long*)retarg)[0] = __oc_r4; \ + ((unsigned long*)retarg)[1] = __oc_r5; \ + ((unsigned long*)retarg)[2] = __oc_r6; \ + ((unsigned long*)retarg)[3] = __oc_r7; \ _oc_tail @@ -266,26 +266,26 @@ #define _osi_call2_w2( type, name, number, t1, a1, t2, a2, t3, retarg ) \ type name( t1 a1, t2 a2, t3 retarg ) \ _oc_head( dreg(r6), dreg(r7) ) \ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ _oc_syscall( number, rr(r4), rr(r5) ) \ _oc_input( ir(r6), ir(r7) ) \ - ((ulong*)retarg)[0] = __oc_r4; \ - ((ulong*)retarg)[1] = __oc_r5; \ + ((unsigned long*)retarg)[0] = __oc_r4; \ + ((unsigned long*)retarg)[1] = __oc_r5; \ _oc_tail /* r4-r7 returned in retarg pointer */ #define _osi_call2_w4( type, name, number, t1, a1, t2, a2, t3, retarg ) \ type name( t1 a1, t2 a2, t3 retarg ) \ _oc_head( dreg(r6), dreg(r7) ) \ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ _oc_syscall( number, rr(r4), rr(r5), rr(r6), rr(r7) ) \ _oc_input( ir(r6), ir(r7) ) \ - ((ulong*)retarg)[0] = __oc_r4; \ - ((ulong*)retarg)[1] = __oc_r5; \ - ((ulong*)retarg)[2] = __oc_r6; \ - ((ulong*)retarg)[3] = __oc_r7; \ + ((unsigned long*)retarg)[0] = __oc_r4; \ + ((unsigned long*)retarg)[1] = __oc_r5; \ + ((unsigned long*)retarg)[2] = __oc_r6; \ + ((unsigned long*)retarg)[3] = __oc_r7; \ _oc_tail #ifdef SHORT_REGLIST @@ -293,9 +293,9 @@ #define _osi_call2_w6( type, name, number, t1, a1, t2, a2, t3, retarg ) \ type name( t1 a1, t2 a2, t3 retarg ) \ _oc_head( dreg(r6), dreg(r7), dreg(r10) ) \ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ - __oc_r10 = (ulong)retarg; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ + __oc_r10 = (unsigned long)retarg; \ _oc_syscall_r10w6( number, ir(r6), ir(r7) ) \ _oc_tail @@ -305,16 +305,16 @@ #define _osi_call2_w6( type, name, number, t1, a1, t2, a2, t3, retarg ) \ type name( t1 a1, t2 a2, t3 retarg ) \ _oc_head( dreg(r6), dreg(r7), dreg(r8), dreg(r9) ) \ - __oc_r6 = (ulong)a1; \ - __oc_r7 = (ulong)a2; \ + __oc_r6 = (unsigned long)a1; \ + __oc_r7 = (unsigned long)a2; \ _oc_syscall( number, rr(r4), rr(r5), rr(r6), rr(r7), rr(r8), rr(r9) ) \ _oc_input( ir(r6), ir(r7) ) \ - ((ulong*)retarg)[0] = __oc_r4; \ - ((ulong*)retarg)[1] = __oc_r5; \ - ((ulong*)retarg)[2] = __oc_r6; \ - ((ulong*)retarg)[3] = __oc_r7; \ - ((ulong*)retarg)[4] = __oc_r8; \ - ((ulong*)retarg)[5] = __oc_r9; \ + ((unsigned long*)retarg)[0] = __oc_r4; \ + ((unsigned long*)retarg)[1] = __oc_r5; \ + ((unsigned long*)retarg)[2] = __oc_r6; \ + ((unsigned long*)retarg)[3] = __oc_r7; \ + ((unsigned long*)retarg)[4] = __oc_r8; \ + ((unsigned long*)retarg)[5] = __oc_r9; \ _oc_tail #endif /* SHORT_REGLIST */ @@ -332,8 +332,8 @@ static inline _osi_call0( int, OSI_Exit, OSI_EXIT ); /* misc */ -static inline _osi_call0( ulong, OSI_GetLocalTime, OSI_GET_LOCALTIME ); -static inline _osi_call0( ulong, OSI_GetGMTTime, OSI_GET_GMT_TIME ); +static inline _osi_call0( unsigned long, OSI_GetLocalTime, OSI_GET_LOCALTIME ); +static inline _osi_call0( unsigned long, OSI_GetGMTTime, OSI_GET_GMT_TIME ); static inline _osi_call1( int, OSI_USleep, OSI_USLEEP, int, usecs ); /* NVRAM */ @@ -378,7 +378,7 @@ static inline _osi_call1( int, OSI_SoundCntl, OSI_SOUND_CNTL, int, cmd ); static inline _osi_call2( int, OSI_SoundCntl1, OSI_SOUND_CNTL, int, cmd, int, p1 ); static inline _osi_call3( int, OSI_SoundCntl2, OSI_SOUND_CNTL, int, cmd, int, p1, int, p2 ); -static inline _osi_call0_w2( int, OSI_SoundIRQAck, OSI_SOUND_IRQ_ACK, ulong *, timestamp ); +static inline _osi_call0_w2( int, OSI_SoundIRQAck, OSI_SOUND_IRQ_ACK, unsigned long *, timestamp ); static inline _osi_call3( int, OSI_SoundWrite, OSI_SOUND_WRITE, int, physbuf, int, len, int, restart ); static inline _osi_call3( int, OSI_SoundSetVolume, OSI_SOUND_SET_VOLUME, int, hwvol, int, speakervol, int, mute ); @@ -393,9 +393,9 @@ static inline _osi_call2( int, OSI_ABlkCntrl, OSI_ABLK_CNTRL, int, channel, int, cmd ); static inline _osi_call3( int, OSI_ABlkCntrl1, OSI_ABLK_CNTRL, int, channel, int, cmd, int, param ); static inline _osi_call5( int, OSI_ABlkSyncRead, OSI_ABLK_SYNC_READ, int, channel, int, unit, - int, blk, ulong, mphys, int, size ); + int, blk, unsigned long, mphys, int, size ); static inline _osi_call5( int, OSI_ABlkSyncWrite, OSI_ABLK_SYNC_WRITE, int, channel, int, unit, - int, blk, ulong, mphys, int, size ); + int, blk, unsigned long, mphys, int, size ); static inline _osi_call2( int, OSI_ABlkBlessDisk, OSI_ABLK_BLESS_DISK, int, channel, int, unit ); static inline _osi_call0( int, OSI_CMountDrvVol, OSI_CMOUNT_DRV_VOL ); @@ -409,15 +409,15 @@ static inline _osi_call1( int, OSI_Enet2Cntrl, OSI_ENET2_CNTRL, int, cmd ); static inline _osi_call0( int, OSI_Enet2Kick, OSI_ENET2_KICK ); -static inline _osi_call0_w2( int, OSI_Enet2GetHWAddr__, OSI_ENET2_GET_HWADDR, ulong *, retbuf ); +static inline _osi_call0_w2( int, OSI_Enet2GetHWAddr__, OSI_ENET2_GET_HWADDR, unsigned long *, retbuf ); static inline int OSI_Enet2GetHWAddr( unsigned char *addr ) { int ret; - ulong buf[2]; + unsigned long buf[2]; ret = OSI_Enet2GetHWAddr__( buf ); - ((ulong*)addr)[0] = buf[0]; - ((ushort*)addr)[2] = (buf[1] >> 16); + ((unsigned long*)addr)[0] = buf[0]; + ((unsigned short*)addr)[2] = (buf[1] >> 16); return ret; } static inline _osi_call2( int, OSI_Enet2IRQAck, OSI_ENET2_IRQ_ACK, int, irq_enable, int, rx_head ); @@ -430,12 +430,12 @@ static inline _osi_call2( int, OSI_PromPathIface, OSI_PROM_PATH_IFACE, int, what, const char *, p ); /* emulation acceleration */ -static inline _osi_call1( int, OSI_MapinMregs, OSI_MAPIN_MREGS, ulong, mphys ); +static inline _osi_call1( int, OSI_MapinMregs, OSI_MAPIN_MREGS, unsigned long, mphys ); static inline _osi_call3( int, OSI_EmuAccel, OSI_EMUACCEL, int, emuaccel_flags, int, param, int, inst_addr ); /* timer frequency */ -static inline _osi_call1( int, OSI_MticksToUsecs, OSI_MTICKS_TO_USECS, ulong, mticks ); -static inline _osi_call1( int, OSI_UsecsToMticks, OSI_USECS_TO_MTICKS, ulong, usecs ); +static inline _osi_call1( int, OSI_MticksToUsecs, OSI_MTICKS_TO_USECS, unsigned long, mticks ); +static inline _osi_call1( int, OSI_UsecsToMticks, OSI_USECS_TO_MTICKS, unsigned long, usecs ); /* fb info */ struct osi_fb_info; Modified: trunk/openbios-devel/arch/ppc/pearpc/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/pearpc/init.c Sun Aug 1 23:25:08 2010 (r830) @@ -108,8 +108,8 @@ if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { - ulong size = 0x1000; - while( size < (ulong)of_rtas_end - (ulong)of_rtas_start ) + unsigned long size = 0x1000; + while( size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start ) size *= 2; set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); } Modified: trunk/openbios-devel/arch/ppc/pearpc/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/pearpc/main.c Sun Aug 1 23:25:08 2010 (r830) @@ -26,9 +26,9 @@ #include "libopenbios/ofmem.h" static void -transfer_control_to_elf( ulong entry ) +transfer_control_to_elf( unsigned long entry ) { - extern void call_elf( ulong entry ); + extern void call_elf( unsigned long entry ); printk("Starting ELF image at 0x%08lX\n", entry); call_elf( 0x400000 ); //call_elf( entry ); @@ -37,7 +37,7 @@ } static int -load_elf_rom( ulong *entry, int fd ) +load_elf_rom( unsigned long *entry, int fd ) { int i, lszz_offs, elf_offs; char buf[128], *addr; @@ -91,7 +91,7 @@ flush_icache_range( addr, addr+s ); /*printk("ELF ROM-section loaded at %08lX (size %08lX)\n", - (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz );*/ + (unsigned long)phdr[i].p_vaddr, (unsigned long)phdr[i].p_memsz );*/ } free( phdr ); return lszz_offs; @@ -115,7 +115,7 @@ { const char *paths[] = { "hd:0,\\zImage.chrp", NULL }; const char *args[] = { "root=/dev/hda2 console=ttyS0,115200", NULL }; - ulong entry; + unsigned long entry; int i, fd; for( i=0; paths[i]; i++ ) { Modified: trunk/openbios-devel/arch/ppc/pearpc/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/pearpc/methods.c Sun Aug 1 23:25:08 2010 (r830) @@ -37,7 +37,7 @@ { int physbase = POP(); int s=0x1000, size = (int)of_rtas_end - (int)of_rtas_start; - ulong virt; + unsigned long virt; while( s < size ) s += 0x1000; @@ -139,10 +139,10 @@ /* ( -- ) */ static void -ciface_quiesce( ulong args[], ulong ret[] ) +ciface_quiesce( unsigned long args[], unsigned long ret[] ) { #if 0 - ulong msr; + unsigned long msr; /* This seems to be the correct thing to do - but I'm not sure */ asm volatile("mfmsr %0" : "=r" (msr) : ); msr &= ~(MSR_IR | MSR_DR); @@ -153,11 +153,11 @@ /* ( -- ms ) */ static void -ciface_milliseconds( ulong args[], ulong ret[] ) +ciface_milliseconds( unsigned long args[], unsigned long ret[] ) { extern unsigned long get_timer_freq(); - static ulong mticks=0, usecs=0; - ulong t; + static unsigned long mticks=0, usecs=0; + unsigned long t; asm volatile("mftb %0" : "=r" (t) : ); if( mticks ) Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sun Aug 1 23:25:08 2010 (r830) @@ -683,8 +683,8 @@ if( !(ph=find_dev("/rtas")) ) printk("Warning: No /rtas node\n"); else { - ulong size = 0x1000; - while( size < (ulong)of_rtas_end - (ulong)of_rtas_start ) + unsigned long size = 0x1000; + while( size < (unsigned long)of_rtas_end - (unsigned long)of_rtas_start ) size *= 2; set_property( ph, "rtas-size", (char*)&size, sizeof(size) ); } Modified: trunk/openbios-devel/arch/ppc/qemu/kernel.h ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/kernel.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/qemu/kernel.h Sun Aug 1 23:25:08 2010 (r830) @@ -22,7 +22,7 @@ /* start.S */ extern void flush_icache_range( char *start, char *stop ); extern char of_rtas_start[], of_rtas_end[]; -extern void call_elf( ulong arg1, ulong arg2, ulong elf_entry ); +extern void call_elf( unsigned long arg1, unsigned long arg2, unsigned long elf_entry ); /* methods.c */ extern void node_methods_init( const char *cpuname ); Modified: trunk/openbios-devel/arch/ppc/qemu/methods.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/qemu/methods.c Sun Aug 1 23:25:08 2010 (r830) @@ -39,7 +39,7 @@ { ucell physbase = POP(); ucell s=0x1000, size = (ucell)of_rtas_end - (ucell)of_rtas_start; - ulong virt; + unsigned long virt; while( s < size ) s += 0x1000; @@ -110,10 +110,10 @@ /* ( -- ) */ static void -ciface_quiesce( ulong args[], ulong ret[] ) +ciface_quiesce( unsigned long args[], unsigned long ret[] ) { #if 0 - ulong msr; + unsigned long msr; /* This seems to be the correct thing to do - but I'm not sure */ asm volatile("mfmsr %0" : "=r" (msr) : ); msr &= ~(MSR_IR | MSR_DR); @@ -125,10 +125,10 @@ #define TIMER_FREQUENCY 16600000ULL static void -ciface_milliseconds( ulong args[], ulong ret[] ) +ciface_milliseconds( unsigned long args[], unsigned long ret[] ) { - ulong tbu, tbl, temp; - ullong ticks, msecs; + unsigned long tbu, tbl, temp; + unsigned long long ticks, msecs; asm volatile( "1:\n" @@ -141,7 +141,7 @@ : : "cc"); - ticks = (((ullong)tbu) << 32) | (ullong)tbl; + ticks = (((unsigned long long)tbu) << 32) | (unsigned long long)tbl; msecs = (1000 * ticks) / TIMER_FREQUENCY; PUSH( msecs ); } Modified: trunk/openbios-devel/arch/ppc/qemu/ofmem.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/qemu/ofmem.c Sun Aug 1 23:25:08 2010 (r830) @@ -28,7 +28,7 @@ /* called from assembly */ extern void dsi_exception( void ); extern void isi_exception( void ); -extern void setup_mmu( ulong code_base ); +extern void setup_mmu( unsigned long code_base ); /* * From Apple's BootX source comments: @@ -56,43 +56,43 @@ #define SEGR_USER BIT(2) #define SEGR_BASE 0x0400 -static inline ulong +static inline unsigned long get_hash_base( void ) { - ulong sdr1; + unsigned long sdr1; asm volatile("mfsdr1 %0" : "=r" (sdr1) ); return (sdr1 & 0xffff0000); } -static inline ulong +static inline unsigned long get_hash_size( void ) { - ulong sdr1; + unsigned long sdr1; asm volatile("mfsdr1 %0" : "=r" (sdr1) ); return ((sdr1 << 16) | 0x0000ffff) + 1; } -static inline ulong +static inline unsigned long get_rom_base( void ) { ofmem_t *ofmem = ofmem_arch_get_private(); return ofmem->ramsize - 0x00100000; } -ulong +unsigned long get_ram_top( void ) { return get_rom_base() - HASH_SIZE - (32 + 32 + 64) * 1024; } -ulong +unsigned long get_ram_bottom( void ) { - return (ulong)FREE_BASE; + return (unsigned long)FREE_BASE; } static ucell get_heap_top( void ) @@ -236,7 +236,7 @@ static int next_grab_slot=0; uint64_t vsid_mask, page_mask, pgidx, hash; uint64_t htab_mask, mask, avpn; - ulong pgaddr; + unsigned long pgaddr; int i, found; unsigned int vsid, vsid_sh, sdr, sdr_sh, sdr_mask; mPTE_64_t *pp; @@ -300,7 +300,7 @@ hash_page_32( ucell ea, ucell phys, ucell mode ) { static int next_grab_slot=0; - ulong *upte, cmp, hash1; + unsigned long *upte, cmp, hash1; int i, vsid, found; mPTE_t *pp; @@ -312,7 +312,7 @@ hash1 &= (get_hash_size() - 1) >> 6; pp = (mPTE_t*)(get_hash_base() + (hash1 << 6)); - upte = (ulong*)pp; + upte = (unsigned long*)pp; /* replace old translation */ for( found=0, i=0; !found && i<8; i++ ) @@ -344,7 +344,7 @@ return ((pvr >= 0x330000) && (pvr < 0x70330000)); } -static void hash_page( ulong ea, ulong phys, ucell mode ) +static void hash_page( unsigned long ea, unsigned long phys, ucell mode ) { if ( is_ppc64() ) hash_page_64(ea, phys, mode); @@ -355,7 +355,7 @@ void dsi_exception( void ) { - ulong dar, dsisr; + unsigned long dar, dsisr; ucell mode; ucell phys; @@ -369,7 +369,7 @@ void isi_exception( void ) { - ulong nip, srr1; + unsigned long nip, srr1; ucell mode; ucell phys; @@ -386,12 +386,12 @@ /************************************************************************/ void -setup_mmu( ulong ramsize ) +setup_mmu( unsigned long ramsize ) { ofmem_t *ofmem = OFMEM; - ulong sdr1, sr_base, msr; - ulong hash_base; - ulong hash_mask = 0xffff0000; + unsigned long sdr1, sr_base, msr; + unsigned long hash_base; + unsigned long hash_mask = 0xffff0000; int i; memset(ofmem, 0, sizeof(ofmem_t)); Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sun Aug 1 23:25:08 2010 (r830) @@ -524,7 +524,7 @@ #define CACHE_LINE_SIZE 32 #define LG_CACHE_LINE_SIZE 5 -/* flush_icache_range( ulong start, ulong stop) */ +/* flush_icache_range( unsigned long start, unsigned long stop) */ GLOBL(flush_icache_range): li r5,CACHE_LINE_SIZE-1 andc r3,r3,r5 Modified: trunk/openbios-devel/arch/ppc/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/start.S Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/ppc/start.S Sun Aug 1 23:25:08 2010 (r830) @@ -312,7 +312,7 @@ #define CACHE_LINE_SIZE 32 #define LG_CACHE_LINE_SIZE 5 -/* flush_icache_range( ulong start, ulong stop) */ +/* flush_icache_range( unsigned long start, unsigned long stop) */ GLOBL(flush_icache_range): li r5,CACHE_LINE_SIZE-1 andc r3,r3,r5 Modified: trunk/openbios-devel/arch/sparc32/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/linux_load.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/sparc32/linux_load.c Sun Aug 1 23:25:08 2010 (r830) @@ -161,7 +161,7 @@ static unsigned long file_size(void) { - llong fpos, fsize; + long long fpos, fsize; /* Save current position */ fpos = tell(fd); Modified: trunk/openbios-devel/arch/sparc64/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/linux_load.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/sparc64/linux_load.c Sun Aug 1 23:25:08 2010 (r830) @@ -161,7 +161,7 @@ static unsigned long file_size(void) { - llong fpos, fsize; + long long fpos, fsize; /* Save current position */ fpos = tell(fd); Modified: trunk/openbios-devel/arch/unix/boot.c ============================================================================== --- trunk/openbios-devel/arch/unix/boot.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/unix/boot.c Sun Aug 1 23:25:08 2010 (r830) @@ -36,7 +36,7 @@ return NULL; } - (ullong *)entry = ehdr.e_entry; + (unsigned long long *)entry = ehdr.e_entry; lszz_offs = elf_offs; for( i=0; i<ehdr.e_phnum; i++ ) { @@ -52,7 +52,7 @@ continue; printk("ELF ROM-section loaded at %08lX (size %08lX)\n", - (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz); + (unsigned long)phdr[i].p_vaddr, (unsigned long)phdr[i].p_memsz); } free( phdr ); return entry; Modified: trunk/openbios-devel/arch/x86/linux_load.c ============================================================================== --- trunk/openbios-devel/arch/x86/linux_load.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/arch/x86/linux_load.c Sun Aug 1 23:25:08 2010 (r830) @@ -162,7 +162,7 @@ static unsigned long file_size(void) { - llong fpos, fsize; + long long fpos, fsize; /* Save current position */ fpos = tell(fd); Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Aug 1 23:25:08 2010 (r830) @@ -157,7 +157,7 @@ static void ext2_files_seek( ext2_info_t *mi ) { - llong pos = DPOP(); + long long pos = DPOP(); int offs = (int)pos; int whence = SEEK_SET; int ret; @@ -263,7 +263,7 @@ ext2_files_probe( ext2_info_t *dummy ) { ihandle_t ih = POP_ih(); - llong offs = DPOP(); + long long offs = DPOP(); int fd, ret = 0; fd = open_ih(ih); Modified: trunk/openbios-devel/fs/ext2/ext2_utils.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/ext2/ext2_utils.c Sun Aug 1 23:25:08 2010 (r830) @@ -12,7 +12,7 @@ #include "libc/diskio.h" #include "libc/byteorder.h" -int ext2_probe(int fd, llong offset) +int ext2_probe(int fd, long long offset) { struct ext2_super_block *super; @@ -81,7 +81,7 @@ void ext2_read_block(ext2_VOLUME* volume, unsigned int fsblock) { - llong offset; + long long offset; if (fsblock == volume->current) return; Modified: trunk/openbios-devel/fs/ext2/ext2_utils.h ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_utils.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/ext2/ext2_utils.h Sun Aug 1 23:25:08 2010 (r830) @@ -36,7 +36,7 @@ /* utilities */ -extern int ext2_probe(int fd, llong offset); +extern int ext2_probe(int fd, long long offset); extern void ext2_get_super(int fd, struct ext2_super_block *super); extern void ext2_read_block(ext2_VOLUME* volume, unsigned int fsblock); extern void ext2_get_group_desc(ext2_VOLUME* volume, Modified: trunk/openbios-devel/fs/grubfs/defs.h ============================================================================== --- trunk/openbios-devel/fs/grubfs/defs.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/grubfs/defs.h Sun Aug 1 23:25:08 2010 (r830) @@ -42,14 +42,6 @@ #define btodb(byte_offset) ((byte_offset) >> 9) #define dbtob(block_number) ((block_number) << 9) -/* - * Compatibility definitions for old type names. - */ - -typedef unsigned char u_char; /* unsigned char */ -typedef unsigned short u_short; /* unsigned short */ -typedef unsigned int u_int; /* unsigned int */ - typedef struct _quad_ { unsigned int val[2]; /* 2 int values make... */ Modified: trunk/openbios-devel/fs/grubfs/dir.h ============================================================================== --- trunk/openbios-devel/fs/grubfs/dir.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/grubfs/dir.h Sun Aug 1 23:25:08 2010 (r830) @@ -76,9 +76,9 @@ struct direct { - u_int d_ino; /* inode number of entry */ - u_short d_reclen; /* length of this record */ - u_short d_namlen; /* length of string in d_name */ + unsigned int d_ino; /* inode number of entry */ + unsigned short d_reclen; /* length of this record */ + unsigned short d_namlen; /* length of string in d_name */ char d_name[MAXNAMLEN + 1]; /* name with length <= MAXNAMLEN */ }; @@ -100,11 +100,11 @@ */ struct dirtemplate { - u_int dot_ino; + unsigned int dot_ino; short dot_reclen; short dot_namlen; char dot_name[4]; /* must be multiple of 4 */ - u_int dotdot_ino; + unsigned int dotdot_ino; short dotdot_reclen; short dotdot_namlen; char dotdot_name[4]; /* ditto */ Modified: trunk/openbios-devel/fs/grubfs/disk_inode.h ============================================================================== --- trunk/openbios-devel/fs/grubfs/disk_inode.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/grubfs/disk_inode.h Sun Aug 1 23:25:08 2010 (r830) @@ -61,7 +61,7 @@ struct icommon { - u_short ic_mode; /* 0: mode and type of file */ + unsigned short ic_mode; /* 0: mode and type of file */ short ic_nlink; /* 2: number of links to file */ mach_uid_t ic_uid; /* 4: owner's user id */ mach_gid_t ic_gid; /* 6: owner's group id */ Modified: trunk/openbios-devel/fs/grubfs/fs.h ============================================================================== --- trunk/openbios-devel/fs/grubfs/fs.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/grubfs/fs.h Sun Aug 1 23:25:08 2010 (r830) @@ -231,9 +231,9 @@ int fs_postblformat; /* format of positional layout tables */ int fs_nrpos; /* number of rotaional positions */ int fs_postbloff; /* (short) rotation block list head */ - int fs_rotbloff; /* (u_char) blocks for each rotation */ + int fs_rotbloff; /* (char) blocks for each rotation */ int fs_magic; /* magic number */ - u_char fs_space[1]; /* list of blocks for each rotation */ + unsigned char fs_space[1]; /* list of blocks for each rotation */ /* actually longer */ }; /* @@ -257,7 +257,7 @@ #define fs_rotbl(fs) \ (((fs)->fs_postblformat == FS_42POSTBLFMT) \ ? ((fs)->fs_space) \ - : ((u_char *)((char *)(fs) + (fs)->fs_rotbloff))) + : ((unsigned char *)((char *)(fs) + (fs)->fs_rotbloff))) /* * Convert cylinder group to base address of its global summary info. @@ -288,10 +288,10 @@ int cg_btotoff; /* (long) block totals per cylinder */ int cg_boff; /* (short) free block positions */ int cg_iusedoff; /* (char) used inode map */ - int cg_freeoff; /* (u_char) free block map */ - int cg_nextfreeoff; /* (u_char) next available space */ + int cg_freeoff; /* (char) free block map */ + int cg_nextfreeoff; /* (char) next available space */ int cg_sparecon[16]; /* reserved for future use */ - u_char cg_space[1]; /* space for cylinder group maps */ + unsigned char cg_space[1]; /* space for cylinder group maps */ /* actually longer */ }; /* @@ -312,7 +312,7 @@ #define cg_blksfree(cgp) \ (((cgp)->cg_magic != CG_MAGIC) \ ? (((struct ocg *)(cgp))->cg_free) \ - : ((u_char *)((char *)(cgp) + (cgp)->cg_freeoff))) + : ((unsigned char *)((char *)(cgp) + (cgp)->cg_freeoff))) #define cg_chkmagic(cgp) \ ((cgp)->cg_magic == CG_MAGIC || ((struct ocg *)(cgp))->cg_magic == CG_MAGIC) @@ -338,7 +338,7 @@ short cg_b[32][8]; /* positions of free blocks */ char cg_iused[256]; /* used inode map */ int cg_magic; /* magic number */ - u_char cg_free[1]; /* free block map */ + unsigned char cg_free[1]; /* free block map */ /* actually longer */ }; Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Aug 1 23:25:08 2010 (r830) @@ -100,7 +100,7 @@ const struct fsys_entry *fsys; grubfile_t *fd; int dev_fd; - llong offset; /* Offset added onto each device read; should only ever be non-zero + long long offset; /* Offset added onto each device read; should only ever be non-zero when probing a partition for a filesystem */ } grubfs_t; @@ -123,7 +123,7 @@ devread( unsigned long sector, unsigned long byte_offset, unsigned long byte_len, void *buf ) { - llong offs = (llong)sector * 512 + byte_offset; + long long offs = (long long)sector * 512 + byte_offset; #ifdef CONFIG_DEBUG_FS //printk("devread s=%x buf=%x, fd=%x\n",sector, buf, curfs->dev_fd); @@ -260,7 +260,7 @@ static void grubfs_files_seek( grubfs_info_t *mi ) { - llong pos = DPOP(); + long long pos = DPOP(); int offs = (int)pos; int whence = SEEK_SET; @@ -332,7 +332,7 @@ grubfs_files_probe( grubfs_info_t *dummy ) { ihandle_t ih = POP_ih(); - llong offs = DPOP(); + long long offs = DPOP(); int i; curfs->dev_fd = open_ih(ih); Modified: trunk/openbios-devel/fs/grubfs/iso9660.h ============================================================================== --- trunk/openbios-devel/fs/grubfs/iso9660.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/grubfs/iso9660.h Sun Aug 1 23:25:08 2010 (r830) @@ -57,23 +57,19 @@ #ifndef ASM_FILE -typedef uint8_t u_int8_t; -typedef uint16_t u_int16_t; -typedef uint32_t u_int32_t; - typedef union { - u_int8_t l,b; + uint8_t l,b; } iso_8bit_t; typedef struct __iso_16bit { - u_int16_t l, b; + uint16_t l, b; } iso_16bit_t; typedef struct __iso_32bit { - u_int32_t l, b; + uint32_t l, b; } iso_32bit_t; -typedef u_int8_t iso_date_t[7]; +typedef uint8_t iso_date_t[7]; struct iso_directory_record { iso_8bit_t length; @@ -86,49 +82,49 @@ iso_8bit_t interleave; iso_16bit_t volume_seq_number; iso_8bit_t name_len; - u_int8_t name[1]; + uint8_t name[1]; } __attribute__ ((packed)); struct iso_primary_descriptor { iso_8bit_t type; - u_int8_t id[5]; + uint8_t id[5]; iso_8bit_t version; - u_int8_t _unused1[1]; - u_int8_t system_id[32]; - u_int8_t volume_id[32]; - u_int8_t _unused2[8]; + uint8_t _unused1[1]; + uint8_t system_id[32]; + uint8_t volume_id[32]; + uint8_t _unused2[8]; iso_32bit_t volume_space_size; - u_int8_t _unused3[32]; + uint8_t _unused3[32]; iso_16bit_t volume_set_size; iso_16bit_t volume_seq_number; iso_16bit_t logical_block_size; iso_32bit_t path_table_size; - u_int8_t type_l_path_table[4]; - u_int8_t opt_type_l_path_table[4]; - u_int8_t type_m_path_table[4]; - u_int8_t opt_type_m_path_table[4]; + uint8_t type_l_path_table[4]; + uint8_t opt_type_l_path_table[4]; + uint8_t type_m_path_table[4]; + uint8_t opt_type_m_path_table[4]; struct iso_directory_record root_directory_record; - u_int8_t volume_set_id[128]; - u_int8_t publisher_id[128]; - u_int8_t preparer_id[128]; - u_int8_t application_id[128]; - u_int8_t copyright_file_id[37]; - u_int8_t abstract_file_id[37]; - u_int8_t bibliographic_file_id[37]; - u_int8_t creation_date[17]; - u_int8_t modification_date[17]; - u_int8_t expiration_date[17]; - u_int8_t effective_date[17]; + uint8_t volume_set_id[128]; + uint8_t publisher_id[128]; + uint8_t preparer_id[128]; + uint8_t application_id[128]; + uint8_t copyright_file_id[37]; + uint8_t abstract_file_id[37]; + uint8_t bibliographic_file_id[37]; + uint8_t creation_date[17]; + uint8_t modification_date[17]; + uint8_t expiration_date[17]; + uint8_t effective_date[17]; iso_8bit_t file_structure_version; - u_int8_t _unused4[1]; - u_int8_t application_data[512]; - u_int8_t _unused5[653]; + uint8_t _unused4[1]; + uint8_t application_data[512]; + uint8_t _unused5[653]; } __attribute__ ((packed)); struct rock_ridge { - u_int16_t signature; - u_int8_t len; - u_int8_t version; + uint16_t signature; + uint8_t len; + uint8_t version; union { struct CE { iso_32bit_t extent; @@ -137,7 +133,7 @@ } ce; struct NM { iso_8bit_t flags; - u_int8_t name[0]; + uint8_t name[0]; } nm; struct PX { iso_32bit_t mode; Modified: trunk/openbios-devel/fs/hfs/hfs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfs/hfs.c Sun Aug 1 23:25:08 2010 (r830) @@ -741,7 +741,7 @@ * NAME: hfs->probe() * DESCRIPTION: return whether a HFS filesystem is present at the given offset */ -int hfs_probe(int fd, llong offset) +int hfs_probe(int fd, long long offset) { return v_probe(fd, offset); } Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Aug 1 23:25:08 2010 (r830) @@ -55,7 +55,7 @@ /************************************************************************/ static int -_find_file( hfsvol *vol, const char *path, ulong type, ulong creator ) +_find_file( hfsvol *vol, const char *path, unsigned long type, unsigned long creator ) { hfsdirent ent; hfsdir *dir; @@ -67,7 +67,7 @@ while( ret && !hfs_readdir(dir, &ent) ) { if( ent.flags & HFS_ISDIR ) continue; - ret = !(*(ulong*)ent.u.file.type == type && *(ulong*)ent.u.file.creator == creator ); + ret = !(*(unsigned long*)ent.u.file.type == type && *(unsigned long*)ent.u.file.creator == creator ); } hfs_closedir( dir ); @@ -96,7 +96,7 @@ /* printk("DIRECTORY: %s\n", path ); */ while( status && !hfs_readdir(dir, &ent) ) { - ulong type, creator; + unsigned long type, creator; *p = 0; topdir = 0; @@ -112,8 +112,8 @@ continue; } - type = *(ulong*)ent.u.file.type; - creator = *(ulong*)ent.u.file.creator; + type = *(unsigned long*)ent.u.file.type; + creator = *(unsigned long*)ent.u.file.creator; /* look for Mac OS ROM, System and Finder in the same directory */ if( type == MAC_OS_ROM_TYPE && creator == MAC_OS_ROM_CREATOR ) { @@ -372,7 +372,7 @@ static void hfs_files_seek( hfs_info_t *mi ) { - llong pos = DPOP(); + long long pos = DPOP(); int offs = (int)pos; int whence = SEEK_SET; int ret; @@ -437,7 +437,7 @@ hfsvol *vol = hfs_getvol( NULL ); hfsdirent ent; int start, ns; - ulong id; + unsigned long id; if (common->type != FILE) RET( 0 ); @@ -542,7 +542,7 @@ hfs_files_probe( hfs_info_t *dummy ) { ihandle_t ih = POP_ih(); - llong offs = DPOP(); + long long offs = DPOP(); int fd, ret = 0; fd = open_ih(ih); Modified: trunk/openbios-devel/fs/hfs/include/hfs.h ============================================================================== --- trunk/openbios-devel/fs/hfs/include/hfs.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfs/include/hfs.h Sun Aug 1 23:25:08 2010 (r830) @@ -177,4 +177,4 @@ int hfs_format(const char *, int, int, const char *, unsigned int, const unsigned long []); -int hfs_probe(int fd, llong offset); +int hfs_probe(int fd, long long offset); Modified: trunk/openbios-devel/fs/hfs/include/volume.h ============================================================================== --- trunk/openbios-devel/fs/hfs/include/volume.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfs/include/volume.h Sun Aug 1 23:25:08 2010 (r830) @@ -66,6 +66,6 @@ int v_scavenge(hfsvol *); -int v_probe(int fd, llong offset); +int v_probe(int fd, long long offset); #endif /* _H_VOLUME */ Modified: trunk/openbios-devel/fs/hfs/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfs/volume.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfs/volume.c Sun Aug 1 23:25:08 2010 (r830) @@ -594,7 +594,7 @@ /* Determine whether the volume is a HFS volume */ int -v_probe(int fd, llong offset) +v_probe(int fd, long long offset) { MDB *mdb; Modified: trunk/openbios-devel/fs/hfs_mdb.h ============================================================================== --- trunk/openbios-devel/fs/hfs_mdb.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfs_mdb.h Sun Aug 1 23:25:08 2010 (r830) @@ -89,27 +89,27 @@ typedef struct hfs_plus_mdb { - ushort signature; - ushort version; - uint attributes; - uint lastMountedVersion; - uint reserved; - - uint createDate; - uint modifyDate; - uint backupDate; - uint checkedDate; - - uint fileCount; - uint folderCount; - - uint blockSize; - uint totalBlocks; - uint freeBlocks; - - uint nextAllocation; - uint rsrcClumpSize; - uint dataClumpSize; + unsigned short signature; + unsigned short version; + unsigned int attributes; + unsigned int lastMountedVersion; + unsigned int reserved; + + unsigned int createDate; + unsigned int modifyDate; + unsigned int backupDate; + unsigned int checkedDate; + + unsigned int fileCount; + unsigned int folderCount; + + unsigned int blockSize; + unsigned int totalBlocks; + unsigned int freeBlocks; + + unsigned int nextAllocation; + unsigned int rsrcClumpSize; + unsigned int dataClumpSize; /* ... there are more fields here ... */ } hfs_plus_mdb_t; Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Aug 1 23:25:08 2010 (r830) @@ -314,7 +314,7 @@ static void hfsp_files_seek( hfsp_info_t *mi ) { - llong pos = DPOP(); + long long pos = DPOP(); int offs = (int)pos; int whence = SEEK_SET; @@ -448,7 +448,7 @@ hfsp_files_probe( hfsp_info_t *dummy ) { ihandle_t ih = POP_ih(); - llong offs = DPOP(); + long long offs = DPOP(); int fd, ret = 0; fd = open_ih(ih); Modified: trunk/openbios-devel/fs/hfsplus/include/volume.h ============================================================================== --- trunk/openbios-devel/fs/hfsplus/include/volume.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfsplus/include/volume.h Sun Aug 1 23:25:08 2010 (r830) @@ -73,7 +73,7 @@ } /* Determine whether the volume is a HFS-plus volume */ -int volume_probe(int fd, llong offset); +int volume_probe(int fd, long long offset); #ifdef DEBUG /* Print raw fork information to stdout */ Modified: trunk/openbios-devel/fs/hfsplus/volume.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/volume.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/hfsplus/volume.c Sun Aug 1 23:25:08 2010 (r830) @@ -292,7 +292,7 @@ /* Determine whether the volume is a HFS-plus volume */ int -volume_probe(int fd, llong offset) +volume_probe(int fd, long long offset) { UInt16 *vol; int ret = 0; Modified: trunk/openbios-devel/fs/ioglue.c ============================================================================== --- trunk/openbios-devel/fs/ioglue.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/ioglue.c Sun Aug 1 23:25:08 2010 (r830) @@ -47,8 +47,8 @@ return buf; } -ulong -os_read( int fd, void *buf, ulong len, int blksize_bits ) +unsigned long +os_read( int fd, void *buf, unsigned long len, int blksize_bits ) { /* printk("os_read %d\n", (int)len); */ @@ -56,11 +56,11 @@ return (cnt > 0)? (cnt >> blksize_bits) : cnt; } -ulong -os_seek( int fd, ulong blknum, int blksize_bits ) +unsigned long +os_seek( int fd, unsigned long blknum, int blksize_bits ) { /* printk("os_seek %d\n", blknum ); */ - llong offs = (llong)blknum << blksize_bits; + long long offs = (long long)blknum << blksize_bits; /* offset == -1 means seek to EOF */ if( (int)blknum == -1 ) @@ -68,7 +68,7 @@ if( seek_io(fd, offs) ) { /* printk("os_seek failure\n"); */ - return (ulong)-1; + return (unsigned long)-1; } if( (int)blknum == -1 ) { @@ -80,7 +80,7 @@ } void -os_seek_offset( int fd, llong offset ) +os_seek_offset( int fd, long long offset ) { seek_io(fd, offset); } Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Aug 1 23:25:08 2010 (r830) @@ -105,7 +105,7 @@ static void iso9660_files_seek( iso9660_info_t *mi ) { - llong pos = DPOP(); + long long pos = DPOP(); cell ret; int offs = (int)pos; int whence = SEEK_SET; @@ -215,7 +215,7 @@ iso9660_files_probe( iso9660_info_t *dummy ) { ihandle_t ih = POP_ih(); - llong offs = DPOP(); + long long offs = DPOP(); int fd, ret = 0; fd = open_ih(ih); Modified: trunk/openbios-devel/fs/iso9660/iso9660_mount.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Aug 1 23:25:08 2010 (r830) @@ -189,7 +189,7 @@ return 0; } -int iso9660_probe(int fd, llong offset) +int iso9660_probe(int fd, long long offset) { struct iso_primary_descriptor ipd; Modified: trunk/openbios-devel/fs/iso9660/libiso9660.h ============================================================================== --- trunk/openbios-devel/fs/iso9660/libiso9660.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/iso9660/libiso9660.h Sun Aug 1 23:25:08 2010 (r830) @@ -14,7 +14,7 @@ extern iso9660_VOLUME* iso9660_mount(int fd); extern int iso9660_umount(iso9660_VOLUME *volume); -extern int iso9660_probe(int fd, llong offs); +extern int iso9660_probe(int fd, long long offs); extern iso9660_DIR* iso9660_opendir(iso9660_VOLUME *, const char *name); extern iso9660_FILE* iso9660_open(iso9660_VOLUME *, const char *pathname); extern int iso9660_closedir(iso9660_DIR *dir); Modified: trunk/openbios-devel/fs/os.h ============================================================================== --- trunk/openbios-devel/fs/os.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/fs/os.h Sun Aug 1 23:25:08 2010 (r830) @@ -51,7 +51,7 @@ * NAME: os->seek_offset() * DESCRIPTION: set a descriptor's seek pointer (offset in bytes) */ -void os_seek_offset( int fd, llong offset ); +void os_seek_offset( int fd, long long offset ); #endif /* _H_OS */ Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/include/arch/ppc/processor.h Sun Aug 1 23:25:08 2010 (r830) @@ -389,15 +389,15 @@ /* opcode macros */ -#define OPCODE_PRIM(n) ( ((ulong)(n)) >> 26 ) -#define OPCODE_EXT(n) ( (((ulong)(n)) >> 1) & 0x3ff ) +#define OPCODE_PRIM(n) ( ((unsigned long)(n)) >> 26 ) +#define OPCODE_EXT(n) ( (((unsigned long)(n)) >> 1) & 0x3ff ) #define OPCODE(op,op_ext) ( ((op)<<10) + op_ext ) -#define B1(n) ( (((ulong)(n)) >> 21) & 0x1f ) -#define B2(n) ( (((ulong)(n)) >> 16) & 0x1f ) -#define B3(n) ( (((ulong)(n)) >> 11) & 0x1f ) +#define B1(n) ( (((unsigned long)(n)) >> 21) & 0x1f ) +#define B2(n) ( (((unsigned long)(n)) >> 16) & 0x1f ) +#define B3(n) ( (((unsigned long)(n)) >> 11) & 0x1f ) -#define BD(n) ((ulong)((n) & 0x7fff) + (((n) & 0x8000) ? (ulong)0xffff8000 : 0)) +#define BD(n) ((unsigned long)((n) & 0x7fff) + (((n) & 0x8000) ? (unsigned long)0xffff8000 : 0)) #define SPRNUM_FLIP( v ) ( (((v)>>5) & 0x1f) | (((v)<<5) & 0x3e0) ) Modified: trunk/openbios-devel/include/config.h ============================================================================== --- trunk/openbios-devel/include/config.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/include/config.h Sun Aug 1 23:25:08 2010 (r830) @@ -23,14 +23,6 @@ #define PROGRAM_NAME "OpenBIOS" -typedef unsigned long ulong; -typedef unsigned int uint; -typedef unsigned short ushort; -typedef unsigned char uchar; - -typedef unsigned long long ullong; -typedef long long llong; - #ifndef BOOTSTRAP #ifndef NULL @@ -44,7 +36,7 @@ typedef unsigned int time_t; -#define UINT_MAX ((uint)-1) +#define UINT_MAX ((unsigned int)-1) #define ENOMEM 1 #define EIO 2 Modified: trunk/openbios-devel/include/fs/fs.h ============================================================================== --- trunk/openbios-devel/include/fs/fs.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/include/fs/fs.h Sun Aug 1 23:25:08 2010 (r830) @@ -53,42 +53,42 @@ #ifdef CONFIG_HFSP extern int fs_hfsp_open( int fd, fs_ops_t *fs ); -extern int fs_hfsp_probe( int fd, llong offs ); +extern int fs_hfsp_probe( int fd, long long offs ); #else static inline int fs_hfsp_open( int fd, fs_ops_t *fs ) { return -1; } -static inline int fs_hfsp_probe( int fd, llong offs ) { return -1; } +static inline int fs_hfsp_probe( int fd, long long offs ) { return -1; } #endif #ifdef CONFIG_HFS extern int fs_hfs_open( int fd, fs_ops_t *fs ); -extern int fs_hfs_probe( int fd, llong offs ); +extern int fs_hfs_probe( int fd, long long offs ); #else static inline int fs_hfs_open( int fd, fs_ops_t *fs ) { return -1; } -static inline int fs_hfs_probe( int fd, llong offs ) { return -1; } +static inline int fs_hfs_probe( int fd, long long offs ) { return -1; } #endif #ifdef CONFIG_ISO9660 extern int fs_iso9660_open( int fd, fs_ops_t *fs ); -extern int fs_iso9660_probe( int fd, llong offs ); +extern int fs_iso9660_probe( int fd, long long offs ); #else static inline int fs_iso9660_open( int fd, fs_ops_t *fs ) { return -1; } -static inline int fs_iso9660_probe( int fd, llong offs ) { return -1; } +static inline int fs_iso9660_probe( int fd, long long offs ) { return -1; } #endif #ifdef CONFIG_EXT2 extern int fs_ext2_open( int fd, fs_ops_t *fs ); -extern int fs_ext2_probe( int fd, llong offs ); +extern int fs_ext2_probe( int fd, long long offs ); #else static inline int fs_ext2_open( int fd, fs_ops_t *fs ) { return -1; } -static inline int fs_ext2_probe( int fd, llong offs ) { return -1; } +static inline int fs_ext2_probe( int fd, long long offs ) { return -1; } #endif #ifdef CONFIG_GRUBFS extern int fs_grubfs_open( int fd, fs_ops_t *fs ); -extern int fs_grubfs_probe( int fd, llong offs ); +extern int fs_grubfs_probe( int fd, long long offs ); #else static inline int fs_grubfs_open( int fd, fs_ops_t *fs ) { return -1; } -static inline int fs_grubfs_probe( int fd, llong offs ) { return -1; } +static inline int fs_grubfs_probe( int fd, long long offs ) { return -1; } #endif Modified: trunk/openbios-devel/include/libc/diskio.h ============================================================================== --- trunk/openbios-devel/include/libc/diskio.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/include/libc/diskio.h Sun Aug 1 23:25:08 2010 (r830) @@ -21,8 +21,8 @@ extern int open_io( const char *spec ); extern int close_io( int fd ); extern int read_io( int fd, void *buf, size_t cnt ); -extern int seek_io( int fd, llong offs ); -extern llong tell( int fd ); +extern int seek_io( int fd, long long offs ); +extern long long tell( int fd ); extern int reopen( int fd, const char *filename ); extern int reopen_nwrom( int fd ); extern ihandle_t get_ih_from_fd( int fd ); Modified: trunk/openbios-devel/include/libopenbios/ofmem.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/ofmem.h Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/include/libopenbios/ofmem.h Sun Aug 1 23:25:08 2010 (r830) @@ -108,8 +108,8 @@ #ifdef CONFIG_PPC #define PAGE_SHIFT 12 -ulong get_ram_top( void ); -ulong get_ram_bottom( void ); +unsigned long get_ram_top( void ); +unsigned long get_ram_bottom( void ); #elif defined(CONFIG_SPARC32) #define PAGE_SHIFT 12 Modified: trunk/openbios-devel/libc/diskio.c ============================================================================== --- trunk/openbios-devel/libc/diskio.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/libc/diskio.c Sun Aug 1 23:25:08 2010 (r830) @@ -185,7 +185,7 @@ } int -seek_io( int fd, llong offs ) +seek_io( int fd, long long offs ) { priv_fd_t *fdp; @@ -200,11 +200,11 @@ } } -llong +long long tell( int fd ) { priv_fd_t *fdp = file_descriptors[fd]; - llong offs; + long long offs; if( lookup_xt(fdp->ih, "tell", &fdp->tell_xt) ) return -1; Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/libopenbios/client.c Sun Aug 1 23:25:08 2010 (r830) @@ -35,7 +35,7 @@ const char *service; long nargs; long nret; - ulong args[PROM_MAX_ARGS]; + unsigned long args[PROM_MAX_ARGS]; } prom_args_t; #ifdef DEBUG_CIF Modified: trunk/openbios-devel/libopenbios/console_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/console_common.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/libopenbios/console_common.c Sun Aug 1 23:25:08 2010 (r830) @@ -56,13 +56,13 @@ static int get_conschar( int x, int y ) { - if( (uint)x < cons.w && (uint)y < cons.h ) + if( (unsigned int)x < cons.w && (unsigned int)y < cons.h ) return cons.buf[y*cons.w + x]; return ' '; } static void -draw_char( uint h, uint v ) +draw_char( unsigned int h, unsigned int v ) { const unsigned char *c = fontdata; int x, y, xx, rskip, m; @@ -152,7 +152,7 @@ static void rec_char( int ch, int x, int y ) { - if( (uint)x < cons.w && (uint)y < cons.h ) { + if( (unsigned int)x < cons.w && (unsigned int)y < cons.h ) { cons.buf[y*cons.w + x] = ch; draw_char( x, y ); } @@ -318,8 +318,8 @@ cons.y = cons.vc_par[0]; return; case 'J': - if (cons.vc_par[0] == 0 && (uint)cons.y < (uint)cons.h && - (uint)cons.x < (uint)cons.w) { + if (cons.vc_par[0] == 0 && (unsigned int)cons.y < (unsigned int)cons.h && + (unsigned int)cons.x < (unsigned int)cons.w) { // erase from cursor to end of display for (i = cons.x; i < cons.w; i++) cons.buf[cons.y * cons.w + i] = ' '; Modified: trunk/openbios-devel/libopenbios/elf_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/elf_load.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/libopenbios/elf_load.c Sun Aug 1 23:25:08 2010 (r830) @@ -497,8 +497,8 @@ #if DEBUG debug("filesz: %08lX memsz: %08lX p_offset: %08lX " "p_vaddr %08lX\n", - (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, - (ulong)phdr[i].p_offset, (ulong)phdr[i].p_vaddr ); + (unsigned long)phdr[i].p_filesz, (unsigned long)phdr[i].p_memsz, + (unsigned long)phdr[i].p_offset, (unsigned long)phdr[i].p_vaddr ); #endif size = MIN(phdr[i].p_filesz, phdr[i].p_memsz); Modified: trunk/openbios-devel/packages/cmdline.c ============================================================================== --- trunk/openbios-devel/packages/cmdline.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/packages/cmdline.c Sun Aug 1 23:25:08 2010 (r830) @@ -382,7 +382,7 @@ pos = n = strlen( buf ); break; } - if( (uint)ch < 32 ) + if( (unsigned int)ch < 32 ) drop = 1; if( !drop && n < ci->ncol ) { Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/packages/mac-parts.c Sun Aug 1 23:25:08 2010 (r830) @@ -35,7 +35,7 @@ xt_t seek_xt, read_xt; ucell offs_hi, offs_lo; ucell size_hi, size_lo; - uint blocksize; + unsigned int blocksize; phandle_t filesystem_ph; } macparts_info_t; @@ -144,10 +144,10 @@ if (str == NULL || parnum == 0) { /* According to the spec, partition 0 as well as no arguments means the whole disk */ - offs = (llong)0; - size = (llong)__be32_to_cpu(dmap.sbBlkCount) * bs; + offs = (long long)0; + size = (long long)__be32_to_cpu(dmap.sbBlkCount) * bs; - di->blocksize = (uint)bs; + di->blocksize = (unsigned int)bs; di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; @@ -177,8 +177,8 @@ if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - offs = (llong)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (llong)__be32_to_cpu(par.pmPartBlkCnt) * bs; + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; goto found; } @@ -194,8 +194,8 @@ (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - offs = (llong)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (llong)__be32_to_cpu(par.pmPartBlkCnt) * bs; + offs = (long long)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; } } @@ -209,12 +209,12 @@ /* If the filename was set to %BOOT, we actually want the bootcode instead */ if (want_bootcode) { - offs += (llong)__be32_to_cpu(par.pmLgBootStart) * bs; - size = (llong)__be32_to_cpu(par.pmBootSize); + offs += (long long)__be32_to_cpu(par.pmLgBootStart) * bs; + size = (long long)__be32_to_cpu(par.pmBootSize); } ret = -1; - di->blocksize = (uint)bs; + di->blocksize = (unsigned int)bs; di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; @@ -293,8 +293,8 @@ static void macparts_seek(macparts_info_t *di ) { - llong pos = DPOP(); - llong offs, size; + long long pos = DPOP(); + long long offs, size; DPRINTF("macparts_seek %llx:\n", pos); Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/packages/nvram.c Sun Aug 1 23:25:08 2010 (r830) @@ -35,10 +35,10 @@ typedef struct { - uchar signature; - uchar checksum; - uchar len_hi; - uchar len_lo; + unsigned char signature; + unsigned char checksum; + unsigned char len_hi; + unsigned char len_lo; char name[12]; char data[0]; } nvpart_t; @@ -225,8 +225,8 @@ /************************************************************************/ typedef struct { - uint mark_hi; - uint mark_lo; + unsigned int mark_hi; + unsigned int mark_lo; } nvram_ibuf_t; DECLARE_UNNAMED_NODE( nvram, INSTALL_OPEN, sizeof(nvram_ibuf_t )); Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/packages/pc-parts.c Sun Aug 1 23:25:08 2010 (r830) @@ -168,11 +168,11 @@ RET( 0 ); } - offs = (llong)(__le32_to_cpu(p->start_sect)) * bs; + offs = (long long)(__le32_to_cpu(p->start_sect)) * bs; di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; - size = (llong)(__le32_to_cpu(p->nr_sects)) * bs; + size = (long long)(__le32_to_cpu(p->nr_sects)) * bs; di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; @@ -226,11 +226,11 @@ RET( 0 ); } - offs = (llong)(cur_table+__le32_to_cpu(p->start_sect)) * bs; + offs = (long long)(cur_table+__le32_to_cpu(p->start_sect)) * bs; di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; - size = (llong)__le32_to_cpu(p->nr_sects) * bs; + size = (long long)__le32_to_cpu(p->nr_sects) * bs; di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; @@ -332,8 +332,8 @@ static void pcparts_seek(pcparts_info_t *di ) { - llong pos = DPOP(); - llong offs, size; + long long pos = DPOP(); + long long offs, size; DPRINTF("pcparts_seek %llx:\n", pos); Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/packages/sun-parts.c Sun Aug 1 23:25:08 2010 (r830) @@ -185,18 +185,18 @@ DPRINTF("Selected partition %d\n", parnum); - offs = (llong)__be32_to_cpu(p->partitions[parnum].start_cylinder) * + offs = (long long)__be32_to_cpu(p->partitions[parnum].start_cylinder) * __be16_to_cpu(p->ntrks) * __be16_to_cpu(p->nsect) * bs; di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; - size = (llong)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; + size = (long long)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs; di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; di->type = __be32_to_cpu(p->infos[parnum].id); DPRINTF("Found Sun partition, offs %lld size %lld\n", - (llong)offs, (llong)size); + (long long)offs, (long long)size); /* Probe for filesystem at current offset */ DPRINTF("sun-parts: about to probe for fs\n"); @@ -264,8 +264,8 @@ static void sunparts_seek(sunparts_info_t *di ) { - llong pos = DPOP(); - llong offs, size;; + long long pos = DPOP(); + long long offs, size;; DPRINTF("sunparts_seek %llx:\n", pos); Modified: trunk/openbios-devel/packages/video.c ============================================================================== --- trunk/openbios-devel/packages/video.c Sun Aug 1 23:15:14 2010 (r829) +++ trunk/openbios-devel/packages/video.c Sun Aug 1 23:25:08 2010 (r830) @@ -31,7 +31,7 @@ static struct { int has_video; osi_fb_info_t fb; - ulong *pal; /* 256 elements */ + unsigned long *pal; /* 256 elements */ } video; @@ -83,11 +83,11 @@ for( y=0 ; y<height; y++, pp += video.fb.rb ) { if( video.fb.depth >= 24 ) { - ulong *d = (ulong*)pp; + unsigned long *d = (unsigned long*)pp; for( x=0; x<width; x++, p+=3, d++ ) *d = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; } else if( video.fb.depth == 15 ) { - ushort *d = (ushort*)pp; + unsigned short *d = (unsigned short*)pp; for( x=0; x<width; x++, p+=3, d++ ) { int col = ((int)p[0] << 16) | ((int)p[1] << 8) | p[2]; *d = ((col>>9) & 0x7c00) | ((col>>6) & 0x03e0) | ((col>>3) & 0x1f); @@ -102,10 +102,10 @@ #endif } -static ulong +static unsigned long get_color( int col_ind ) { - ulong col; + unsigned long col; if( !video.has_video || col_ind < 0 || col_ind > 255 ) return 0; if( video.fb.depth == 8 ) @@ -129,7 +129,7 @@ color = get_color( colind ); if( d >= 24 ) - *((ulong*)p + x) = color; + *((unsigned long*)p + x) = color; else if( d >= 15 ) *((short*)p + x) = color; else @@ -140,7 +140,7 @@ fill_rect( int col_ind, int x, int y, int w, int h ) { char *pp; - ulong col = get_color(col_ind); + unsigned long col = get_color(col_ind); if( !video.has_video || x < 0 || y < 0 || x+w > video.fb.w || y+h > video.fb.h ) return; @@ -149,15 +149,15 @@ for( ; h--; pp += video.fb.rb ) { int ww = w; if( video.fb.depth == 24 || video.fb.depth == 32 ) { - ulong *p = (ulong*)pp + x; + unsigned long *p = (unsigned long*)pp + x; while( ww-- ) *p++ = col; } else if( video.fb.depth == 16 || video.fb.depth == 15 ) { - ushort *p = (ushort*)pp + x; + unsigned short *p = (unsigned short*)pp + x; while( ww-- ) *p++ = col; } else { - char *p = (char *)((ushort*)pp + x); + char *p = (char *)((unsigned short*)pp + x); while( ww-- ) *p++ = col; @@ -175,7 +175,7 @@ } void -set_color( int ind, ulong color ) +set_color( int ind, unsigned long color ) { if( !video.has_video || ind < 0 || ind > 255 ) return; @@ -240,11 +240,11 @@ { int count = POP(); int start = POP(); - uchar *p = (uchar*)POP(); + unsigned char *p = (unsigned char*)POP(); int i; for( i=0; i<count; i++, p+=3 ) { - ulong col = (p[0] << 16) | (p[1] << 8) | p[2]; + unsigned long col = (p[0] << 16) | (p[1] << 8) | p[2]; set_color( i + start, col ); } refresh_palette(); @@ -258,7 +258,7 @@ int b = POP(); int g = POP(); int r = POP(); - ulong col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); + unsigned long col = ((r << 16) & 0xff0000) | ((g << 8) & 0x00ff00) | (b & 0xff); /* printk("color!: %08lx %08lx %08lx %08lx\n", r, g, b, index ); */ set_color( index, col ); refresh_palette(); @@ -327,7 +327,7 @@ set_int_property( ph, "address", video.fb.mphys ); } video.has_video = 1; - video.pal = malloc( 256 * sizeof(ulong) ); + video.pal = malloc( 256 * sizeof(unsigned long) ); #ifdef CONFIG_PPC s = (video.fb.mphys & 0xfff);

1 0

[commit] r829 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 arch/x86 libopenbios
by repository service 01 Aug '10

01 Aug '10

Author: blueswirl Date: Sun Aug 1 23:15:14 2010 New Revision: 829 URL: http://tracker.coreboot.org/trac/openbios/changeset/829 Log: Fix Unix target build Fix build failure: LINK openbios-unix libopenbios.a(load.o)(.text+0xe0): In function `load': ../libopenbios/load.c:58: undefined reference to `elf_boot_notes' libopenbios.a(load.o)(.text+0xe8):../libopenbios/load.c:58: undefined reference to `elf_boot_notes' Move elf_boot_notes variable to load.c to make it also available on Unix build. Also fix a spurious sys_info variable definition. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/libopenbios/load.c Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Sun Aug 1 17:13:48 2010 (r828) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Sun Aug 1 23:15:14 2010 (r829) @@ -39,10 +39,6 @@ #define ELF_DPRINTF(fmt, args...) SUBSYS_DPRINTF("ELF", fmt, ##args) #define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args) -struct sys_info sys_info; -void *elf_boot_notes = NULL; - - static char * get_device( const char *path ) { Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 17:13:48 2010 (r828) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 23:15:14 2010 (r829) @@ -18,7 +18,6 @@ uint32_t qemu_cmdline; uint32_t cmdline_size; char boot_device; -void *elf_boot_notes = NULL; const void *romvec; void go(void) Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Aug 1 17:13:48 2010 (r828) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Aug 1 23:15:14 2010 (r829) @@ -15,7 +15,7 @@ uint64_t qemu_cmdline; uint64_t cmdline_size; char boot_device; -void *elf_boot_notes = NULL; + extern int sparc64_of_client_interface( int *params ); Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Aug 1 17:13:48 2010 (r828) +++ trunk/openbios-devel/arch/x86/boot.c Sun Aug 1 23:15:14 2010 (r829) @@ -14,8 +14,6 @@ #include "libopenbios/sys_info.h" #include "boot.h" -void *elf_boot_notes = NULL; - void go(void) { ucell address, type, size; Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Sun Aug 1 17:13:48 2010 (r828) +++ trunk/openbios-devel/libopenbios/load.c Sun Aug 1 23:15:14 2010 (r829) @@ -38,6 +38,7 @@ struct sys_info sys_info; +void *elf_boot_notes = NULL; void load(ihandle_t dev) {

1 0

[commit] r827 - trunk/openbios-devel/arch/sparc32
by repository service 01 Aug '10

01 Aug '10

Author: blueswirl Date: Sun Aug 1 16:37:04 2010 New Revision: 827 URL: http://tracker.coreboot.org/trac/openbios/changeset/827 Log: sparc32: fix context switching Remove old hack to jump to loaded code and use switch_to(). Use FLUSH_ALL_KERNEL_WINDOWS macro from Linux. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/context.c trunk/openbios-devel/arch/sparc32/switch.S Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 13:03:45 2010 (r826) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 16:37:04 2010 (r827) @@ -15,6 +15,7 @@ #include "libopenbios/forth_load.h" #include "openprom.h" #include "boot.h" +#include "context.h" uint32_t kernel_image; uint32_t kernel_size; @@ -22,8 +23,6 @@ uint32_t cmdline_size; char boot_device; static const void *romvec; -static int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); - static int try_path(const char *path, char *param) { @@ -107,22 +106,22 @@ switch (type) { case 0x0: /* Start ELF boot image */ - entry = (void *) address; - image_retval = entry(romvec, 0, 0, 0, 0); + image_retval = start_elf((unsigned long)address, + (unsigned long)romvec); break; case 0x1: /* Start ELF image */ - entry = (void *) address; - image_retval = entry(romvec, 0, 0, 0, 0); + image_retval = start_elf((unsigned long)address, + (unsigned long)romvec); break; case 0x5: /* Start a.out image */ - entry = (void *) address; - image_retval = entry(romvec, 0, 0, 0, 0); + image_retval = start_elf((unsigned long)address, + (unsigned long)romvec); break; @@ -211,8 +210,7 @@ if (kernel_size) { printk("[sparc] Kernel already loaded\n"); - entry = (void *) kernel_image; - entry(romvec, 0, 0, 0, 0); + start_elf(kernel_image, (unsigned long)romvec); } printk("[sparc] Booting file '%s' ", path); Modified: trunk/openbios-devel/arch/sparc32/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/context.c Sun Aug 1 13:03:45 2010 (r826) +++ trunk/openbios-devel/arch/sparc32/context.c Sun Aug 1 16:37:04 2010 (r827) @@ -83,14 +83,24 @@ /* Switch to another context. */ struct context *switch_to(struct context *ctx) { - struct context *save, *ret; + volatile struct context *save; + struct context *ret; debug("switching to new context:\n"); save = __context; __context = ctx; - //asm ("pushl %cs; call __switch_context"); + asm __volatile__ ("\n\tcall __switch_context" + "\n\tnop" ::: "g1", "g2", "g3", "g4", "g5", "g6", "g7", + "o0", "o1", "o2", "o3", "o4", "o5", "sp", "o7", + "l0", "l1", "l2", "l3", "l4", "l5", "l6", "l7", + "i0", "i1", "i2", "i3", "i4", "i5", "i7", + "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", + "f10", "f11", "f12", "f13", "f14", "f15", "f16", "f17", "f18", "f19", + "f20", "f21", "f22", "f23", "f24", "f25", "f26", "f27", "f28", "f29", + "f30", "f31", + "memory"); ret = __context; - __context = save; + __context = (struct context *)save; return ret; } @@ -102,10 +112,7 @@ ctx = init_context(image_stack, sizeof image_stack, 1); ctx->pc = entry_point; ctx->param[0] = param; - //ctx->eax = 0xe1fb007; - //ctx->ebx = param; ctx = switch_to(ctx); - //return ctx->eax; - return 0; + return ctx->regs[REG_O0]; } Modified: trunk/openbios-devel/arch/sparc32/switch.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/switch.S Sun Aug 1 13:03:45 2010 (r826) +++ trunk/openbios-devel/arch/sparc32/switch.S Sun Aug 1 16:37:04 2010 (r827) @@ -8,6 +8,16 @@ .text .align 4 +#define STACKFRAME_SZ 0x60 + +/* These are just handy. */ +#define _SV save %sp, -STACKFRAME_SZ, %sp +#define _RS restore + +#define FLUSH_ALL_KERNEL_WINDOWS \ + _SV; _SV; _SV; _SV; _SV; _SV; _SV; \ + _RS; _RS; _RS; _RS; _RS; _RS; _RS; + /* * Switch execution context * This saves registers in the stack, then @@ -18,45 +28,48 @@ * this routine to get back to the original context. */ -/* XXX: totally bogus for sparc, need to save and restore all windows */ __switch_context: - /* Save everything in current stack */ - set __context, %g1 - st %g2, [%g1 + 8] - st %g3, [%g1 + 12] - st %g4, [%g1 + 16] - st %g5, [%g1 + 20] - st %g6, [%g1 + 24] - st %g7, [%g1 + 28] - - st %o0, [%g1 + 32] - st %o1, [%g1 + 36] - st %o2, [%g1 + 40] - st %o3, [%g1 + 44] - st %o4, [%g1 + 48] - st %o5, [%g1 + 52] - st %o6, [%g1 + 56] - st %o7, [%g1 + 60] - - st %l0, [%g1 + 64] - st %l1, [%g1 + 68] - st %l2, [%g1 + 72] - st %l3, [%g1 + 76] - st %l4, [%g1 + 80] - st %l5, [%g1 + 84] - st %l6, [%g1 + 88] - st %l7, [%g1 + 92] - - st %i0, [%g1 + 96] - st %i1, [%g1 + 100] - st %i2, [%g1 + 104] - st %i3, [%g1 + 108] - st %i4, [%g1 + 112] - st %i5, [%g1 + 116] - st %i6, [%g1 + 120] - st %i7, [%g1 + 124] + FLUSH_ALL_KERNEL_WINDOWS + /* Save everything in stack */ + st %fp, [%fp + 120 -144] + add %fp, -144, %fp + st %g1, [%fp + 4] + st %g2, [%fp + 8] + st %g3, [%fp + 12] + st %g4, [%fp + 16] + st %g5, [%fp + 20] + st %g6, [%fp + 24] + st %g7, [%fp + 28] + + st %o0, [%fp + 32] + st %o1, [%fp + 36] + st %o2, [%fp + 40] + st %o3, [%fp + 44] + st %o4, [%fp + 48] + st %o5, [%fp + 52] + st %sp, [%fp + 56] + st %o7, [%fp + 60] + + st %l0, [%fp + 64] + st %l1, [%fp + 68] + st %l2, [%fp + 72] + st %l3, [%fp + 76] + st %l4, [%fp + 80] + st %l5, [%fp + 84] + st %l6, [%fp + 88] + st %l7, [%fp + 92] + + st %i0, [%fp + 96] + st %i1, [%fp + 100] + st %i2, [%fp + 104] + st %i3, [%fp + 108] + st %i4, [%fp + 112] + st %i5, [%fp + 116] + st %i7, [%fp + 124] + + /* ctx->return_address: Return to caller */ + st %o7, [%fp + 128] -__switch_context_nosave: /* Interrupts are not allowed... */ /* Turn on Supervisor, EnableFloating, and all the PIL bits. @@ -67,49 +80,62 @@ wr %g2, 0x0, %psr #endif - /* Load all registers - */ +__switch_context_nosave: set __context, %g1 - ld [%g1], %g1 - ld [%g1 + 8], %g2 - ld [%g1 + 12], %g3 - ld [%g1 + 16], %g4 - ld [%g1 + 20], %g5 - ld [%g1 + 24], %g6 - ld [%g1 + 28], %g7 - - ld [%g1 + 32], %o0 - ld [%g1 + 36], %o1 - ld [%g1 + 40], %o2 - ld [%g1 + 44], %o3 - ld [%g1 + 48], %o4 - ld [%g1 + 52], %o5 - ld [%g1 + 56], %o6 - ld [%g1 + 60], %o7 - - ld [%g1 + 64], %l0 - ld [%g1 + 68], %l1 - ld [%g1 + 72], %l2 - ld [%g1 + 76], %l3 - ld [%g1 + 80], %l4 - ld [%g1 + 84], %l5 - ld [%g1 + 88], %l6 - ld [%g1 + 92], %l7 - - ld [%g1 + 96], %i0 - ld [%g1 + 100], %i1 - ld [%g1 + 104], %i2 - ld [%g1 + 108], %i3 - ld [%g1 + 112], %i4 - ld [%g1 + 116], %i5 - ld [%g1 + 120], %i6 - ld [%g1 + 124], %i7 - - ld [%g1 + 128], %g1 - /* Finally, load new %pc */ + /* Swap ctx pointer with %fp */ + swap [%g1], %fp + /* Load all registers */ + /* offset 0: %g0, no need to load */ + ld [%fp + 4], %g1 + ld [%fp + 8], %g2 + ld [%fp + 12], %g3 + ld [%fp + 16], %g4 + ld [%fp + 20], %g5 + ld [%fp + 24], %g6 + ld [%fp + 28], %g7 + + /* offset 32: %o0, loaded from ctx->param */ + ld [%fp + 36], %o1 + ld [%fp + 40], %o2 + ld [%fp + 44], %o3 + ld [%fp + 48], %o4 + ld [%fp + 52], %o5 + ld [%fp + 56], %sp + /* offset 60: %o7, loaded from ctx->return_addr */ + + ld [%fp + 64], %l0 + ld [%fp + 68], %l1 + ld [%fp + 72], %l2 + ld [%fp + 76], %l3 + ld [%fp + 80], %l4 + ld [%fp + 84], %l5 + ld [%fp + 88], %l6 + ld [%fp + 92], %l7 + + ld [%fp + 96], %i0 + ld [%fp + 100], %i1 + ld [%fp + 104], %i2 + ld [%fp + 108], %i3 + ld [%fp + 112], %i4 + ld [%fp + 116], %i5 + ld [%fp + 124], %i7 + + /* ctx->return_addr */ + ld [%fp + 136], %o7 + + /* ctx->param */ + ld [%fp + 140], %o0 + + /* ctx->pc, save %g1 to %y and load to %g1 */ + mov %g1, %y + ld [%fp + 128], %g1 + /* %fp last */ + ld [%fp + 120], %fp + /* Finally, get the new %pc from %g1 and restore %g1*/ jmp %g1 - clr %g1 + mov %y, %g1 + FLUSH_ALL_KERNEL_WINDOWS __exit_context: /* Get back to the original context */ call __switch_context

1 0

[commit] r826 - in trunk/openbios-devel: arch/amd64 arch/sparc32 arch/sparc64 arch/x86 libopenbios
by repository service 01 Aug '10

01 Aug '10

Author: blueswirl Date: Sun Aug 1 13:03:45 2010 New Revision: 826 URL: http://tracker.coreboot.org/trac/openbios/changeset/826 Log: Fix Unix target build Move sys_info to load.c to make it also available on Unix build. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/amd64/boot.c trunk/openbios-devel/arch/amd64/openbios.c trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/libopenbios/load.c Modified: trunk/openbios-devel/arch/amd64/boot.c ============================================================================== --- trunk/openbios-devel/arch/amd64/boot.c Sun Aug 1 00:48:10 2010 (r825) +++ trunk/openbios-devel/arch/amd64/boot.c Sun Aug 1 13:03:45 2010 (r826) @@ -14,8 +14,6 @@ void boot(void); -struct sys_info sys_info; - void boot(void) { char *path=pop_fstr_copy(), *param; Modified: trunk/openbios-devel/arch/amd64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/amd64/openbios.c Sun Aug 1 00:48:10 2010 (r825) +++ trunk/openbios-devel/arch/amd64/openbios.c Sun Aug 1 13:03:45 2010 (r826) @@ -52,7 +52,6 @@ int openbios(void) { - extern struct sys_info sys_info; #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 00:48:10 2010 (r825) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Aug 1 13:03:45 2010 (r826) @@ -16,7 +16,6 @@ #include "openprom.h" #include "boot.h" -struct sys_info sys_info; uint32_t kernel_image; uint32_t kernel_size; uint32_t qemu_cmdline; Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Aug 1 00:48:10 2010 (r825) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Aug 1 13:03:45 2010 (r826) @@ -14,7 +14,6 @@ #include "libopenbios/forth_load.h" #include "boot.h" -struct sys_info sys_info; uint64_t kernel_image; uint64_t kernel_size; uint64_t qemu_cmdline; Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Aug 1 00:48:10 2010 (r825) +++ trunk/openbios-devel/arch/x86/boot.c Sun Aug 1 13:03:45 2010 (r826) @@ -18,7 +18,6 @@ #include "libopenbios/forth_load.h" #include "boot.h" -struct sys_info sys_info; void *boot_notes = NULL; static int try_path(const char *path, char *param) Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Sun Aug 1 00:48:10 2010 (r825) +++ trunk/openbios-devel/libopenbios/load.c Sun Aug 1 13:03:45 2010 (r826) @@ -33,6 +33,8 @@ #endif +struct sys_info sys_info; + void load(ihandle_t dev) { /* Invoke the loaders on the specified device */

1 0

[commit] r825 - trunk/openbios-devel/drivers
by repository service 01 Aug '10

01 Aug '10

Author: mcayland Date: Sun Aug 1 00:48:10 2010 New Revision: 825 URL: http://tracker.coreboot.org/trac/openbios/changeset/825 Log: Fix the SCSI block driver so that it doesn't leave an extra item on the stack when its open method is called. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/drivers/esp.c Modified: trunk/openbios-devel/drivers/esp.c ============================================================================== --- trunk/openbios-devel/drivers/esp.c Sun Aug 1 00:46:48 2010 (r824) +++ trunk/openbios-devel/drivers/esp.c Sun Aug 1 00:48:10 2010 (r825) @@ -268,7 +268,7 @@ fword("my-unit"); id = POP(); - //POP(); // unit id is 2 ints but we only need one. + POP(); // unit id is 2 ints but we only need one. *sd = &global_esp->sd[id]; #ifdef CONFIG_DEBUG_ESP

1 0

[commit] r824 - trunk/openbios-devel/drivers
by repository service 01 Aug '10

01 Aug '10

Author: mcayland Date: Sun Aug 1 00:46:48 2010 New Revision: 824 URL: http://tracker.coreboot.org/trac/openbios/changeset/824 Log: For some reason, the floppy alias is never registered in /aliases - let's make it happen. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/drivers/floppy.c Modified: trunk/openbios-devel/drivers/floppy.c ============================================================================== --- trunk/openbios-devel/drivers/floppy.c Sun Aug 1 00:46:00 2010 (r823) +++ trunk/openbios-devel/drivers/floppy.c Sun Aug 1 00:46:48 2010 (r824) @@ -1153,6 +1153,7 @@ unsigned long io_base, unsigned long mmio_base) { char nodebuff[128]; + phandle_t aliases; snprintf(nodebuff, sizeof(nodebuff), "%s/%s", path, dev_name); if (!mmio_base) { @@ -1163,5 +1164,9 @@ REGISTER_NODE_METHODS(ob_floppy, nodebuff); } floppy_init(io_base, mmio_base); + + aliases = find_dev("/aliases"); + set_property(aliases, "floppy", nodebuff, strlen(nodebuff) + 1); + return 0; }

1 0

[commit] r823 - trunk/openbios-devel/libopenbios
by repository service 01 Aug '10

01 Aug '10

Author: mcayland Date: Sun Aug 1 00:46:00 2010 New Revision: 823 URL: http://tracker.coreboot.org/trac/openbios/changeset/823 Log: Fix the bootinfo loader so that it will correctly accept device strings with no partition id, e.g. load cdrom:,\path\to\file. Also add a little bootscript debugging for those people that may need it. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c Modified: trunk/openbios-devel/libopenbios/bootinfo_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/bootinfo_load.c Sun Jul 25 19:34:13 2010 (r822) +++ trunk/openbios-devel/libopenbios/bootinfo_load.c Sun Aug 1 00:46:00 2010 (r823) @@ -43,20 +43,28 @@ return buf; } -static int +static char * get_partition( const char *path ) { + static char buf[2]; + + buf[0] = '\0'; + buf[1] = '\0'; + while ( *path && *path != ':' ) path++; if (!*path) - return -1; + return buf; path++; - if (!strchr(path, ',')) /* check if there is a ',' */ - return -1; + if (path[0] == ',' || !strchr(path, ',')) /* if there is not a ',' or no partition id then return */ + return buf; - return atol(path); + /* Must be a partition id */ + buf[0] = path[0]; + + return buf; } static char * @@ -128,8 +136,7 @@ phandle_t chosen; int tag, taglen, script, scriptlen, scriptvalid, entity, chrp; char tagbuf[128], c; - char *device, *filename, *directory; - int partition; + char *device, *filename, *directory, *partition; int current, size; char *bootscript; char *tmp; @@ -220,11 +227,8 @@ strcpy(bootscript + scriptlen, device); scriptlen += strlen(device); } else if (strncasecmp(tagbuf, "partition", 9) == 0) { - if (partition != -1) - sprintf(bootscript + scriptlen, "%d", partition); - else - *(bootscript + scriptlen) = 0; - scriptlen = strlen(bootscript); + strcpy(bootscript + scriptlen, partition); + scriptlen += strlen(partition); } else if (strncasecmp(tagbuf, "directory", 9) == 0) { strcpy(bootscript + scriptlen, directory); scriptlen += strlen(directory); @@ -249,8 +253,10 @@ } /* If the payload is bootinfo then we execute it immediately */ - if (scriptvalid) + if (scriptvalid) { + DPRINTF("bootscript: %s\n", bootscript); feval(bootscript); + } else DPRINTF("Unable to parse bootinfo bootscript\n"); }

1 0

Bug in open-dev
by Mark Cave-Ayland 01 Aug '10

01 Aug '10

Hi all, I'm currently in the middle of chasing a bug in the Forth open-dev word and was wondering if anyone can help me out? It only seems to show up on SPARC32, and only on disk/cdrom devices. What happens is that sometimes open-dev leaves an extra 1 on the stack which breaks some of my subsequent code, e.g. Configuration device id QEMU version 1 machine id 32 UUID: 00000000-0000-0000-0000-000000000000 CPUs: 1 x FMI,MB86904 Welcome to OpenBIOS v1.0 built on Jul 31 2010 15:05 Type 'help' for detailed information 0 > showstack ok 0 > s" ttya" open-dev ok -24b1f8 < 1 > close-dev ok 0 > s" cdrom" open-dev ok 1 -24aff0 < 2 > close-dev ok 1 < 1 > drop ok I think that something in the tree layout of SPARC32 is triggering a bug somewhere in (path-resolution) but I haven't quite managed to grok it yet. Anyone have any ideas as to what could be causing this? 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

1 1

[commit] r822 - trunk/openbios-devel/kernel
by repository service 25 Jul '10

25 Jul '10

Author: mcayland Date: Sun Jul 25 19:34:13 2010 New Revision: 822 URL: http://tracker.coreboot.org/trac/openbios/changeset/822 Log: Create a C wrapper around the Forth key word to be used in the debugger instead of calling availchar()/getchar(). Using this wrapper means that the debugger now works correctly under PPC. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/kernel/internal.c Modified: trunk/openbios-devel/kernel/internal.c ============================================================================== --- trunk/openbios-devel/kernel/internal.c Tue Jul 13 18:41:06 2010 (r821) +++ trunk/openbios-devel/kernel/internal.c Sun Jul 25 19:34:13 2010 (r822) @@ -446,6 +446,27 @@ return i; } +static +int getchar_console( void ) +{ + cell tmp; + + /* Push to the Forth interpreter for console output */ + tmp = rstackcnt; + + trampoline[1] = findword("key"); + + PUSHR(PC); + PC = pointer2cell(trampoline); + + while (rstackcnt > tmp) { + dbg_interp_printk("getchar_console: NEXT\n"); + next(); + } + + return POP(); +} + static void display_dbg_dstack ( void ) { @@ -567,8 +588,7 @@ return; /* Otherwise in step mode, prompt for a keypress */ - while (!availchar()); - k = getchar(); + k = getchar_console(); /* Only proceed if done is true */ while (!done) @@ -601,8 +621,7 @@ /* Down - mark current word for debug and step into it */ done = add_debug_xt(read_ucell(cell2pointer(PC))); if (!done) { - while (!availchar()); - k = getchar(); + k = getchar_console(); } break; @@ -618,8 +637,7 @@ /* Display rstack */ display_dbg_rstack(); done = 0; - while (!availchar()); - k = getchar(); + k = getchar_console(); break; case 'f': @@ -636,8 +654,7 @@ default: /* Display debug banner */ printf_console(DEBUG_BANNER); - while (!availchar()); - k = getchar(); + k = getchar_console(); } } }

1 0

[commit] r791 - in trunk/openbios-devel: fs/grubfs include/fs packages
by repository service 13 Jul '10

13 Jul '10

Author: mcayland Date: Tue Jun 8 22:59:08 2010 New Revision: 791 URL: http://tracker.coreboot.org/trac/openbios/changeset/791 Log: As documented on the mailing lists, change the interposition order of the disk packages from: cdrom -> deblocker -> disk-label -> (misc-files | sun-parts | pc-parts | mac-parts) to: cdrom -> deblocker -> disk-label -> (sun-parts | pc-parts | mac-parts) -> misc-files This makes the overall code much simpler, since instead of passing get-info structures between the different layers to work out the current device offset, each package can simply maintain its own offsets and bubble them back up to the parent. There are also many, many bugfixes present is patch, some of which are given below: - Add debugging in /packages/misc-files, augment debugging in all other disk packages - Fix alignment issue in /packages/pc-parts so it works correctly on strictly align archs, e.g. SPARC64 - Fix parsing of [<id>,][filename] arguments to load (in preparation for next patch set) - Fix byte-swapping issues in /packages/mac-parts (in theory it should now work regardless of endian) Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/include/fs/fs.h trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/disk-label.fs trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/mac-parts.h trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Tue Jun 8 22:59:08 2010 (r791) @@ -20,6 +20,7 @@ #include "filesys.h" #include "glue.h" #include "libc/diskio.h" +#include "libc/vsprintf.h" /************************************************************************/ /* grub GLOBALS (horrible... but difficult to fix) */ @@ -97,6 +98,8 @@ const struct fsys_entry *fsys; grubfile_t *fd; int dev_fd; + llong offset; /* Offset added onto each device read; should only ever be non-zero + when probing a partition for a filesystem */ } grubfs_t; static grubfs_t dummy_fs; @@ -199,7 +202,7 @@ printk("Path=%s\n",path); #endif if (!curfs->fsys->dir_func((char *) path)) { - printk("File not found\n"); + forth_printf("File not found\n"); return NULL; } ret=malloc(sizeof(grubfile_t)); @@ -249,6 +252,7 @@ curfs=&dummy_fs; curfs->dev_fd = fd; + curfs->offset = 0; for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) { #ifdef CONFIG_DEBUG_FS @@ -275,6 +279,31 @@ return -1; } +/* Probe for filesystem (with partition offset); returns 0 on success */ +int +fs_grubfs_probe( int fd, llong offs ) +{ + int i; + + curfs = &dummy_fs; + + curfs->dev_fd = fd; + curfs->offset = offs; + + for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) { +#ifdef CONFIG_DEBUG_FS + printk("Probing for %s\n", fsys_table[i].name); +#endif + if (fsys_table[i].mount_func()) + return 0; + } + +#ifdef CONFIG_DEBUG_FS + printk("Unknown filesystem type\n"); +#endif + return -1; +} + /************************************************************************/ /* I/O glue (called by grub source) */ @@ -297,7 +326,7 @@ return -1; } - if( seek_io(curfs->dev_fd, offs) ) { + if( seek_io(curfs->dev_fd, offs + curfs->offset) ) { #ifdef CONFIG_DEBUG_FS printk("seek failure\n"); #endif Modified: trunk/openbios-devel/include/fs/fs.h ============================================================================== --- trunk/openbios-devel/include/fs/fs.h Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/include/fs/fs.h Tue Jun 8 22:59:08 2010 (r791) @@ -77,6 +77,7 @@ #ifdef CONFIG_GRUBFS extern int fs_grubfs_open( int fd, fs_ops_t *fs ); +extern int fs_grubfs_probe( int fd, llong offs ); #else static inline int fs_grubfs_open( int fd, fs_ops_t *fs ) { return -1; } #endif Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/packages/disk-label.c Tue Jun 8 22:59:08 2010 (r791) @@ -17,6 +17,7 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libc/diskio.h" +#include "libc/vsprintf.h" #include "packages.h" //#define DEBUG_DISK_LABEL @@ -29,7 +30,9 @@ #endif typedef struct { - int fd; + xt_t parent_seek_xt; + xt_t parent_tell_xt; + xt_t parent_read_xt; ucell offs_hi, offs_lo; ucell size_hi, size_lo; @@ -44,117 +47,81 @@ /* ( -- ) */ static void -dlabel_close( dlabel_info_t *di ) +dlabel_close( __attribute__((unused))dlabel_info_t *di ) { - if( di->part_ih ) - close_package( di->part_ih ); - - if( di->fd ) - close_io( di->fd ); } /* ( -- success? ) */ static void dlabel_open( dlabel_info_t *di ) { - const char *s, *filename; char *path; char block0[512]; phandle_t ph; - int fd, success=0; - xt_t xt; + int success=0; + cell status; path = my_args_copy(); if (!path) { path = strdup(""); } - if (!path) { - goto out; - } + DPRINTF("dlabel-open '%s'\n", path ); - /* open disk interface */ + /* Find parent methods */ + di->parent_seek_xt = find_parent_method("seek"); + di->parent_tell_xt = find_parent_method("tell"); + di->parent_read_xt = find_parent_method("read"); + + /* Read first block from parent device */ + DPUSH(0); + call_package(di->parent_seek_xt, my_parent()); + POP(); - if( (fd=open_ih(my_parent())) == -1 ) + PUSH((ucell)block0); + PUSH(sizeof(block0)); + call_package(di->parent_read_xt, my_parent()); + status = POP(); + if (status != sizeof(block0)) goto out; - di->fd = fd; - - /* argument format: parnum,filename */ - - s = path; - filename = ""; - if( *s == '-' || isdigit(*s) || - (*s >= 'a' && *s < ('a' + 8) - && (*(s + 1) == ',' || *(s + 1) == '\0'))) { - if( (s=strpbrk(path,",")) ) { - filename = s+1; - } - } else { - filename = s; - if( *s == ',' ) - filename++; - } - DPRINTF("filename %s\n", filename); - /* find partition handler */ - seek_io( fd, 0 ); - if( read_io(fd, block0, sizeof(block0)) != sizeof(block0) ) - goto out; + /* Find partition handler */ PUSH( (ucell)block0 ); selfword("find-part-handler"); ph = POP_ph(); - - /* open partition package */ if( ph ) { - if( !(di->part_ih=open_package(path, ph)) ) - goto out; - if( !(xt=find_ih_method("get-info", di->part_ih)) ) - goto out; - call_package( xt , di->part_ih ); - di->size_hi = POP(); - di->size_lo = POP(); - di->offs_hi = POP(); - di->offs_lo = POP(); - di->type = POP(); - di->block_size = 512; - xt = find_ih_method("block-size", di->part_ih); - if (xt) { - call_package(xt, di->part_ih); - di->block_size = POP(); - } + /* We found a suitable partition handler, so interpose it */ + DPRINTF("Partition found on disk - scheduling interpose with ph " FMT_ucellx "\n", ph); + + push_str(path); + PUSH_ph(ph); + fword("interpose"); + + success = 1; } else { /* unknown (or missing) partition map, * try the whole disk */ - di->offs_hi = 0; - di->offs_lo = 0; - di->size_hi = 0; - di->size_lo = 0; - di->part_ih = 0; - di->type = -1; - di->block_size = 512; - xt = find_parent_method("block-size"); - if (xt) { - call_parent(xt); - di->block_size = POP(); - } - } - /* probe for filesystem */ + DPRINTF("Unknown or missing partition map; trying whole disk\n"); - PUSH_ih( my_self() ); - selfword("find-filesystem"); - ph = POP_ph(); - if( ph ) { - push_str( filename ); - PUSH_ph( ph ); - fword("interpose"); - } else if (*filename && strcmp(filename, "%BOOT") != 0) { - goto out; + /* Probe for filesystem from start of device */ + DPUSH ( 0 ); + PUSH_ih( my_self() ); + selfword("find-filesystem"); + ph = POP_ph(); + if( ph ) { + push_str( path ); + PUSH_ph( ph ); + fword("interpose"); + } else if (*path && strcmp(path, "%BOOT") != 0) { + goto out; + } + + success = 1; } - success = 1; - out: +out: if( path ) free( path ); if( !success ) { @@ -168,61 +135,26 @@ static void dlabel_read( dlabel_info_t *di ) { - int ret, len = POP(); - char *buf = (char*)POP(); - llong pos = tell( di->fd ); - ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; - ducell size = ((ducell)di->size_hi << BITS) | di->size_lo; - - if (size && len > pos - offs + size) { - len = size - (pos - offs); - } - - ret = read_io( di->fd, buf, len ); - PUSH( ret ); + /* Call back up to parent */ + call_package(di->parent_read_xt, my_parent()); } /* ( pos.d -- status ) */ static void dlabel_seek( dlabel_info_t *di ) { - llong pos = DPOP(); - int ret; - ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; - ducell size = ((ducell)di->size_hi << BITS) | di->size_lo; - - DPRINTF("dlabel_seek %llx [%llx, %llx]\n", pos, offs, size); - if( pos != -1 ) - pos += offs; - else if( size ) { - DPRINTF("Seek EOF\n"); - pos = offs + size; - } else { - /* let parent handle the EOF seek. */ - } - DPRINTF("dlabel_seek: 0x%llx\n", pos ); - if (size && (pos - offs >= size )) { - PUSH(-1); - return; - } - - ret = seek_io( di->fd, pos ); - PUSH( ret ); + /* Call back up to parent */ + call_package(di->parent_seek_xt, my_parent()); } /* ( -- filepos.d ) */ static void dlabel_tell( dlabel_info_t *di ) { - llong pos = tell( di->fd ); - ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; - if( pos != -1 ) - pos -= offs; - - DPUSH( pos ); + /* Call back up to parent */ + call_package(di->parent_tell_xt, my_parent()); } - /* ( addr len -- actual ) */ static void dlabel_write( __attribute__((unused)) dlabel_info_t *di ) @@ -231,39 +163,32 @@ PUSH( -1 ); } -/* ( rel.d -- abs.d ) */ -static void -dlabel_offset( dlabel_info_t *di ) -{ - ullong rel = DPOP(); - ducell offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; - rel += offs; - DPUSH( rel ); -} - /* ( addr -- size ) */ static void dlabel_load( __attribute__((unused)) dlabel_info_t *di ) { - /* XXX: try the load method of the part package */ + /* Try the load method of the part package */ + char *buf; + xt_t xt; - printk("Can't load from this device!\n"); - POP(); - PUSH(0); -} + buf = (char *)POP(); -static void -dlabel_block_size( dlabel_info_t *di ) -{ - PUSH(di->block_size); + DPRINTF("load invoked with address %p\n", buf); + + xt = find_ih_method("load", di->part_ih); + if (!xt) { + forth_printf("load currently not implemented for /packages/disk-label\n"); + PUSH(0); + return; + } + + call_package(xt, di->part_ih); } NODE_METHODS( dlabel ) = { { "open", dlabel_open }, { "close", dlabel_close }, - { "offset", dlabel_offset }, { "load", dlabel_load }, - { "block-size", dlabel_block_size }, { "read", dlabel_read }, { "write", dlabel_write }, { "seek", dlabel_seek }, Modified: trunk/openbios-devel/packages/disk-label.fs ============================================================================== --- trunk/openbios-devel/packages/disk-label.fs Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/packages/disk-label.fs Tue Jun 8 22:59:08 2010 (r791) @@ -36,19 +36,32 @@ r> drop 0 ; - : find-filesystem ( ih -- ph | 0 ) - >r fs-handlers + : find-filesystem ( offs.d ih -- ph | 0 ) + >r fs-handlers ( offs.d listhead ) begin list-get while - ( nextlist dictptr ) - r@ over @ execute if - ( nextlist dictptr ) - na1+ @ r> rot 2drop exit - then - drop + 2over ( offs.d nextlist dictptr offs.d ) + r@ ( offs.d nextlist dictptr offs.d ih ) + 3 pick ( offs.d nextlist dictptr offs.d ih dictptr ) + @ ( offs.d nextlist dictptr offs.d ih probe-xt ) + execute ( offs.d nextlist dictptr flag? ) + if + ( offs.d nextlist dictptr ) + na1+ ( offs.d nextlist dictptr+1 ) + @ ( offs.d nextlist phandle ) + r> ( offs.d nextlist phandle ih ) + rot ( offs.d phandle ih nextlist ) + 2drop ( offs.d phandle ) + -rot ( phandle offs.d ) + 2drop ( phandle ) + exit + then + drop ( offs.d nextlist ) repeat + 2drop ( offs.d ) r> drop 0 ; + : register-part-handler ( handler-ph -- ) dup " probe" rot find-method 0= abort" Missing probe method!" Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/packages/mac-parts.c Tue Jun 8 22:59:08 2010 (r791) @@ -17,8 +17,12 @@ #include "config.h" #include "libopenbios/bindings.h" #include "mac-parts.h" +#include "libc/byteorder.h" +#include "libc/vsprintf.h" #include "packages.h" +//#define CONFIG_DEBUG_MAC_PARTS + #ifdef CONFIG_DEBUG_MAC_PARTS #define DPRINTF(fmt, args...) \ do { printk("MAC-PARTS: " fmt , ##args); } while (0) @@ -27,54 +31,77 @@ #endif typedef struct { - ullong offs; - ullong size; + xt_t seek_xt, read_xt; + ucell offs_hi, offs_lo; + ucell size_hi, size_lo; uint blocksize; } macparts_info_t; DECLARE_NODE( macparts, INSTALL_OPEN, sizeof(macparts_info_t), "+/packages/mac-parts" ); - -#define SEEK( pos ) ({ DPUSH(pos); call_parent(seek_xt); POP(); }) -#define READ( buf, size ) ({ PUSH((ucell)buf); PUSH(size); call_parent(read_xt); POP(); }) +#define SEEK( pos ) ({ DPUSH(pos); call_parent(di->seek_xt); POP(); }) +#define READ( buf, size ) ({ PUSH((ucell)buf); PUSH(size); call_parent(di->read_xt); POP(); }) /* ( open -- flag ) */ static void macparts_open( macparts_info_t *di ) { char *str = my_args_copy(); - xt_t seek_xt = find_parent_method("seek"); - xt_t read_xt = find_parent_method("read"); - int bs, parnum=0; + char *argstr = strdup(""); + char *parstr = strdup(""); + int bs, parnum=-1; desc_map_t dmap; part_entry_t par; int ret = 0; int want_bootcode = 0; + phandle_t ph; + ducell offs, size; + + DPRINTF("macparts_open '%s'\n", str ); + + /* + Arguments that we accept: + id: [0-7] + [(id,)][filespec] + */ - DPRINTF("partition %s\n", str); if( str ) { - char *tmp; - char *comma = strchr(str, ','); - parnum = atol(str); - if( *str == 0 || *str == ',' ) + if ( !strlen(str) ) parnum = -1; - if (comma) { - tmp = comma + 1; - } else { - if (*str >= '0' && *str <= '9') { - tmp = (char*)""; + else { + /* If end of string, we just have a partition id */ + if (str[1] == '\0') { + parstr = str; } else { - tmp = str; - parnum = -1; + /* If a comma, then we have a partition id plus argument */ + if (str[1] == ',') { + str[1] = '\0'; + parstr = str; + argstr = &str[2]; + } else { + /* Otherwise we have just an argument */ + argstr = str; + } } + + /* Convert the id to a partition number */ + if (strlen(parstr)) + parnum = atol(parstr); + + /* Detect if we are looking for the bootcode */ + if (strcmp(argstr, "%BOOT") == 0) + want_bootcode = 1; } - if (strcmp(tmp, "%BOOT") == 0) - want_bootcode = 1; - free(str); } + DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); + DPRINTF("want_bootcode %d\n", want_bootcode); DPRINTF("macparts_open %d\n", parnum); + + di->read_xt = find_parent_method("read"); + di->seek_xt = find_parent_method("seek"); + SEEK( 0 ); if( READ(&dmap, sizeof(dmap)) != sizeof(dmap) ) goto out; @@ -82,17 +109,17 @@ /* partition maps might support multiple block sizes; in this case, * pmPyPartStart is typically given in terms of 512 byte blocks. */ - bs = dmap.sbBlockSize; + bs = __be16_to_cpu(dmap.sbBlockSize); if( bs != 512 ) { SEEK( 512 ); READ( &par, sizeof(par) ); - if( par.pmSig == DESC_PART_SIGNATURE ) + if( __be16_to_cpu(par.pmSig) == DESC_PART_SIGNATURE ) bs = 512; } SEEK( bs ); if( READ(&par, sizeof(par)) != sizeof(par) ) goto out; - if (par.pmSig != DESC_PART_SIGNATURE) + if (__be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE) goto out; if (parnum == -1) { @@ -101,28 +128,42 @@ /* see PowerPC Microprocessor CHRP bindings */ parnum = 1; - while (parnum <= par.pmMapBlkCnt) { + while (parnum <= __be32_to_cpu(par.pmMapBlkCnt)) { SEEK( (bs * parnum) ); READ( &par, sizeof(par) ); - if( par.pmSig != DESC_PART_SIGNATURE || - !par.pmPartBlkCnt ) + if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || + !__be16_to_cpu(par.pmPartBlkCnt) ) goto out; + DPRINTF("found partition type: %s\n", par.pmPartType); + if (firstHFS == -1 && strcmp(par.pmPartType, "Apple_HFS") == 0) firstHFS = parnum; - if( (par.pmPartStatus & kPartitionAUXIsBootValid) && - (par.pmPartStatus & kPartitionAUXIsValid) && - (par.pmPartStatus & kPartitionAUXIsAllocated) && - (par.pmPartStatus & kPartitionAUXIsReadable) && + if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) && (strcmp(par.pmProcessor, "PowerPC") == 0) ) { di->blocksize =(uint)bs; - di->offs = (llong)par.pmPyPartStart * bs; - di->size = (llong)par.pmPartBlkCnt * bs; + + offs = (llong)(__be32_to_cpu(par.pmPyPartStart)) * bs; + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + size = (llong)(__be32_to_cpu(par.pmPartBlkCnt)) * bs; + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + if (want_bootcode) { - di->offs += (llong)par.pmLgBootStart*bs; - di->size = (llong)par.pmBootSize; + offs = (llong)(__be32_to_cpu(par.pmLgBootStart)) * bs; + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + size = (llong)(__be32_to_cpu(par.pmBootSize)) * bs; + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; } ret = -1; goto out; @@ -141,37 +182,70 @@ if (parnum == 0) { di->blocksize =(uint)bs; - di->offs = (llong)0; - di->size = (llong)dmap.sbBlkCount * bs; + + offs = (llong)0; + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + size = (llong)__be32_to_cpu(dmap.sbBlkCount) * bs; + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + ret = -1; goto out; } - if( parnum > par.pmMapBlkCnt) + if( parnum > __be32_to_cpu(par.pmMapBlkCnt)) goto out; found: SEEK( (bs * parnum) ); READ( &par, sizeof(par) ); - if( par.pmSig != DESC_PART_SIGNATURE || !par.pmPartBlkCnt ) + if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || !__be32_to_cpu(par.pmPartBlkCnt) ) goto out; - if( !(par.pmPartStatus & kPartitionAUXIsValid) || - !(par.pmPartStatus & kPartitionAUXIsAllocated) || - !(par.pmPartStatus & kPartitionAUXIsReadable) ) + if( !(__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) || + !(__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) || + !(__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) goto out; ret = -1; - di->blocksize =(uint)bs; - di->offs = (llong)par.pmPyPartStart * bs; - di->size = (llong)par.pmPartBlkCnt * bs; + di->blocksize = (uint)bs; + + offs = (llong)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (llong)__be32_to_cpu(par.pmPartBlkCnt) * bs; + if (want_bootcode) { - di->offs += (llong)par.pmLgBootStart * bs; - di->size = (llong)par.pmBootSize; + offs += (llong)__be32_to_cpu(par.pmLgBootStart) * bs; + size = (llong)__be32_to_cpu(par.pmBootSize); + } + + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + + /* We have a valid partition - so probe for a filesystem at the current offset */ + DPRINTF("mac-parts: about to probe for fs\n"); + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + DPRINTF("mac-parts: done fs probe\n"); + + ph = POP_ph(); + if( ph ) { + DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, str); + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } else { + DPRINTF("mac-parts: no filesystem found; bypassing misc-files interpose\n"); } + free( str ); + out: - DPRINTF("offset 0x%llx size 0x%llx\n", di->offs, di->size); - PUSH( ret); + PUSH( ret ); } /* ( block0 -- flag? ) */ @@ -181,7 +255,7 @@ desc_map_t *dmap = (desc_map_t*)POP(); DPRINTF("macparts_probe %x ?= %x\n", dmap->sbSig, DESC_MAP_SIGNATURE); - if( dmap->sbSig != DESC_MAP_SIGNATURE ) + if( __be16_to_cpu(dmap->sbSig) != DESC_MAP_SIGNATURE ) RET(0); RET(-1); } @@ -190,10 +264,13 @@ static void macparts_get_info( macparts_info_t *di ) { + DPRINTF("macparts_get_info"); + PUSH( -1 ); /* no type */ - DPUSH( di->offs ); - DPUSH( di->size ); - DPRINTF("macparts_get_info %lld %lld\n", di->offs, di->size); + PUSH( di->offs_lo ); + PUSH( di->offs_hi ); + PUSH( di->size_lo ); + PUSH( di->size_hi ); } static void @@ -209,9 +286,49 @@ fword("register-partition-package"); } +/* ( pos.d -- status ) */ +static void +macparts_seek(macparts_info_t *di ) +{ + llong pos = DPOP(); + llong offs; + + DPRINTF("macparts_seek %llx:\n", pos); + + /* Calculate the seek offset for the parent */ + offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; + offs += pos; + DPUSH(offs); + + DPRINTF("macparts_seek parent offset %llx:\n", offs); + + call_package(di->seek_xt, my_parent()); +} + +/* ( buf len -- actlen ) */ +static void +macparts_read(macparts_info_t *di ) +{ + DPRINTF("macparts_read\n"); + + /* Pass the read back up to the parent */ + call_package(di->read_xt, my_parent()); +} + +/* ( addr -- size ) */ +static void +macparts_load( __attribute__((unused))macparts_info_t *di ) +{ + forth_printf("load currently not implemented for /packages/mac-parts\n"); + PUSH(0); +} + NODE_METHODS( macparts ) = { { "probe", macparts_probe }, { "open", macparts_open }, + { "seek", macparts_seek }, + { "read", macparts_read }, + { "load", macparts_load }, { "get-info", macparts_get_info }, { "block-size", macparts_block_size }, { NULL, macparts_initialize }, Modified: trunk/openbios-devel/packages/mac-parts.h ============================================================================== --- trunk/openbios-devel/packages/mac-parts.h Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/packages/mac-parts.h Tue Jun 8 22:59:08 2010 (r791) @@ -38,47 +38,47 @@ }; typedef struct { - long ddBlock; /* first block of driver */ - short ddSize; /* driver size in blocks */ - short ddType; /* 1 & -1 for SCSI */ + u32 ddBlock; /* first block of driver */ + u16 ddSize; /* driver size in blocks */ + s16 ddType; /* 1 & -1 for SCSI */ } driver_entry_t; typedef struct { /* Block 0 of a device */ - short sbSig; /* always 0x4552 */ - short sbBlockSize; /* 512 */ - long sbBlkCount; /* #blocks on device */ - short sbDevType; /* 0 */ - short sbDevID; /* 0 */ - long sbData; /* 0 */ - short sbDrvrCount; /* #driver descriptors */ + u16 sbSig; /* always 0x4552 */ + u16 sbBlockSize; /* 512 */ + s32 sbBlkCount; /* #blocks on device */ + u16 sbDevType; /* 0 */ + u16 sbDevID; /* 0 */ + u32 sbData; /* 0 */ + s16 sbDrvrCount; /* #driver descriptors */ /* driver entries goes here */ driver_entry_t drivers[61] __attribute__ ((packed)); - short filler1; - long filler2; + u16 filler1; + u32 filler2; } desc_map_t; typedef struct { /* Partition descriptor */ - short pmSig; /* always 0x504d 'PM' */ - short pmSigPad; /* 0 */ - ulong pmMapBlkCnt; /* #blocks in partition map */ - ulong pmPyPartStart; /* first physical block of part. */ - ulong pmPartBlkCnt; /* #blocks in partition */ + u16 pmSig; /* always 0x504d 'PM' */ + u16 pmSigPad; /* 0 */ + u32 pmMapBlkCnt; /* #blocks in partition map */ + u32 pmPyPartStart; /* first physical block of part. */ + u32 pmPartBlkCnt; /* #blocks in partition */ char pmPartName[32]; /* partition name */ char pmPartType[32]; /* partition type */ /* these fields may or may not be used */ - ulong pmLgDataStart; - ulong pmDataCnt; - ulong pmPartStatus; - ulong pmLgBootStart; - ulong pmBootSize; - ulong pmBootLoad; - ulong pmBootLoad2; - ulong pmBootEntry; - ulong pmBootEntry2; - ulong pmBootCksum; + u32 pmLgDataStart; + u32 pmDataCnt; + u32 pmPartStatus; + u32 pmLgBootStart; + u32 pmBootSize; + u32 pmBootLoad; + u32 pmBootLoad2; + u32 pmBootEntry; + u32 pmBootEntry2; + u32 pmBootCksum; char pmProcessor[16]; char filler[376]; /* might contain extra information */ Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/packages/misc-files.c Tue Jun 8 22:59:08 2010 (r791) @@ -19,8 +19,18 @@ #include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/diskio.h" +#include "libc/vsprintf.h" #include "packages.h" +//#define CONFIG_DEBUG_MISC_FILES + +#ifdef CONFIG_DEBUG_MISC_FILES +#define DPRINTF(fmt, args...) \ + do { printk(fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) +#endif + #define PATHBUF_SIZE 256 #define VOLNAME_SIZE 64 @@ -42,17 +52,36 @@ fs_ops_t *fs = malloc( sizeof(*fs) ); int err, fd; - err = (fd=open_ih(ih)) == -1; + DPRINTF("misc-files doing open with ih " FMT_ucellX "\n", ih); + + err = (fd = open_ih(ih)) == -1; if( !err ) { - err=fs_hfsp_open(fd, fs); - if( err ) err = fs_hfs_open(fd, fs); - if( err ) err = fs_iso9660_open(fd, fs); - if( err ) err = fs_ext2_open(fd, fs); - if( err ) err = fs_grubfs_open(fd, fs); - } + err = fs_hfsp_open(fd, fs); + DPRINTF("--- HFSP returned %d\n", err); - fs->fd = fd; + if( err ) { + err = fs_hfs_open(fd, fs); + DPRINTF("--- HFS returned %d\n", err); + } + + if( err ) { + err = fs_iso9660_open(fd, fs); + DPRINTF("--- ISO9660 returned %d\n", err); + } + + if( err ) { + err = fs_ext2_open(fd, fs); + DPRINTF("--- ext2 returned %d\n", err); + } + + if( err ) { + err = fs_grubfs_open(fd, fs); + DPRINTF("--- grubfs returned %d\n", err); + } + + fs->fd = fd; + } if( err ) { if( fd != -1 ) @@ -61,6 +90,8 @@ return NULL; } + DPRINTF("misc-files open returns %p\n", fs); + return fs; } @@ -83,15 +114,29 @@ RET( 0 ); name = my_args_copy(); + + mi->fs = fs; + + DPRINTF("misc-files open arguments: %s\n", name); + + /* If we have been passed a specific file, open it */ if( name ) { - if( !(mi->file=fs_open_path(fs, name)) ) { + if( !(mi->file = fs_open_path(fs, name)) ) { + forth_printf("Unable to open path %s\n", name); free( name ); do_close( fs ); RET(0); } - /* printk("PATH: %s\n", fs->get_path(mi->file, mi->pathbuf, PATHBUF_SIZE) ); */ + + DPRINTF("Successfully opened %s\n", name); + // printk("PATH: %s\n", fs->get_path(mi->file, mi->pathbuf, PATHBUF_SIZE) ); + } else { + /* No file was specified, but return success so that we can read + the filesystem. If mi->file is not set, routines simply call their + parent which in this case is the partition handler. */ + + RET(-1); } - mi->fs = fs; if( name ) free( name ); @@ -183,17 +228,23 @@ static void files_read( files_info_t *mi ) { - int len = POP(); - char *buf = (char*)POP(); + int len; + char *buf; int ret; if( mi->file ) { + len = POP(); + buf = (char*)POP(); + ret = mi->fs->read( mi->file, buf, len ); mi->filepos += ret; + + PUSH( ret ); } else { - ret = read_io( mi->fs->fd, buf, len ); + DPRINTF("misc-files read: no valid FS so calling parent\n"); + + call_parent_method("read"); } - PUSH( ret ); } /* ( buf len -- actlen ) */ @@ -208,23 +259,27 @@ static void files_seek( files_info_t *mi ) { - llong pos = DPOP(); - cell ret; - if( mi->file ) { + llong pos = DPOP(); + cell ret; int offs = (int)pos; int whence = SEEK_SET; + DPRINTF("misc-files seek: using FS handle\n"); + if( offs == -1 ) { offs = 0; whence = SEEK_END; } mi->filepos = mi->fs->lseek( mi->file, offs, whence ); ret = (mi->filepos < 0)? -1 : 0; + + PUSH( ret ); } else { - ret = seek_io( mi->fs->fd, pos ); + DPRINTF("misc-files seek: no valid FS so calling parent\n"); + + call_parent_method("seek"); } - PUSH( ret ); } /* ( -- filepos.d ) */ @@ -250,42 +305,89 @@ static void files_load( files_info_t *mi) { - char *buf = (char*)POP(); + char *buf; int ret, size; - if (!mi->file) { - PUSH(0); - return; - } + if (mi->file) { + buf = (char*)POP(); + size = 0; + + DPRINTF("misc-files load at address %p\n", buf); + + while (1) { + ret = mi->fs->read( mi->file, buf, 8192 ); + if (ret <= 0) + break; + buf += ret; + mi->filepos += ret; + size += ret; + + if (size % 0x100000 == 0) + DPRINTF("----> size is %dM\n", size / 0x100000); + + if (ret != 8192) + break; + } + + DPRINTF("load complete with size: %d\n", size); + PUSH( size ); + } else { - size = 0; - while(1) { - ret = mi->fs->read( mi->file, buf, 512 ); - if (ret <= 0) - break; - buf += ret; - mi->filepos += ret; - size += ret; - if (ret != 512) - break; + DPRINTF("misc-files load: no valid FS so calling parent\n"); + + call_parent_method("load"); } - PUSH( size ); } -/* static method, ( ih -- flag? ) */ +/* static method, ( pos.d ih -- flag? ) */ static void -files_probe( files_info_t *dummy ) +files_probe( files_info_t *mi ) { ihandle_t ih = POP_ih(); - fs_ops_t *fs; - int ret = 0; + llong offs = DPOP(); + int fd, err = 0; + + DPRINTF("misc-files probe with offset %llx\n", offs); - if( (fs=do_open(ih)) != NULL ) { - /* printk("HFS[+] filesystem found\n"); */ - do_close( fs ); - ret = -1; + err = (fd = open_ih(ih)) == -1; + if( !err ) { + /* + err = fs_hfsp_open(fd, fs); + DPRINTF("--- HFSP returned %d\n", err); + + if( err ) { + err = fs_hfs_open(fd, fs); + DPRINTF("--- HFS returned %d\n", err); + } + + if( err ) { + err = fs_iso9660_open(fd, fs); + DPRINTF("--- ISO9660 returned %d\n", err); + } + + if( err ) { + err = fs_ext2_open(fd, fs); + DPRINTF("--- ext2 returned %d\n", err); + } + */ + + if( err ) { + err = fs_grubfs_probe(fd, offs); + DPRINTF("--- grubfs returned %d\n", err); + } + } + + if (fd) + close_io(fd); + + /* If no errors occurred, indicate success */ + if (!err) { + DPRINTF("misc-files probe found filesystem\n"); + PUSH(-1); + } else { + DPRINTF("misc-files probe could not find filesystem\n"); + PUSH(0); } - PUSH( ret ); } static void Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/packages/pc-parts.c Tue Jun 8 22:59:08 2010 (r791) @@ -15,24 +15,40 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" +#include "libc/vsprintf.h" #include "packages.h" +//#define DEBUG_PC_PARTS + +#ifdef DEBUG_PC_PARTS +#define DPRINTF(fmt, args...) \ + do { printk(fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) +#endif + typedef struct { - ullong offs; - ullong size; + xt_t seek_xt, read_xt; + ucell offs_hi, offs_lo; + ucell size_hi, size_lo; } pcparts_info_t; DECLARE_NODE( pcparts, INSTALL_OPEN, sizeof(pcparts_info_t), "+/packages/pc-parts" ); +#define SEEK( pos ) ({ DPUSH(pos); call_parent(di->seek_xt); POP(); }) +#define READ( buf, size ) ({ PUSH((ucell)buf); PUSH(size); call_parent(di->read_xt); POP(); }) -#define SEEK( pos ) ({ DPUSH(pos); call_parent(seek_xt); POP(); }) -#define READ( buf, size ) ({ PUSH((ucell)buf); PUSH(size); call_parent(read_xt); POP(); }) +/* three helper functions */ -/* two helper functions */ +static inline int has_pc_valid_partition(unsigned char *sect) +{ + /* Make sure the partition table contains at least one valid entry */ + return (sect[0x1c2] != 0 || sect[0x1d2] != 0 || sect[0x1e2] != 0); +} static inline int has_pc_part_magic(unsigned char *sect) { - return sect[510]==0x55 && sect[511]==0xAA; + return sect[0x1fe]==0x55 && sect[0x1ff]==0xAA; } static inline int is_pc_extended_part(unsigned char type) @@ -45,9 +61,13 @@ pcparts_open( pcparts_info_t *di ) { char *str = my_args_copy(); - xt_t seek_xt = find_parent_method("seek"); - xt_t read_xt = find_parent_method("read"); + char *argstr = strdup(""); + char *parstr = strdup(""); int bs, parnum=-1; + int found = 0; + phandle_t ph; + ducell offs, size; + /* Layout of PC partition table */ struct pc_partition { unsigned char boot; @@ -60,19 +80,50 @@ unsigned char e_cyl; u32 start_sect; /* unaligned little endian */ u32 nr_sects; /* ditto */ - } *p; + } *p, *partition; + unsigned char buf[512]; - /* printk("pcparts_open '%s'\n", str ); */ + DPRINTF("pcparts_open '%s'\n", str ); + + /* + Arguments that we accept: + id: [0-7] + [(id,)][filespec] + */ if( str ) { - parnum = atol(str); - if( !strlen(str) ) - parnum = 1; - free( str ); + if ( !strlen(str) ) + parnum = -1; + else { + /* If end of string, we just have a partition id */ + if (str[1] == '\0') { + parstr = str; + } else { + /* If a comma, then we have a partition id plus argument */ + if (str[1] == ',') { + str[1] = '\0'; + parstr = str; + argstr = &str[2]; + } else { + /* Otherwise we have just an argument */ + argstr = str; + } + } + + /* Convert the id to a partition number */ + if (strlen(parstr)) + parnum = atol(parstr); + } } + + DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); + if( parnum < 0 ) - parnum = 1; + parnum = 0; + + di->read_xt = find_parent_method("read"); + di->seek_xt = find_parent_method("seek"); SEEK( 0 ); if( READ(buf, 512) != 512 ) @@ -80,29 +131,40 @@ /* Check Magic */ if (!has_pc_part_magic(buf)) { - printk("pc partition magic not found.\n"); + DPRINTF("pc partition magic not found.\n"); RET(0); } - /* get partition data */ - p = (struct pc_partition *) (buf + 0x1be); + /* Actual partition data */ + partition = (struct pc_partition *) (buf + 0x1be); - bs=512; + /* Make sure we use a copy accessible from an aligned pointer (some archs + e.g. SPARC will crash otherwise) */ + p = malloc(sizeof(struct pc_partition)); + + bs = 512; if (parnum < 4) { /* primary partition */ - p += parnum; - if (p->type==0 || is_pc_extended_part(p->type)) { - printk("partition %d does not exist\n", parnum+1 ); + partition += parnum; + memcpy(p, partition, sizeof(struct pc_partition)); + + if (p->type == 0 || is_pc_extended_part(p->type)) { + DPRINTF("partition %d does not exist\n", parnum+1 ); RET( 0 ); } - di->offs = (llong)(__le32_to_cpu(p->start_sect)) * bs; - di->size = (llong)(__le32_to_cpu(p->nr_sects)) * bs; - /* printk("Primary partition at sector %x\n", - __le32_to_cpu(p->start_sect)); */ + offs = (llong)(__le32_to_cpu(p->start_sect)) * bs; + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; - RET( -1 ); + size = (llong)(__le32_to_cpu(p->nr_sects)) * bs; + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + + DPRINTF("Primary partition at sector %x\n", __le32_to_cpu(p->start_sect)); + + found = 1; } else { /* Extended partition */ int i, cur_part; @@ -116,55 +178,96 @@ } if (i >= 4) { - printk("Extended partition not found\n"); + DPRINTF("Extended partition not found\n"); RET( 0 ); } - printk("Extended partition at %d\n", i+1); + DPRINTF("Extended partition at %d\n", i+1); /* Visit each logical partition labels */ ext_start = __le32_to_cpu(p[i].start_sect); cur_table = ext_start; cur_part = 4; - for (;;) { - /* printk("cur_part=%d at %x\n", cur_part, cur_table); */ + while (cur_part <= parnum) { + DPRINTF("cur_part=%d at %lx\n", cur_part, cur_table); - SEEK( cur_table*bs ); + SEEK( cur_table * bs ); if( READ(buf, sizeof(512)) != sizeof(512) ) RET( 0 ); if (!has_pc_part_magic(buf)) { - printk("Extended partition has no magic\n"); + DPRINTF("Extended partition has no magic\n"); break; } - p = (struct pc_partition *) (buf + 0x1be); + /* Read the extended partition, making sure we are aligned again */ + partition = (struct pc_partition *) (buf + 0x1be); + memcpy(p, partition, sizeof(struct pc_partition)); + /* First entry is the logical partition */ if (cur_part == parnum) { - if (p->type==0) { - printk("Partition %d is empty\n", parnum+1); + if (p->type == 0) { + DPRINTF("Partition %d is empty\n", parnum+1); RET( 0 ); } - di->offs = - (llong)(cur_table+__le32_to_cpu(p->start_sect)) * bs; - di->size = (llong)__le32_to_cpu(p->nr_sects) * bs; - RET ( -1 ); + + offs = (llong)(cur_table+__le32_to_cpu(p->start_sect)) * bs; + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + size = (llong)__le32_to_cpu(p->nr_sects) * bs; + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + + found = 1; + break; } /* Second entry is link to next partition */ if (!is_pc_extended_part(p[1].type)) { - printk("no link\n"); + DPRINTF("no link\n"); break; } - cur_table = ext_start + __le32_to_cpu(p[1].start_sect); + cur_table = ext_start + __le32_to_cpu(p[1].start_sect); cur_part++; } - printk("Logical partition %d does not exist\n", parnum+1); + + if (!found) { + DPRINTF("Logical partition %d does not exist\n", parnum+1); + RET( 0 ); + } + } + + free(p); + + if (found) { + /* We have a valid partition - so probe for a filesystem at the current offset */ + DPRINTF("pc-parts: about to probe for fs\n"); + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + DPRINTF("pc-parts: done fs probe\n"); + + ph = POP_ph(); + if( ph ) { + DPRINTF("pc-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, str); + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } else { + DPRINTF("pc-parts: no filesystem found; bypassing misc-files interpose\n"); + } + + free( str ); + RET( -1 ); + } else { + DPRINTF("pc-parts: unable to locate partition\n"); + + free( str ); RET( 0 ); } - /* we should never reach this point */ } /* ( block0 -- flag? ) */ @@ -173,16 +276,24 @@ { unsigned char *buf = (unsigned char *)POP(); - RET ( has_pc_part_magic(buf) ); + DPRINTF("probing for PC partitions\n"); + + /* We also check that at least one valid partition exists; this is because + some CDs seem broken in that they have a partition table but it is empty + e.g. MorphOS. */ + RET ( has_pc_part_magic(buf) && has_pc_valid_partition(buf) ); } /* ( -- type offset.d size.d ) */ static void pcparts_get_info( pcparts_info_t *di ) { + DPRINTF("PC get_info\n"); PUSH( -1 ); /* no type */ - DPUSH( di->offs ); - DPUSH( di->size ); + PUSH( di->offs_lo ); + PUSH( di->offs_hi ); + PUSH( di->size_lo ); + PUSH( di->size_hi ); } static void @@ -197,9 +308,50 @@ fword("register-partition-package"); } +/* ( pos.d -- status ) */ +static void +pcparts_seek(pcparts_info_t *di ) +{ + llong pos = DPOP(); + llong offs; + + DPRINTF("pcparts_seek %llx:\n", pos); + + /* Calculate the seek offset for the parent */ + offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; + offs += pos; + DPUSH(offs); + + DPRINTF("pcparts_seek parent offset %llx:\n", offs); + + call_package(di->seek_xt, my_parent()); +} + +/* ( buf len -- actlen ) */ +static void +pcparts_read(pcparts_info_t *di ) +{ + DPRINTF("pcparts_read\n"); + + /* Pass the read back up to the parent */ + call_package(di->read_xt, my_parent()); +} + +/* ( addr -- size ) */ +static void +pcparts_load( __attribute__((unused))pcparts_info_t *di ) +{ + forth_printf("load currently not implemented for /packages/pc-parts\n"); + PUSH(0); +} + + NODE_METHODS( pcparts ) = { { "probe", pcparts_probe }, { "open", pcparts_open }, + { "seek", pcparts_seek }, + { "read", pcparts_read }, + { "load", pcparts_load }, { "get-info", pcparts_get_info }, { "block-size", pcparts_block_size }, { NULL, pcparts_initialize }, Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Thu May 27 22:12:26 2010 (r790) +++ trunk/openbios-devel/packages/sun-parts.c Tue Jun 8 22:59:08 2010 (r791) @@ -15,9 +15,12 @@ #include "config.h" #include "libopenbios/bindings.h" #include "libc/byteorder.h" +#include "libc/vsprintf.h" #include "packages.h" -#ifdef CONFIG_DEBUG_SUN_PARTS +//#define DEBUG_SUN_PARTS + +#ifdef DEBUG_SUN_PARTS #define DPRINTF(fmt, args...) \ do { printk(fmt , ##args); } while (0) #else @@ -25,6 +28,7 @@ #endif typedef struct { + xt_t seek_xt, read_xt; ucell offs_hi, offs_lo; ucell size_hi, size_lo; int type; @@ -32,9 +36,8 @@ DECLARE_NODE( sunparts, INSTALL_OPEN, sizeof(sunparts_info_t), "+/packages/sun-parts" ); - -#define SEEK( pos ) ({ DPUSH(pos); call_parent(seek_xt); POP(); }) -#define READ( buf, size ) ({ PUSH((ucell)buf); PUSH(size); call_parent(read_xt); POP(); }) +#define SEEK( pos ) ({ DPUSH(pos); call_parent(di->seek_xt); POP(); }) +#define READ( buf, size ) ({ PUSH((ucell)buf); PUSH(size); call_parent(di->read_xt); POP(); }) /* Layout of SUN partition table */ struct sun_disklabel { @@ -89,27 +92,57 @@ sunparts_open( sunparts_info_t *di ) { char *str = my_args_copy(); - xt_t seek_xt = find_parent_method("seek"); - xt_t read_xt = find_parent_method("read"); + char *argstr = strdup(""); + char *parstr = strdup(""); int parnum = -1; unsigned char buf[512]; struct sun_disklabel *p; unsigned int i, bs; ducell offs, size; + phandle_t ph; DPRINTF("sunparts_open '%s'\n", str ); - if( str ) { - if( !strlen(str) ) - parnum = -1; - else if (str[0] >= 'a' && str[0] < ('a' + 8)) - parnum = str[0] - 'a'; - else - parnum = atol(str); + /* + Arguments that we accept: + id: [0-7] | [a-h] + [(id,)][filespec] + */ - free( str ); + if( str ) { + if ( !strlen(str) ) + parnum = -1; + else { + /* If end of string, we just have a partition id */ + if (str[1] == '\0') { + parstr = str; + } else { + /* If a comma, then we have a partition id plus argument */ + if (str[1] == ',') { + str[1] = '\0'; + parstr = str; + argstr = &str[2]; + } else { + /* Otherwise we have just an argument */ + argstr = str; + } + } + + /* Convert the id to a partition number */ + if (strlen(parstr)) { + if (parstr[0] >= 'a' && parstr[0] < ('a' + 8)) + parnum = parstr[0] - 'a'; + else + parnum = atol(parstr); + } + } } + DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); + + di->read_xt = find_parent_method("read"); + di->seek_xt = find_parent_method("seek"); + SEEK( 0 ); if( READ(buf, 512) != 512 ) RET(0); @@ -137,6 +170,7 @@ parnum = 0; DPRINTF("Selected partition %d\n", parnum); + offs = (llong)__be32_to_cpu(p->partitions[parnum].start_cylinder) * __be16_to_cpu(p->ntrks) * __be16_to_cpu(p->nsect) * bs; @@ -146,9 +180,28 @@ di->size_hi = size >> BITS; di->size_lo = size & (ucell) -1; di->type = __be32_to_cpu(p->infos[parnum].id); - DPRINTF("Found Sun partition table, offs %lld size %lld\n", + + DPRINTF("Found Sun partition, offs %lld size %lld\n", (llong)offs, (llong)size); + /* Probe for filesystem at current offset */ + DPRINTF("sun-parts: about to probe for fs\n"); + DPUSH( offs ); + PUSH_ih( my_parent() ); + parword("find-filesystem"); + DPRINTF("sun-parts: done fs probe\n"); + + ph = POP_ph(); + if( ph ) { + DPRINTF("sun-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, str); + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } else { + DPRINTF("sun-parts: no filesystem found; bypassing misc-files interpose\n"); + } + + free( str ); RET( -1 ); } @@ -158,6 +211,8 @@ { unsigned char *buf = (unsigned char *)POP(); + DPRINTF("probing for Sun partitions\n"); + RET ( has_sun_part_magic(buf) ); } @@ -185,11 +240,52 @@ fword("register-partition-package"); } +/* ( pos.d -- status ) */ +static void +sunparts_seek(sunparts_info_t *di ) +{ + llong pos = DPOP(); + llong offs; + + DPRINTF("sunparts_seek %llx:\n", pos); + + /* Calculate the seek offset for the parent */ + offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; + offs += pos; + DPUSH(offs); + + DPRINTF("sunparts_seek parent offset %llx:\n", offs); + + call_package(di->seek_xt, my_parent()); +} + +/* ( buf len -- actlen ) */ +static void +sunparts_read(sunparts_info_t *di ) +{ + DPRINTF("sunparts_read\n"); + + /* Pass the read back up to the parent */ + call_package(di->read_xt, my_parent()); +} + +/* ( addr -- size ) */ +static void +sunparts_load( __attribute__((unused))sunparts_info_t *di ) +{ + forth_printf("load currently not implemented for /packages/sun-parts\n"); + PUSH(0); +} + + NODE_METHODS( sunparts ) = { { "probe", sunparts_probe }, { "open", sunparts_open }, { "get-info", sunparts_get_info }, { "block-size", sunparts_block_size }, + { "seek", sunparts_seek }, + { "read", sunparts_read }, + { "load", sunparts_load }, { NULL, sunparts_initialize }, };

3 4

[commit] r821 - trunk/openbios-devel/packages
by repository service 13 Jul '10

13 Jul '10

Author: mcayland Date: Tue Jul 13 18:41:06 2010 New Revision: 821 URL: http://tracker.coreboot.org/trac/openbios/changeset/821 Log: Fix a thinko in packages/mac-parts and then rework the open method so it more accurately reflects the CHRP boot specification. Also add seek limits to each partition type, since some existing code uses this to detect bootloader code. This fixes the quik bootloader problem for PPC as reported by Aurelian Jarno. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Mon Jul 12 00:41:34 2010 (r820) +++ trunk/openbios-devel/packages/mac-parts.c Tue Jul 13 18:41:06 2010 (r821) @@ -57,7 +57,7 @@ int ret = 0; int want_bootcode = 0; phandle_t ph; - ducell offs, size; + ducell offs = 0, size = -1; DPRINTF("macparts_open '%s'\n", str ); @@ -102,8 +102,10 @@ parnum = atol(parstr); /* Detect if we are looking for the bootcode */ - if (strcmp(argstr, "%BOOT") == 0) + if (strcmp(argstr, "%BOOT") == 0) { want_bootcode = 1; + argstr = strdup(""); + } } } @@ -136,100 +138,84 @@ if (__be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE) goto out; - if (parnum == -1) { - int firstHFS = -1; - /* search a bootable partition */ - /* see PowerPC Microprocessor CHRP bindings */ + /* + * Implement partition selection as per the PowerPC Microprocessor CHRP bindings + */ + + if (str == NULL || parnum == 0) { + /* According to the spec, partition 0 as well as no arguments means the whole disk */ + offs = (llong)0; + size = (llong)__be32_to_cpu(dmap.sbBlkCount) * bs; + + di->blocksize = (uint)bs; - for (parnum = 0; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { - SEEK( (bs * (parnum + 1)) ); + di->offs_hi = offs >> BITS; + di->offs_lo = offs & (ucell) -1; + + di->size_hi = size >> BITS; + di->size_lo = size & (ucell) -1; + + ret = -1; + goto out; + + } else if (parnum == -1) { + + DPRINTF("mac-parts: counted %d partitions\n", __be32_to_cpu(par.pmMapBlkCnt)); + + /* No partition was explicitly requested, so find one */ + for (parnum = 1; parnum <= __be32_to_cpu(par.pmMapBlkCnt); parnum++) { + SEEK( bs * parnum ); READ( &par, sizeof(par) ); if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || - !__be16_to_cpu(par.pmPartBlkCnt) ) + !__be32_to_cpu(par.pmPartBlkCnt) ) break; - DPRINTF("found partition type: %s\n", par.pmPartType); - - if (firstHFS == -1 && - strcmp(par.pmPartType, "Apple_HFS") == 0) - firstHFS = parnum; + DPRINTF("found partition type: %s with status %x\n", par.pmPartType, __be32_to_cpu(par.pmPartStatus)); - if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) && - (strcmp(par.pmProcessor, "PowerPC") == 0) ) { - di->blocksize =(uint)bs; - - offs = (llong)(__be32_to_cpu(par.pmPyPartStart)) * bs; - di->offs_hi = offs >> BITS; - di->offs_lo = offs & (ucell) -1; - - size = (llong)(__be32_to_cpu(par.pmPartBlkCnt)) * bs; - di->size_hi = size >> BITS; - di->size_lo = size & (ucell) -1; - - if (want_bootcode) { - offs = (llong)(__be32_to_cpu(par.pmLgBootStart)) * bs; - di->offs_hi = offs >> BITS; - di->offs_lo = offs & (ucell) -1; - - size = (llong)(__be32_to_cpu(par.pmBootSize)) * bs; - di->size_hi = size >> BITS; - di->size_lo = size & (ucell) -1; + /* Ignore any partition maps when searching */ + if (strcmp(par.pmPartType, "Apple_partition_map")) { + if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { + offs = (llong)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (llong)__be32_to_cpu(par.pmPartBlkCnt) * bs; + + goto found; } - ret = -1; - goto out; } } - /* not found */ - if (firstHFS != -1) { - parnum = firstHFS; - goto found; - } - ret = 0; - goto out; - } - if (parnum == 0) { - di->blocksize =(uint)bs; - - offs = (llong)0; - di->offs_hi = offs >> BITS; - di->offs_lo = offs & (ucell) -1; + } else { + /* Another partition was explicitly requested */ + SEEK( bs * parnum ); + READ( &par, sizeof(par) ); - size = (llong)__be32_to_cpu(dmap.sbBlkCount) * bs; - di->size_hi = size >> BITS; - di->size_lo = size & (ucell) -1; + if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - ret = -1; - goto out; + offs = (llong)__be32_to_cpu(par.pmPyPartStart) * bs; + size = (llong)__be32_to_cpu(par.pmPartBlkCnt) * bs; + } } - if( parnum > __be32_to_cpu(par.pmMapBlkCnt)) + /* If we couldn't find a partition, exit */ + if (size == -1) { + DPRINTF("Unable to automatically find partition!\n"); goto out; + } found: - SEEK( (bs * (parnum + 1)) ); - READ( &par, sizeof(par) ); - if( __be16_to_cpu(par.pmSig) != DESC_PART_SIGNATURE || !__be32_to_cpu(par.pmPartBlkCnt) ) - goto out; - if( !(__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) || - !(__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) || - !(__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) - goto out; - - ret = -1; - di->blocksize = (uint)bs; - - offs = (llong)__be32_to_cpu(par.pmPyPartStart) * bs; - size = (llong)__be32_to_cpu(par.pmPartBlkCnt) * bs; + /* If the filename was set to %BOOT, we actually want the bootcode instead */ if (want_bootcode) { offs += (llong)__be32_to_cpu(par.pmLgBootStart) * bs; size = (llong)__be32_to_cpu(par.pmBootSize); } + ret = -1; + di->blocksize = (uint)bs; + di->offs_hi = offs >> BITS; di->offs_lo = offs & (ucell) -1; @@ -308,10 +294,15 @@ macparts_seek(macparts_info_t *di ) { llong pos = DPOP(); - llong offs; + llong offs, size; DPRINTF("macparts_seek %llx:\n", pos); + /* Seek is invalid if we reach the end of the device */ + size = ((ducell)di->size_hi << BITS) | di->size_lo; + if (pos > size) + RET( -1 ); + /* Calculate the seek offset for the parent */ offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; offs += pos; Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Mon Jul 12 00:41:34 2010 (r820) +++ trunk/openbios-devel/packages/pc-parts.c Tue Jul 13 18:41:06 2010 (r821) @@ -333,10 +333,15 @@ pcparts_seek(pcparts_info_t *di ) { llong pos = DPOP(); - llong offs; + llong offs, size; DPRINTF("pcparts_seek %llx:\n", pos); + /* Seek is invalid if we reach the end of the device */ + size = ((ducell)di->size_hi << BITS) | di->size_lo; + if (pos > size) + RET( -1 ); + /* Calculate the seek offset for the parent */ offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; offs += pos; Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Mon Jul 12 00:41:34 2010 (r820) +++ trunk/openbios-devel/packages/sun-parts.c Tue Jul 13 18:41:06 2010 (r821) @@ -265,10 +265,15 @@ sunparts_seek(sunparts_info_t *di ) { llong pos = DPOP(); - llong offs; + llong offs, size;; DPRINTF("sunparts_seek %llx:\n", pos); + /* Seek is invalid if we reach the end of the device */ + size = ((ducell)di->size_hi << BITS) | di->size_lo; + if (pos > size) + RET( -1 ); + /* Calculate the seek offset for the parent */ offs = ((ducell)di->offs_hi << BITS) | di->offs_lo; offs += pos;

1 0

[commit] r820 - trunk/openbios-devel/packages
by repository service 12 Jul '10

12 Jul '10

Author: mcayland Date: Mon Jul 12 00:41:34 2010 New Revision: 820 URL: http://tracker.coreboot.org/trac/openbios/changeset/820 Log: Fix incorrect CONFIG constant in init.c. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/packages/init.c Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Jul 11 23:32:38 2010 (r819) +++ trunk/openbios-devel/packages/init.c Mon Jul 12 00:41:34 2010 (r820) @@ -60,7 +60,7 @@ #ifdef CONFIG_LOADER_ELF elf_loader_init(); #endif -#ifdef CONFIG_PPC +#ifdef CONFIG_LOADER_BOOTINFO bootinfo_loader_init(); #endif

1 0

[commit] r819 - in trunk/openbios-devel: config/examples packages
by repository service 11 Jul '10

11 Jul '10

Author: mcayland Date: Sun Jul 11 23:32:38 2010 New Revision: 819 URL: http://tracker.coreboot.org/trac/openbios/changeset/819 Log: Remove /packages/misc-files since it is no longer required now that each filesystem has its own package. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Deleted: trunk/openbios-devel/packages/misc-files.c Modified: trunk/openbios-devel/config/examples/amd64_config.xml trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/cross-sparc32_config.xml trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/cross-x86_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/examples/sparc32_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml trunk/openbios-devel/config/examples/x86_config.xml trunk/openbios-devel/packages/build.xml trunk/openbios-devel/packages/init.c Modified: trunk/openbios-devel/config/examples/amd64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/amd64_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/amd64_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -46,7 +46,6 @@ <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -53,7 +53,6 @@ <option name="CONFIG_MAC_PARTS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_ISO9660" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/cross-sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-sparc32_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/cross-sparc32_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -53,7 +53,6 @@ <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> <option name="CONFIG_PC_PARTS" type="boolean" value="false"/> <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_ISO9660" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -53,7 +53,6 @@ <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> <option name="CONFIG_PC_PARTS" type="boolean" value="false"/> <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_ISO9660" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/cross-x86_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-x86_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/cross-x86_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -47,7 +47,6 @@ <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -53,7 +53,6 @@ <option name="CONFIG_MAC_PARTS" type="boolean" value="true"/> <option name="CONFIG_DEBUG_MAC_PARTS" type="boolean" value="false"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="true"/> <option name="CONFIG_HFSP" type="boolean" value="true"/> <option name="CONFIG_ISO9660" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/sparc32_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -53,7 +53,6 @@ <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> <option name="CONFIG_PC_PARTS" type="boolean" value="false"/> <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/sparc64_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -53,7 +53,6 @@ <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> <option name="CONFIG_PC_PARTS" type="boolean" value="false"/> <option name="CONFIG_SUN_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/x86_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/x86_config.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/config/examples/x86_config.xml Sun Jul 11 23:32:38 2010 (r819) @@ -47,7 +47,6 @@ <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> <option name="CONFIG_PC_PARTS" type="boolean" value="true"/> - <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> Modified: trunk/openbios-devel/packages/build.xml ============================================================================== --- trunk/openbios-devel/packages/build.xml Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/packages/build.xml Sun Jul 11 23:32:38 2010 (r819) @@ -8,7 +8,6 @@ <object source="elf-loader.c" condition="LOADER_ELF"/> <object source="init.c"/> <object source="mac-parts.c" condition="MAC_PARTS"/> - <object source="misc-files.c" condition="FS"/> <object source="nvram.c"/> <object source="pc-parts.c" condition="PC_PARTS"/> <object source="sun-parts.c" condition="SUN_PARTS"/> Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Jul 11 21:40:18 2010 (r818) +++ trunk/openbios-devel/packages/init.c Sun Jul 11 23:32:38 2010 (r819) @@ -45,9 +45,6 @@ #ifdef CONFIG_GRUBFS grubfs_init(); #endif -#ifdef CONFIG_FS - files_init(); -#endif #ifdef CONFIG_MAC_PARTS macparts_init(); #endif

1 0

[commit] r818 - trunk/openbios-devel/fs/hfs
by repository service 11 Jul '10

11 Jul '10

Author: mcayland Date: Sun Jul 11 21:40:18 2010 New Revision: 818 URL: http://tracker.coreboot.org/trac/openbios/changeset/818 Log: Fix bug in dir path parsing on HFS filesystems. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Jul 11 20:57:19 2010 (r817) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Jul 11 21:40:18 2010 (r818) @@ -492,8 +492,7 @@ hfsvol *volume; hfscommon *common; hfsdirent ent; - const char *s; - char buf[256], *tmppath; + int i; int fd; ihandle_t ih = POP(); @@ -512,36 +511,12 @@ common = malloc(sizeof(hfscommon)); - if (strcmp(path, "\\") == 0) { - common->dir = hfs_opendir(volume, ":"); - } else { - if (path[strlen(path) - 1] == '\\') { - path[strlen(path) - 1] = 0; - } - - tmppath = path; - for( tmppath-- ;; ) { - int n; - - s = ++tmppath; - tmppath = strchr(s, '\\'); - if( !tmppath || !tmppath[1]) - break; - n = MIN( sizeof(buf)-1, (path-s) ); - if( !n ) - continue; - - strncpy( buf, s, n ); - buf[n] = 0; - if( hfs_chdir(volume, buf) ) { - free(common); - free(path); - return; - } - } + /* HFS paths are colon separated, not backslash separated */ + for (i = 0; i < strlen(path); i++) + if (path[i] == '\\') + path[i] = ':'; - common->dir = hfs_opendir(volume, s); - } + common->dir = hfs_opendir(volume, path); forth_printf("\n"); while( !hfs_readdir(common->dir, &ent) ) {

1 0

[commit] r817 - in trunk/openbios-devel: forth/debugging forth/lib fs/grubfs
by repository service 11 Jul '10

11 Jul '10

Author: mcayland Date: Sun Jul 11 20:57:19 2010 New Revision: 817 URL: http://tracker.coreboot.org/trac/openbios/changeset/817 Log: Switch dir over to use the new static filesystem dir methods. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/forth/lib/split.fs trunk/openbios-devel/fs/grubfs/grubfs_fs.c Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Sat Jul 10 15:11:22 2010 (r816) +++ trunk/openbios-devel/forth/debugging/client.fs Sun Jul 11 20:57:19 2010 (r817) @@ -91,11 +91,12 @@ : dir ( "{paths}<cr>" -- ) linefeed parse + split-path-device open-dev dup 0= if drop exit then - dup + -rot 2 pick " dir" rot ['] $call-method catch if 3drop Modified: trunk/openbios-devel/forth/lib/split.fs ============================================================================== --- trunk/openbios-devel/forth/lib/split.fs Sat Jul 10 15:11:22 2010 (r816) +++ trunk/openbios-devel/forth/lib/split.fs Sun Jul 11 20:57:19 2010 (r817) @@ -47,3 +47,24 @@ c@ r@ = if 1- then then r> drop ; + +\ split <param-text> into separate path and device strings +: split-path-device ( str len -- pathstr len devstr len ) + ascii , left-split 2 pick 0= if + \ No comma - so either <dev>:<id> or <dev>:<id><path> + 2dup ascii \ strchr 0= if + \ No backslash so just <dev> or <dev>:<id> + s" " 2swap \ ( pathstr len devstr len ) + else + \ Contains backslash, must be a <dev>:<id><path> + ascii : left-split \ ( pathstr len devstr len ) + then + + \ Remove RHS split (unused) + 4 roll drop + 4 roll drop + else + \ Contains comma so split is already correct + then +; + Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sat Jul 10 15:11:22 2010 (r816) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Jul 11 20:57:19 2010 (r817) @@ -358,7 +358,7 @@ /* static method, ( pathstr len ihandle -- ) */ static void -grubfs_files_dir( grubfs_info_t *mi ) +grubfs_files_dir( grubfs_info_t *dummy ) { forth_printf("dir method not implemented for grubfs filesystem\n"); POP();

1 0

[commit] r816 - in trunk/openbios-devel: fs/ext2 fs/grubfs fs/hfs fs/hfsplus fs/iso9660 packages
by repository service 10 Jul '10

10 Jul '10

Author: mcayland Date: Sat Jul 10 15:11:22 2010 New Revision: 816 URL: http://tracker.coreboot.org/trac/openbios/changeset/816 Log: Currently the dir word works by using /packages/misc-files to open a directory in a similar way to a file and then special-casing directory actions. This is wrong in that in order to list the contents of a directory, open-dev must return true for any device which contains a valid filesystem, regardless of whether or not the supplied arguments reference a valid path. This causes us a problem because in order to implement multiple references in boot-device correctly, we have to fail if we open a specific device with invalid arguments (such as a non-existent file reference). This patch therefore makes the following changes: 1) Create a static method in each of the filesystem packages to implement dir 2) Enhance the partition/disk handlers to record the phandle of any detected filesystem during open 3) Create a new dir method in the partition/disk handlers which invokes the static dir method for the currently detected filesystem Hence we can now open a raw device/partition and invoke dir on its filesystem without having to open a specific file-reference first. Following shortly is a patch to switch the main dir word over to use this new system. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Sat Jul 10 15:11:22 2010 (r816) @@ -33,7 +33,7 @@ DECLARE_NODE( ext2, 0, sizeof(ext2_info_t), "+/packages/ext2-files" ); -/* + static const int days_month[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; static const int days_month_leap[12] = @@ -83,28 +83,6 @@ year, month, day, hour, minute, second); } -static void -dir_fs ( file_desc_t *fd) -{ - ext2_COMMON *common = (ext2_COMMON *)fd; - struct ext2_dir_entry_2 *entry; - struct ext2_inode inode; - - if (common->type != DIR) - return; - - forth_printf("\n"); - while ( (entry = ext2_readdir(common->dir)) ) { - ext2_get_inode(common->dir->volume, entry->inode, &inode); - forth_printf("% 10d ", inode.i_size); - print_date(inode.i_mtime); - if (S_ISDIR(inode.i_mode)) - forth_printf("%s\\\n", entry->name); - else - forth_printf("%s\n", entry->name); - } -} -*/ /************************************************************************/ /* Standard package methods */ @@ -233,6 +211,52 @@ PUSH( (ucell)strdup("ext2") ); } +/* static method, ( pathstr len ihandle -- ) */ +static void +ext2_files_dir( ext2_info_t *dummy ) +{ + ext2_COMMON *common; + ext2_VOLUME *volume; + struct ext2_dir_entry_2 *entry; + struct ext2_inode inode; + int fd; + + ihandle_t ih = POP(); + char *path = pop_fstr_copy(); + + fd = open_ih( ih ); + if ( fd == -1 ) { + free( path ); + return; + } + + volume = ext2_mount(fd); + if (!volume) { + return; + } + + common = (ext2_COMMON*)malloc(sizeof(ext2_COMMON)); + common->dir = ext2_opendir(volume, path); + + forth_printf("\n"); + while ( (entry = ext2_readdir(common->dir)) ) { + ext2_get_inode(common->dir->volume, entry->inode, &inode); + forth_printf("% 10d ", inode.i_size); + print_date(inode.i_mtime); + if (S_ISDIR(inode.i_mode)) + forth_printf("%s\\\n", entry->name); + else + forth_printf("%s\n", entry->name); + } + + ext2_closedir( common->dir ); + ext2_umount( volume ); + + close_io( fd ); + + free( common ); + free( path ); +} /* static method, ( pos.d ih -- flag? ) */ static void @@ -265,6 +289,7 @@ { "read", ext2_files_read }, { "seek", ext2_files_seek }, { "load", ext2_files_load }, + { "dir", ext2_files_dir }, /* special */ { "get-path", ext2_files_get_path }, Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sat Jul 10 15:11:22 2010 (r816) @@ -356,6 +356,15 @@ RET ( 0 ); } +/* static method, ( pathstr len ihandle -- ) */ +static void +grubfs_files_dir( grubfs_info_t *mi ) +{ + forth_printf("dir method not implemented for grubfs filesystem\n"); + POP(); + POP(); + POP(); +} static void grubfs_initializer( grubfs_info_t *dummy ) @@ -370,6 +379,7 @@ { "read", grubfs_files_read }, { "seek", grubfs_files_seek }, { "load", grubfs_files_load }, + { "dir", grubfs_files_dir }, /* special */ { "get-path", grubfs_files_get_path }, Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sat Jul 10 15:11:22 2010 (r816) @@ -144,7 +144,6 @@ return mi->common->file; } -/* static const int days_month[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; @@ -195,6 +194,7 @@ year, month, day, hour, minute, second); } +/* static void dir_fs( file_desc_t *fd ) { @@ -485,6 +485,83 @@ PUSH ((ucell)volname); } +/* static method, ( pathstr len ihandle -- ) */ +static void +hfs_files_dir( hfs_info_t *dummy ) +{ + hfsvol *volume; + hfscommon *common; + hfsdirent ent; + const char *s; + char buf[256], *tmppath; + int fd; + + ihandle_t ih = POP(); + char *path = pop_fstr_copy(); + + fd = open_ih( ih ); + if ( fd == -1 ) { + free( path ); + return; + } + + volume = hfs_mount(fd, 0); + if (!volume) { + return; + } + + common = malloc(sizeof(hfscommon)); + + if (strcmp(path, "\\") == 0) { + common->dir = hfs_opendir(volume, ":"); + } else { + if (path[strlen(path) - 1] == '\\') { + path[strlen(path) - 1] = 0; + } + + tmppath = path; + for( tmppath-- ;; ) { + int n; + + s = ++tmppath; + tmppath = strchr(s, '\\'); + if( !tmppath || !tmppath[1]) + break; + n = MIN( sizeof(buf)-1, (path-s) ); + if( !n ) + continue; + + strncpy( buf, s, n ); + buf[n] = 0; + if( hfs_chdir(volume, buf) ) { + free(common); + free(path); + return; + } + } + + common->dir = hfs_opendir(volume, s); + } + + forth_printf("\n"); + while( !hfs_readdir(common->dir, &ent) ) { + forth_printf("% 10d ", ent.u.file.dsize); + print_date(ent.mddate); + if( ent.flags & HFS_ISDIR ) + forth_printf("%s\\\n", ent.name); + else + forth_printf("%s\n", ent.name); + } + + hfs_closedir( common->dir ); + hfs_umount( volume ); + + close_io( fd ); + + free( common ); + free( path ); +} + /* static method, ( pos.d ih -- flag? ) */ static void hfs_files_probe( hfs_info_t *dummy ) @@ -515,6 +592,7 @@ { "read", hfs_files_read }, { "seek", hfs_files_seek }, { "load", hfs_files_load }, + { "dir", hfs_files_dir }, /* special */ { "open-nwrom", hfs_files_open_nwrom }, Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sat Jul 10 15:11:22 2010 (r816) @@ -24,6 +24,7 @@ #include "unicode.h" #include "blockiter.h" #include "libc/diskio.h" +#include "libc/vsprintf.h" #define MAC_OS_ROM_CREATOR 0x63687270 /* 'chrp' */ #define MAC_OS_ROM_TYPE 0x74627869 /* 'tbxi' */ @@ -432,6 +433,16 @@ PUSH ((ucell)volname); } +/* static method, ( pathstr len ihandle -- ) */ +static void +hfsp_files_dir( hfsp_info_t *dummy ) +{ + forth_printf("dir method not implemented for HFS+ filesystem\n"); + POP(); + POP(); + POP(); +} + /* static method, ( pos.d ih -- flag? ) */ static void hfsp_files_probe( hfsp_info_t *dummy ) @@ -449,7 +460,6 @@ RET (ret); } - static void hfsp_initializer( hfsp_info_t *dummy ) { @@ -463,6 +473,7 @@ { "read", hfsp_files_read }, { "seek", hfsp_files_seek }, { "load", hfsp_files_load }, + { "dir", hfsp_files_dir }, /* special */ { "open-nwrom", hfsp_files_open_nwrom }, Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sat Jul 10 15:11:22 2010 (r816) @@ -156,17 +156,37 @@ PUSH( size ); } +/* static method, ( pathstr len ihandle -- ) */ static void -iso9660_files_dir( iso9660_info_t *mi ) +iso9660_files_dir( iso9660_info_t *dummy ) { + iso9660_VOLUME *volume; + iso9660_COMMON *common; struct iso_directory_record *idr; char name_buf[256]; + int fd; - if (mi->common->type != DIR) + ihandle_t ih = POP(); + char *path = pop_fstr_copy(); + + fd = open_ih( ih ); + if ( fd == -1 ) { + free( path ); return; + } + + volume = iso9660_mount( fd ); + if ( volume == NULL ) { + free ( path ); + close_io( fd ); + return; + } + + common = malloc(sizeof(iso9660_COMMON)); + common->dir = iso9660_opendir( volume, path ); forth_printf("\n"); - while ( (idr = iso9660_readdir(mi->common->dir)) ) { + while ( (idr = iso9660_readdir(common->dir)) ) { forth_printf("% 10d ", isonum_733(idr->size)); forth_printf("%d-%02d-%02d %02d:%02d:%02d ", @@ -174,12 +194,20 @@ idr->date[1], /* month */ idr->date[2], /* day */ idr->date[3], idr->date[4], idr->date[5]); - iso9660_name(mi->common->dir->volume, idr, name_buf); + iso9660_name(common->dir->volume, idr, name_buf); if (idr->flags[0] & 2) forth_printf("%s\\\n", name_buf); else forth_printf("%s\n", name_buf); } + + iso9660_closedir( common->dir ); + iso9660_umount( volume ); + + close_io( fd ); + + free( common ); + free( path ); } /* static method, ( pos.d ih -- flag? ) */ Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/packages/disk-label.c Sat Jul 10 15:11:22 2010 (r816) @@ -41,6 +41,7 @@ int type; /* partition type or -1 */ ihandle_t part_ih; + phandle_t filesystem_ph; } dlabel_info_t; DECLARE_NODE( dlabel, 0, sizeof(dlabel_info_t), "/packages/disk-label" ); @@ -72,6 +73,7 @@ di->part_ih = 0; /* Find parent methods */ + di->filesystem_ph = 0; di->parent_seek_xt = find_parent_method("seek"); di->parent_tell_xt = find_parent_method("tell"); di->parent_read_xt = find_parent_method("read"); @@ -115,6 +117,9 @@ ph = POP_ph(); if( ph ) { /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ + di->filesystem_ph = ph; + + DPRINTF("Located filesystem with ph " FMT_ucellx "\n", ph); DPRINTF("path: %s length: %d\n", path, strlen(path)); if (strlen(path)) { @@ -205,6 +210,24 @@ } } +/* ( pathstr len -- ) */ +static void +dlabel_dir( dlabel_info_t *di ) +{ + if ( di->filesystem_ph ) { + PUSH( my_self() ); + push_str("dir"); + PUSH( di->filesystem_ph ); + fword("find-method"); + POP(); + fword("execute"); + } else { + forth_printf("disk-label: Unable to determine filesystem\n"); + POP(); + POP(); + } +} + NODE_METHODS( dlabel ) = { { "open", dlabel_open }, { "close", dlabel_close }, @@ -213,6 +236,7 @@ { "write", dlabel_write }, { "seek", dlabel_seek }, { "tell", dlabel_tell }, + { "dir", dlabel_dir }, }; void Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/packages/mac-parts.c Sat Jul 10 15:11:22 2010 (r816) @@ -181,7 +181,6 @@ ret = -1; goto out; } - } /* not found */ if (firstHFS != -1) { @@ -341,12 +340,34 @@ load(my_self()); } +/* ( pathstr len -- ) */ +static void +macparts_dir( macparts_info_t *di ) +{ + /* On PPC Mac, the first partition chosen according to the CHRP boot + specification (i.e. marked as bootable) may not necessarily contain + a valid FS */ + if ( di->filesystem_ph ) { + PUSH( my_self() ); + push_str("dir"); + PUSH( di->filesystem_ph ); + fword("find-method"); + POP(); + fword("execute"); + } else { + forth_printf("mac-parts: Unable to determine filesystem\n"); + POP(); + POP(); + } +} + NODE_METHODS( macparts ) = { { "probe", macparts_probe }, { "open", macparts_open }, { "seek", macparts_seek }, { "read", macparts_read }, { "load", macparts_load }, + { "dir", macparts_dir }, { "get-info", macparts_get_info }, { "block-size", macparts_block_size }, { NULL, macparts_initialize }, Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/packages/pc-parts.c Sat Jul 10 15:11:22 2010 (r816) @@ -365,6 +365,23 @@ load(my_self()); } +/* ( pathstr len -- ) */ +static void +pcparts_dir( pcparts_info_t *di ) +{ + if ( di->filesystem_ph ) { + PUSH( my_self() ); + push_str("dir"); + PUSH( di->filesystem_ph ); + fword("find-method"); + POP(); + fword("execute"); + } else { + forth_printf("pc-parts: Unable to determine filesystem\n"); + POP(); + POP(); + } +} NODE_METHODS( pcparts ) = { { "probe", pcparts_probe }, @@ -372,6 +389,7 @@ { "seek", pcparts_seek }, { "read", pcparts_read }, { "load", pcparts_load }, + { "dir", pcparts_dir }, { "get-info", pcparts_get_info }, { "block-size", pcparts_block_size }, { NULL, pcparts_initialize }, Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sun Jul 4 15:37:00 2010 (r815) +++ trunk/openbios-devel/packages/sun-parts.c Sat Jul 10 15:11:22 2010 (r816) @@ -297,6 +297,23 @@ load(my_self()); } +/* ( pathstr len -- ) */ +static void +sunparts_dir( sunparts_info_t *di ) +{ + if ( di->filesystem_ph) { + PUSH( my_self() ); + push_str("dir"); + PUSH( di->filesystem_ph ); + fword("find-method"); + POP(); + fword("execute"); + } else { + forth_printf("sun-parts: Unable to determine filesystem\n"); + POP(); + POP(); + } +} NODE_METHODS( sunparts ) = { { "probe", sunparts_probe }, @@ -306,6 +323,7 @@ { "seek", sunparts_seek }, { "read", sunparts_read }, { "load", sunparts_load }, + { "dir", sunparts_dir }, { NULL, sunparts_initialize }, };

2 1

ISO archive on www.openfirmware.info?
by Mark Cave-Ayland 06 Jul '10

06 Jul '10

Hi all, Having struggled to get hold of an old Debian ISO for SPARC32 testing, I'm wondering would it be worth setting up a download area on www.openfirmware.info for storing ISOs for OpenBIOS testing? We could then setup a new page on the wiki which links to each ISO grouped by platform (which would act as a rough regression checklist for patches). Thoughts? 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

5 7

[commit] r815 - in trunk/openbios-devel: fs/grubfs packages
by repository service 04 Jul '10

04 Jul '10

Author: mcayland Date: Sun Jul 4 15:37:00 2010 New Revision: 815 URL: http://tracker.coreboot.org/trac/openbios/changeset/815 Log: Move the grubfs filesystem handler into its own new package /packages/grubfs-files. This is the last of the filesystems to be migrated to a standard package. Note that with this in place /packages/misc-files is obsolete (it is currently disabled) and very likely to be removed. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c trunk/openbios-devel/packages/init.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/packages.h Modified: trunk/openbios-devel/fs/grubfs/grubfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Jul 4 12:56:05 2010 (r814) +++ trunk/openbios-devel/fs/grubfs/grubfs_fs.c Sun Jul 4 15:37:00 2010 (r815) @@ -1,10 +1,11 @@ /* - * <grubfs_fs.c> + * /packages/grubfs-files * * grub vfs * * Copyright (C) 2004 Stefan Reinauer * Copyright (C) 2004 Samuel Rydh + * Copyright (C) 2010 Mark Cave-Ayland * * inspired by HFS code from Samuel Rydh * @@ -22,6 +23,8 @@ #include "libc/diskio.h" #include "libc/vsprintf.h" +extern void grubfs_init( void ); + /************************************************************************/ /* grub GLOBALS (horrible... but difficult to fix) */ /************************************************************************/ @@ -91,49 +94,180 @@ unsigned long pos; unsigned long len; const char *path; - const fs_ops_t *fs; } grubfile_t; typedef struct { const struct fsys_entry *fsys; grubfile_t *fd; - int dev_fd; - llong offset; /* Offset added onto each device read; should only ever be non-zero + int dev_fd; + llong offset; /* Offset added onto each device read; should only ever be non-zero when probing a partition for a filesystem */ } grubfs_t; +typedef struct { + grubfs_t *gfs; +} grubfs_info_t; + +/* Static block and global pointer required for I/O glue */ static grubfs_t dummy_fs; -static grubfs_t *curfs=&dummy_fs; +static grubfs_t *curfs = &dummy_fs; + +DECLARE_NODE( grubfs, 0, sizeof(grubfs_info_t), "+/packages/grubfs-files" ); + + +/************************************************************************/ +/* I/O glue (called by grub source) */ +/************************************************************************/ + +int +devread( unsigned long sector, unsigned long byte_offset, + unsigned long byte_len, void *buf ) +{ + llong offs = (llong)sector * 512 + byte_offset; + +#ifdef CONFIG_DEBUG_FS + //printk("devread s=%x buf=%x, fd=%x\n",sector, buf, curfs->dev_fd); +#endif + + if( !curfs ) { +#ifdef CONFIG_DEBUG_FS + printk("devread: fsys == NULL!\n"); +#endif + return -1; + } + + if( seek_io(curfs->dev_fd, offs + curfs->offset) ) { +#ifdef CONFIG_DEBUG_FS + printk("seek failure\n"); +#endif + return -1; + } + return (read_io(curfs->dev_fd, buf, byte_len) == byte_len) ? 1:0; +} + +int +file_read( void *buf, unsigned long len ) +{ + if (filepos < 0 || filepos > filemax) + filepos = filemax; + if (len > filemax-filepos) + len = filemax - filepos; + errnum = 0; + return curfs->fsys->read_func( buf, len ); +} + /************************************************************************/ -/* file/fs ops */ +/* Standard package methods */ /************************************************************************/ +/* ( -- success? ) */ +static void +grubfs_files_open( grubfs_info_t *mi ) +{ + int fd, i; + char *path = my_args_copy(); + char *s; + + fd = open_ih( my_parent() ); + if ( fd == -1 ) { + free( path ); + RET( 0 ); + } + + mi->gfs = &dummy_fs; + + for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) { +#ifdef CONFIG_DEBUG_FS + printk("Trying %s\n", fsys_table[i].name); +#endif + if (fsys_table[i].mount_func()) { + const fsys_entry_t *fsys = &fsys_table[i]; +#ifdef CONFIG_DEBUG_FS + printk("Mounted %s\n", fsys->name); +#endif + mi->gfs = malloc(sizeof(grubfs_t)); + mi->gfs->fsys = fsys; + mi->gfs->dev_fd = fd; + mi->gfs->offset = 0; + + s = path; + while (*s) { + if(*s=='\\') *s='/'; + s++; + } +#ifdef CONFIG_DEBUG_FS + printk("Path=%s\n",path); +#endif + if (!mi->gfs->fsys->dir_func((char *) path)) { + forth_printf("File not found\n"); + RET( 0 ); + } + + mi->gfs->fd = malloc(sizeof(grubfile_t)); + mi->gfs->fd->pos = filepos; + mi->gfs->fd->len = filemax; + mi->gfs->fd->path = strdup(path); + + RET( -1 ); + } + } +#ifdef CONFIG_DEBUG_FS + printk("Unknown filesystem type\n"); +#endif + + RET( 0 ); +} + +/* ( -- ) */ static void -grubfs_file_close( file_desc_t *fd ) +grubfs_files_close( grubfs_info_t *mi ) { - grubfile_t *gf = (grubfile_t *)fd; + grubfile_t *gf = mi->gfs->fd; if (gf->path) free((void *)(gf->path)); - free(fd); - filepos=0; - filemax=0; + free(gf); + + filepos = 0; + filemax = 0; } -static int -grubfs_file_lseek( file_desc_t *fd, off_t offs, int whence ) +/* ( buf len -- actlen ) */ +static void +grubfs_files_read( grubfs_info_t *mi ) { - grubfile_t *file = (grubfile_t*)fd; + int count = POP(); + char *buf = (char *)POP(); + + grubfile_t *file = mi->gfs->fd; + int ret; + + filepos = file->pos; + filemax = file->len; + + if (count > filemax - filepos) + count = filemax - filepos; + + ret = mi->gfs->fsys->read_func(buf, count); + + file->pos = filepos; + + RET( ret ); +} + +/* ( pos.d -- status ) */ +static void +grubfs_files_seek( grubfs_info_t *mi ) +{ + llong pos = DPOP(); + int offs = (int)pos; + int whence = SEEK_SET; + + grubfile_t *file = mi->gfs->fd; unsigned long newpos; switch( whence ) { - case SEEK_CUR: - if (offs < 0 && (unsigned long) -offs > file->pos) - newpos = 0; - else - newpos = file->pos + offs; - break; case SEEK_END: if (offs < 0 && (unsigned long) -offs > file->len) newpos = 0; @@ -145,203 +279,107 @@ newpos = (offs < 0) ? 0 : offs; break; } + if (newpos > file->len) newpos = file->len; file->pos = newpos; - return newpos; -} - -static int -grubfs_file_read( file_desc_t *fd, void *buf, size_t count ) -{ - grubfile_t *file = (grubfile_t*)fd; - int ret; - - curfs = (grubfs_t *)file->fs->fs_data; - - filepos=file->pos; - filemax=file->len; - - if (count > filemax - filepos) - count = filemax - filepos; - - ret=curfs->fsys->read_func(buf, count); - - file->pos=filepos; - return ret; + if (newpos) + RET( -1 ); + else + RET( 0 ); } -static char * -get_path( file_desc_t *fd, char *retbuf, int len ) +/* ( addr -- size ) */ +static void +grubfs_files_load( grubfs_info_t *mi ) { - const char *path=((grubfile_t *)fd)->path; + char *buf = (char *)POP(); + int count, ret; - if(strlen(path) > len) - return NULL; + grubfile_t *file = mi->gfs->fd; + count = file->len; - strcpy( retbuf, path ); + ret = mi->gfs->fsys->read_func(buf, count); + file->pos = filepos; - return retbuf; + RET( ret ); } -static file_desc_t * -open_path( fs_ops_t *fs, const char *path ) +/* ( -- cstr ) */ +static void +grubfs_files_get_path( grubfs_info_t *mi ) { - grubfile_t *ret = NULL; - char *s = (char *)path; - - curfs = (grubfs_t *)fs->fs_data; + grubfile_t *file = mi->gfs->fd; + const char *path = file->path; - while(*s) { - if(*s=='\\') *s='/'; - s++; - } -#ifdef CONFIG_DEBUG_FS - printk("Path=%s\n",path); -#endif - if (!curfs->fsys->dir_func((char *) path)) { - forth_printf("File not found\n"); - return NULL; - } - ret=malloc(sizeof(grubfile_t)); - - ret->pos=filepos; - ret->len=filemax; - ret->path=strdup(path); - ret->fs=fs; - - return (file_desc_t *)ret; + RET( (ucell) strdup(path) ); } +/* ( -- cstr ) */ static void -close_fs( fs_ops_t *fs ) +grubfs_files_get_fstype( grubfs_info_t *mi ) { - free( fs->fs_data ); - fs->fs_data = NULL; - - /* callers responsibility to call free(fs) */ -} + grubfs_t *gfs = mi->gfs; -static const char * -grubfs_get_fstype( fs_ops_t *fs ) -{ - grubfs_t *gfs = (grubfs_t*)fs->fs_data; - return gfs->fsys->name; + PUSH( (ucell)strdup(gfs->fsys->name) ); } -static const fs_ops_t grubfs_ops = { - .close_fs = close_fs, - .open_path = open_path, - .get_path = get_path, - .close = grubfs_file_close, - .read = grubfs_file_read, - .lseek = grubfs_file_lseek, - - .get_fstype = grubfs_get_fstype, -}; -/* mount */ -int -fs_grubfs_open( int fd, fs_ops_t *fs ) +/* static method, ( pos.d ih -- flag? ) */ +static void +grubfs_files_probe( grubfs_info_t *dummy ) { - grubfs_t *gfs; + ihandle_t ih = POP_ih(); + llong offs = DPOP(); int i; - curfs=&dummy_fs; - - curfs->dev_fd = fd; - curfs->offset = 0; + curfs->dev_fd = open_ih(ih); + curfs->offset = offs; for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) { #ifdef CONFIG_DEBUG_FS - printk("Trying %s\n", fsys_table[i].name); + printk("Probing for %s\n", fsys_table[i].name); #endif if (fsys_table[i].mount_func()) { - const fsys_entry_t *fsys = &fsys_table[i]; -#ifdef CONFIG_DEBUG_FS - printk("Mounted %s\n", fsys->name); -#endif - - gfs = malloc(sizeof(*gfs)); - gfs->fsys = fsys; - gfs->dev_fd = fd; - - *fs=grubfs_ops; - fs->fs_data = (void*)gfs; - return 0; + RET( -1 ); } } + #ifdef CONFIG_DEBUG_FS printk("Unknown filesystem type\n"); #endif - return -1; -} -/* Probe for filesystem (with partition offset); returns 0 on success */ -int -fs_grubfs_probe( int fd, llong offs ) -{ - int i; - - curfs = &dummy_fs; - - curfs->dev_fd = fd; - curfs->offset = offs; + close_io(curfs->dev_fd); - for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) { -#ifdef CONFIG_DEBUG_FS - printk("Probing for %s\n", fsys_table[i].name); -#endif - if (fsys_table[i].mount_func()) - return 0; - } - -#ifdef CONFIG_DEBUG_FS - printk("Unknown filesystem type\n"); -#endif - return -1; + RET ( 0 ); } -/************************************************************************/ -/* I/O glue (called by grub source) */ -/************************************************************************/ - -int -devread( unsigned long sector, unsigned long byte_offset, - unsigned long byte_len, void *buf ) +static void +grubfs_initializer( grubfs_info_t *dummy ) { - llong offs = (llong)sector * 512 + byte_offset; + fword("register-fs-package"); +} -#ifdef CONFIG_DEBUG_FS - //printk("devread s=%x buf=%x, fd=%x\n",sector, buf, curfs->dev_fd); -#endif +NODE_METHODS( grubfs ) = { + { "probe", grubfs_files_probe }, + { "open", grubfs_files_open }, + { "close", grubfs_files_close }, + { "read", grubfs_files_read }, + { "seek", grubfs_files_seek }, + { "load", grubfs_files_load }, - if( !curfs ) { -#ifdef CONFIG_DEBUG_FS - printk("devread: fsys == NULL!\n"); -#endif - return -1; - } + /* special */ + { "get-path", grubfs_files_get_path }, + { "get-fstype", grubfs_files_get_fstype }, - if( seek_io(curfs->dev_fd, offs + curfs->offset) ) { -#ifdef CONFIG_DEBUG_FS - printk("seek failure\n"); -#endif - return -1; - } - return (read_io(curfs->dev_fd, buf, byte_len) == byte_len) ? 1:0; -} + { NULL, grubfs_initializer }, +}; -int -file_read( void *buf, unsigned long len ) +void +grubfs_init( void ) { - if (filepos < 0 || filepos > filemax) - filepos = filemax; - if (len > filemax-filepos) - len = filemax - filepos; - errnum = 0; - return curfs->fsys->read_func( buf, len ); + REGISTER_NODE( grubfs ); } Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Jul 4 12:56:05 2010 (r814) +++ trunk/openbios-devel/packages/init.c Sun Jul 4 15:37:00 2010 (r815) @@ -42,6 +42,9 @@ #ifdef CONFIG_ISO9660 iso9660_init(); #endif +#ifdef CONFIG_GRUBFS + grubfs_init(); +#endif #ifdef CONFIG_FS files_init(); #endif Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Jul 4 12:56:05 2010 (r814) +++ trunk/openbios-devel/packages/misc-files.c Sun Jul 4 15:37:00 2010 (r815) @@ -58,7 +58,7 @@ if( !err ) { - err = fs_grubfs_open(fd, fs); + err = -1; DPRINTF("--- grubfs returned %d\n", err); fs->fd = fd; @@ -333,8 +333,8 @@ err = (fd = open_ih(ih)) == -1; if( !err ) { - err = fs_grubfs_probe(fd, offs); - DPRINTF("--- grubfs returned %d\n", err); + err = -1; + offs = 0; } if (fd) Modified: trunk/openbios-devel/packages/packages.h ============================================================================== --- trunk/openbios-devel/packages/packages.h Sun Jul 4 12:56:05 2010 (r814) +++ trunk/openbios-devel/packages/packages.h Sun Jul 4 15:37:00 2010 (r815) @@ -24,6 +24,7 @@ extern void hfsp_init( void ); extern void hfs_init( void ); extern void ext2_init( void ); +extern void grubfs_init( void ); extern void macparts_init( void ); extern void pcparts_init( void ); extern void sunparts_init( void );

1 0

[commit] r814 - trunk/openbios-devel/fs/hfs
by repository service 04 Jul '10

04 Jul '10

Author: mcayland Date: Sun Jul 4 12:56:05 2010 New Revision: 814 URL: http://tracker.coreboot.org/trac/openbios/changeset/814 Log: Fix incorrect interpretation of HFS seek function result code which was causing FC12 to fail during second-stage boot. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Jul 4 12:18:03 2010 (r813) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Jul 4 12:56:05 2010 (r814) @@ -392,10 +392,10 @@ } ret = hfs_seek( common->file, offs, whence ); - if (ret) - RET( -1 ); - else + if (ret != -1) RET( 0 ); + else + RET( -1 ); } /* ( addr -- size ) */

1 0

[commit] r813 - in trunk/openbios-devel: fs/ext2 packages
by repository service 04 Jul '10

04 Jul '10

Author: mcayland Date: Sun Jul 4 12:18:03 2010 New Revision: 813 URL: http://tracker.coreboot.org/trac/openbios/changeset/813 Log: Move the ext2 filesystem handler into its own new package /packages/ext2-files. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c trunk/openbios-devel/packages/init.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/packages.h Modified: trunk/openbios-devel/fs/ext2/ext2_fs.c ============================================================================== --- trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Jul 4 01:29:37 2010 (r812) +++ trunk/openbios-devel/fs/ext2/ext2_fs.c Sun Jul 4 12:18:03 2010 (r813) @@ -1,15 +1,22 @@ /* + * /packages/ext2-files * * (c) 2008-2009 Laurent Vivier <Laurent(a)lvivier.info> + * (c) 2010 Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> * * This file has been copied from EMILE, http://emile.sf.net * */ +#include "config.h" +#include "libopenbios/bindings.h" #include "libext2.h" #include "ext2_utils.h" #include "fs/fs.h" #include "libc/vsprintf.h" +#include "libc/diskio.h" + +extern void ext2_init( void ); typedef struct { enum { FILE, DIR } type; @@ -19,14 +26,14 @@ }; } ext2_COMMON; -static void -umount( fs_ops_t *fs ) -{ - ext2_VOLUME *volume = (ext2_VOLUME *)fs->fs_data; +typedef struct { + ext2_VOLUME *volume; + ext2_COMMON *common; +} ext2_info_t; - ext2_umount( volume ); -} +DECLARE_NODE( ext2, 0, sizeof(ext2_info_t), "+/packages/ext2-files" ); +/* static const int days_month[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; static const int days_month_leap[12] = @@ -97,115 +104,177 @@ forth_printf("%s\n", entry->name); } } +*/ + +/************************************************************************/ +/* Standard package methods */ +/************************************************************************/ -static file_desc_t * -open_path( fs_ops_t *fs, const char *path ) +/* ( -- success? ) */ +static void +ext2_files_open( ext2_info_t *mi ) { - ext2_VOLUME *volume = (ext2_VOLUME *)fs->fs_data; - ext2_COMMON *common; + int fd; + char *path = my_args_copy(); - common = (ext2_COMMON*)malloc(sizeof(*common)); - if (common == NULL) - return NULL; - - common->dir = ext2_opendir(volume, path); - if (common->dir == NULL) { - common->file = ext2_open(volume, path); - if (common->file == NULL) { - free(common); - return NULL; + fd = open_ih( my_parent() ); + if ( fd == -1 ) { + free( path ); + RET( 0 ); + } + + mi->volume = ext2_mount(fd); + if (!mi->volume) { + RET( 0 ); + } + + mi->common = (ext2_COMMON*)malloc(sizeof(ext2_COMMON)); + if (mi->common == NULL) + RET( 0 ); + + mi->common->dir = ext2_opendir(mi->volume, path); + if (mi->common->dir == NULL) { + mi->common->file = ext2_open(mi->volume, path); + if (mi->common->file == NULL) { + free(mi->common); + RET( 0 ); } - common->type = FILE; - return (file_desc_t *)common; + mi->common->type = FILE; + RET( -1 ); } - common->type = DIR; - return (file_desc_t *)common; + mi->common->type = DIR; + RET( -1 ); } -static char * -get_path( file_desc_t *fd, char *buf, int size ) +/* ( -- ) */ +static void +ext2_files_close( ext2_info_t *mi ) { - ext2_COMMON *common =(ext2_COMMON *)fd; - - if (common->type != FILE) - return NULL; + ext2_COMMON *common = mi->common; - strncpy(buf, common->file->path, size); + if (common->type == FILE) + ext2_close(common->file); + else if (common->type == DIR) + ext2_closedir(common->dir); + free(common); - return buf; + ext2_umount(mi->volume); } -static int -file_lseek( file_desc_t *fd, off_t offs, int whence ) +/* ( buf len -- actlen ) */ +static void +ext2_files_read( ext2_info_t *mi ) { - ext2_COMMON *common =(ext2_COMMON *)fd; + int count = POP(); + char *buf = (char *)POP(); + ext2_COMMON *common = mi->common; if (common->type != FILE) - return -1; + RET( -1 ); - return ext2_lseek(common->file, offs, whence); + RET ( ext2_read( common->file, buf, count ) ); } +/* ( pos.d -- status ) */ static void -file_close( file_desc_t *fd ) +ext2_files_seek( ext2_info_t *mi ) { - ext2_COMMON *common =(ext2_COMMON *)fd; + llong pos = DPOP(); + int offs = (int)pos; + int whence = SEEK_SET; + int ret; + ext2_COMMON *common = mi->common; - if (common->type == FILE) - ext2_close(common->file); - else if (common->type == DIR) - ext2_closedir(common->dir); - free(common); + if (common->type != FILE) + RET( -1 ); + + ret = ext2_lseek(common->file, offs, whence); + if (ret) + RET( -1 ); + else + RET( 0 ); } -static int -file_read( file_desc_t *fd, void *buf, size_t count ) +/* ( addr -- size ) */ +static void +ext2_files_load( ext2_info_t *mi ) { - ext2_COMMON *common =(ext2_COMMON *)fd; + char *buf = (char *)POP(); + int count; + ext2_COMMON *common = mi->common; if (common->type != FILE) - return -1; + RET( -1 ); + + /* Seek to the end in order to get the file size */ + ext2_lseek(common->file, 0, SEEK_END); + count = common->file->offset; + ext2_lseek(common->file, 0, SEEK_SET); - return ext2_read(common->file, buf, count); + RET ( ext2_read( common->file, buf, count ) ); } -static const char * -get_fstype( fs_ops_t *fs) +/* ( -- cstr ) */ +static void +ext2_files_get_path( ext2_info_t *mi ) { - return "EXT2"; -} + ext2_COMMON *common = mi->common; -static const fs_ops_t ext2_ops = { - .dir = dir_fs, - .close_fs = umount, + if (common->type != FILE) + RET( 0 ); - .open_path = open_path, - .get_path = get_path, - .close = file_close, - .read = file_read, - .lseek = file_lseek, + RET( (ucell) strdup(common->file->path) ); +} - .get_fstype = get_fstype, -}; +/* ( -- cstr ) */ +static void +ext2_files_get_fstype( ext2_info_t *mi ) +{ + PUSH( (ucell)strdup("ext2") ); +} -int fs_ext2_open(int fd, fs_ops_t *fs) + +/* static method, ( pos.d ih -- flag? ) */ +static void +ext2_files_probe( ext2_info_t *dummy ) { - ext2_VOLUME *volume; + ihandle_t ih = POP_ih(); + llong offs = DPOP(); + int fd, ret = 0; - volume = ext2_mount(fd); - if (volume == NULL) - return -1; + fd = open_ih(ih); + if (ext2_probe(fd, offs)) + ret = -1; - *fs = ext2_ops; - fs->fs_data = volume; + close_io(fd); - return 0; + RET (ret); } -int fs_ext2_probe(int fd, llong offs) + +static void +ext2_initializer( ext2_info_t *dummy ) { - if (ext2_probe(fd, offs)) - return 0; + fword("register-fs-package"); +} + +NODE_METHODS( ext2 ) = { + { "probe", ext2_files_probe }, + { "open", ext2_files_open }, + { "close", ext2_files_close }, + { "read", ext2_files_read }, + { "seek", ext2_files_seek }, + { "load", ext2_files_load }, + + /* special */ + { "get-path", ext2_files_get_path }, + { "get-fstype", ext2_files_get_fstype }, - return -1; + { NULL, ext2_initializer }, +}; + +void +ext2_init( void ) +{ + REGISTER_NODE( ext2 ); } Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Jul 4 01:29:37 2010 (r812) +++ trunk/openbios-devel/packages/init.c Sun Jul 4 12:18:03 2010 (r813) @@ -36,6 +36,9 @@ #ifdef CONFIG_HFS hfs_init(); #endif +#ifdef CONFIG_EXT2 + ext2_init(); +#endif #ifdef CONFIG_ISO9660 iso9660_init(); #endif Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Jul 4 01:29:37 2010 (r812) +++ trunk/openbios-devel/packages/misc-files.c Sun Jul 4 12:18:03 2010 (r813) @@ -58,13 +58,8 @@ if( !err ) { - err = fs_ext2_open(fd, fs); - DPRINTF("--- ext2 returned %d\n", err); - - if( err ) { - err = fs_grubfs_open(fd, fs); - DPRINTF("--- grubfs returned %d\n", err); - } + err = fs_grubfs_open(fd, fs); + DPRINTF("--- grubfs returned %d\n", err); fs->fd = fd; } @@ -338,13 +333,8 @@ err = (fd = open_ih(ih)) == -1; if( !err ) { - err = fs_ext2_probe(fd, offs); - DPRINTF("--- ext2 returned %d\n", err); - - if( err ) { - err = fs_grubfs_probe(fd, offs); - DPRINTF("--- grubfs returned %d\n", err); - } + err = fs_grubfs_probe(fd, offs); + DPRINTF("--- grubfs returned %d\n", err); } if (fd) Modified: trunk/openbios-devel/packages/packages.h ============================================================================== --- trunk/openbios-devel/packages/packages.h Sun Jul 4 01:29:37 2010 (r812) +++ trunk/openbios-devel/packages/packages.h Sun Jul 4 12:18:03 2010 (r813) @@ -23,6 +23,7 @@ extern void iso9660_init( void ); extern void hfsp_init( void ); extern void hfs_init( void ); +extern void ext2_init( void ); extern void macparts_init( void ); extern void pcparts_init( void ); extern void sunparts_init( void );

1 0

[commit] r812 - in trunk/openbios-devel: fs/hfs packages
by repository service 04 Jul '10

04 Jul '10

Author: mcayland Date: Sun Jul 4 01:29:37 2010 New Revision: 812 URL: http://tracker.coreboot.org/trac/openbios/changeset/812 Log: Move the HFS filesystem handler into its own new package /packages/hfs-files. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/packages/init.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/packages.h Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Jul 4 01:22:21 2010 (r811) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sun Jul 4 01:29:37 2010 (r812) @@ -2,11 +2,12 @@ * Creation Date: <2001/05/06 22:47:23 samuel> * Time-stamp: <2004/01/12 10:24:35 samuel> * - * <hfs_fs.c> + * /packages/hfs-files * * HFS world interface * * Copyright (C) 2001-2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,8 +16,10 @@ */ #include "config.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "libc/vsprintf.h" +#include "libc/diskio.h" #include "libhfs.h" #define MAC_OS_ROM_CREATOR 0x63687270 /* 'chrp' */ @@ -28,6 +31,10 @@ #define SYSTEM_TYPE 0x7A737973 /* 'zsys' */ #define SYSTEM_CREATOR 0x4D414353 /* 'MACS' */ +#define VOLNAME_SIZE 64 + +extern void hfs_init( void ); + typedef struct { enum { FILE, DIR } type; union { @@ -36,6 +43,12 @@ }; } hfscommon; +typedef struct { + hfsvol *vol; + hfscommon *common; +} hfs_info_t; + +DECLARE_NODE( hfs, 0, sizeof(hfs_info_t), "+/packages/hfs-files" ); /************************************************************************/ /* Search Functions */ @@ -64,7 +77,7 @@ /* ret: 0=success, 1=not_found, 2=not_a_dir */ static int -_search( hfsvol *vol, const char *path, const char *sname, file_desc_t **ret_fd ) +_search( hfsvol *vol, const char *path, const char *sname, hfsfile **ret_fd ) { hfsdir *dir; hfsdirent ent; @@ -111,7 +124,7 @@ || _find_file( vol, path, SYSTEM_TYPE, SYSTEM_CREATOR ); } } - if( !status && topdir && ret_fd && !(*ret_fd=(file_desc_t*)hfs_open(vol, buf)) ) { + if( !status && topdir && ret_fd && !(*ret_fd=hfs_open(vol, buf)) ) { printk("Unexpected error: failed to open matched ROM\n"); status = 1; } @@ -120,154 +133,139 @@ return status; } -static file_desc_t * -_do_search( fs_ops_t *fs, const char *sname ) +static hfsfile * +_do_search( hfs_info_t *mi, const char *sname ) { hfsvol *vol = hfs_getvol( NULL ); - file_desc_t *ret_fd = NULL; - (void)_search( vol, ":", sname, &ret_fd ); - return ret_fd; + mi->common->type = FILE; + (void)_search( vol, ":", sname, &mi->common->file ); + + return mi->common->file; } -static file_desc_t * -search_rom( fs_ops_t *fs ) +/* + +static const int days_month[12] = + { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; +static const int days_month_leap[12] = + { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; + +static inline int is_leap(int year) { - return _do_search( fs, NULL ); + return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0); } -static file_desc_t * -search_file( fs_ops_t *fs, const char *sname ) +static void +print_date(time_t sec) { - return _do_search( fs, sname ); -} + unsigned int second, minute, hour, month, day, year; + int current; + const int *days; + second = sec % 60; + sec /= 60; -/************************************************************************/ -/* file/fs ops */ -/************************************************************************/ + minute = sec % 60; + sec /= 60; -static void -file_close( file_desc_t *fd ) -{ - hfscommon *common = (hfscommon*)fd; - if (common->type == FILE) - hfs_close( common->file ); - else if (common->type == DIR) - hfs_closedir( common->dir ); - free(common); -} + hour = sec % 24; + sec /= 24; -static int -file_lseek( file_desc_t *fd, off_t offs, int whence ) -{ - hfscommon *common = (hfscommon*)fd; + year = sec * 100 / 36525; + sec -= year * 36525 / 100; + year += 1970; - if (common->type != FILE) - return -1; + days = is_leap(year) ? days_month_leap : days_month; - switch( whence ) { - case SEEK_CUR: - whence = HFS_SEEK_CUR; - break; - case SEEK_END: - whence = HFS_SEEK_END; - break; - default: - case SEEK_SET: - whence = HFS_SEEK_SET; - break; + current = 0; + month = 0; + while (month < 12) { + if (sec <= current + days[month]) { + break; + } + current += days[month]; + month++; } + month++; - return hfs_seek( common->file, offs, whence ); -} + day = sec - current + 1; -static int -file_read( file_desc_t *fd, void *buf, size_t count ) -{ - hfscommon *common = (hfscommon*)fd; - if (common->type != FILE) - return -1; - return hfs_read( common->file, buf, count ); + forth_printf("%d-%02d-%02d %02d:%02d:%02d ", + year, month, day, hour, minute, second); } -static char * -get_path( file_desc_t *fd, char *retbuf, int len ) +static void +dir_fs( file_desc_t *fd ) { - char buf[256], buf2[256]; hfscommon *common = (hfscommon*)fd; - hfsvol *vol = hfs_getvol( NULL ); hfsdirent ent; - int start, ns; - ulong id; - if (common->type != FILE) - return NULL; - - hfs_fstat( common->file, &ent ); - start = sizeof(buf) - strlen(ent.name) - 1; - if( start <= 0 ) - return NULL; - strcpy( buf+start, ent.name ); - buf[--start] = '\\'; + if (common->type != DIR) + return; - ns = start; - for( id=ent.parid ; !hfs_dirinfo(vol, &id, buf2) ; ) { - start = ns; - ns -= strlen(buf2); - if( ns <= 0 ) - return NULL; - strcpy( buf+ns, buf2 ); - buf[--ns] = buf[start] = '\\'; + forth_printf("\n"); + while( !hfs_readdir(common->dir, &ent) ) { + forth_printf("% 10d ", ent.u.file.dsize); + print_date(ent.mddate); + if( ent.flags & HFS_ISDIR ) + forth_printf("%s\\\n", ent.name); + else + forth_printf("%s\n", ent.name); } - if( strlen(buf + start) >= len ) - return NULL; - - strcpy( retbuf, buf+start ); - return retbuf; -} - -static char * -vol_name( fs_ops_t *fs, char *buf, int size ) -{ - return get_hfs_vol_name( fs->fd, buf, size ); } +*/ +/************************************************************************/ +/* Standard package methods */ +/************************************************************************/ -static file_desc_t * -open_path( fs_ops_t *fs, const char *fullpath ) +/* ( -- success? ) */ +static void +hfs_files_open( hfs_info_t *mi ) { - hfsvol *vol = (hfsvol*)fs->fs_data; + int fd; + char *path = my_args_copy(); + const char *s; char buf[256]; - hfscommon *common; - char *path = strdup(fullpath); + + fd = open_ih( my_parent() ); + if ( fd == -1 ) { + free( path ); + RET( 0 ); + } + + mi->vol = hfs_mount(fd, 0); + if (!mi->vol) { + RET( 0 ); + } if( !strncmp(path, "\\\\", 2) ) { hfsvolent ent; /* \\ is an alias for the (blessed) system folder */ - if( hfs_vstat(vol, &ent) < 0 || hfs_setcwd(vol, ent.blessed) ) { + if( hfs_vstat(mi->vol, &ent) < 0 || hfs_setcwd(mi->vol, ent.blessed) ) { free(path); - return NULL; + RET( -1 ); } path += 2; } else { - hfs_chdir( vol, ":" ); + hfs_chdir( mi->vol, ":" ); } - common = malloc(sizeof(*common)); - if (!common) { + mi->common = malloc(sizeof(hfscommon)); + if (!mi->common) { free(path); - return NULL; + RET( 0 ); } if (strcmp(path, "\\") == 0) { /* root directory is in fact ":" */ - common->dir = hfs_opendir(vol, ":"); - common->type = DIR; + mi->common->dir = hfs_opendir(mi->vol, ":"); + mi->common->type = DIR; free(path); - return (file_desc_t*)common; + RET( -1 ); } if (path[strlen(path) - 1] == '\\') { @@ -287,183 +285,248 @@ strncpy( buf, s, n ); buf[n] = 0; - if( hfs_chdir(vol, buf) ) { - free(common); + if( hfs_chdir(mi->vol, buf) ) { + free(mi->common); free(path); - return NULL; + RET( 0 ); } } /* support the ':filetype' syntax */ if( *s == ':' ) { - unsigned long id, oldid = hfs_getcwd(vol); - file_desc_t *ret = NULL; + unsigned long id, oldid = hfs_getcwd(mi->vol); hfsdirent ent; hfsdir *dir; s++; id = oldid; - hfs_dirinfo( vol, &id, buf ); - hfs_setcwd( vol, id ); + hfs_dirinfo( mi->vol, &id, buf ); + hfs_setcwd( mi->vol, id ); - if( !(dir=hfs_opendir(vol, buf)) ) { - free(common); + if( !(dir=hfs_opendir(mi->vol, buf)) ) { + free(mi->common); free(path); - return NULL; + RET( 0 ); } - hfs_setcwd( vol, oldid ); + hfs_setcwd( mi->vol, oldid ); while( !hfs_readdir(dir, &ent) ) { if( ent.flags & HFS_ISDIR ) continue; if( !strncmp(s, ent.u.file.type, 4) ) { - common->type = FILE; - common->file = hfs_open( vol, ent.name ); - ret = (file_desc_t*)common; + mi->common->type = FILE; + mi->common->file = hfs_open( mi->vol, ent.name ); break; } } hfs_closedir( dir ); free(path); - return ret; + RET( -1 ); } - common->dir = hfs_opendir(vol, s); - if (!common->dir) { - common->file = hfs_open( vol, s ); - if (common->file == NULL) { - free(common); + mi->common->dir = hfs_opendir(mi->vol, s); + if (!mi->common->dir) { + mi->common->file = hfs_open( mi->vol, s ); + if (mi->common->file == NULL) { + free(mi->common); free(path); - return NULL; + RET( 0 ); } - common->type = FILE; + mi->common->type = FILE; free(path); - return (file_desc_t*)common; + RET( -1 ); } - common->type = DIR; + mi->common->type = DIR; free(path); - return (file_desc_t*)common; + + RET( -1 ); } +/* ( -- ) */ static void -close_fs( fs_ops_t *fs ) +hfs_files_close( hfs_info_t *mi ) { - hfsvol *vol = (hfsvol*)fs->fs_data; - - hfs_umount( vol ); - /* callers responsibility to call free(fs) */ + hfscommon *common = mi->common; + if (common->type == FILE) + hfs_close( common->file ); + else if (common->type == DIR) + hfs_closedir( common->dir ); + free(common); } -static const int days_month[12] = - { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -static const int days_month_leap[12] = - { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; - -static inline int is_leap(int year) +/* ( buf len -- actlen ) */ +static void +hfs_files_read( hfs_info_t *mi ) { - return ((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0); + int count = POP(); + char *buf = (char *)POP(); + + hfscommon *common = mi->common; + if (common->type != FILE) + RET( -1 ); + + RET ( hfs_read( common->file, buf, count ) ); } +/* ( pos.d -- status ) */ static void -print_date(time_t sec) +hfs_files_seek( hfs_info_t *mi ) { - unsigned int second, minute, hour, month, day, year; - int current; - const int *days; + llong pos = DPOP(); + int offs = (int)pos; + int whence = SEEK_SET; + int ret; + hfscommon *common = mi->common; - second = sec % 60; - sec /= 60; + if (common->type != FILE) + RET( -1 ); - minute = sec % 60; - sec /= 60; + switch( whence ) { + case SEEK_END: + whence = HFS_SEEK_END; + break; + default: + case SEEK_SET: + whence = HFS_SEEK_SET; + break; + } - hour = sec % 24; - sec /= 24; + ret = hfs_seek( common->file, offs, whence ); + if (ret) + RET( -1 ); + else + RET( 0 ); +} - year = sec * 100 / 36525; - sec -= year * 36525 / 100; - year += 1970; +/* ( addr -- size ) */ +static void +hfs_files_load( hfs_info_t *mi ) +{ + char *buf = (char *)POP(); + int count; - days = is_leap(year) ? days_month_leap : days_month; + hfscommon *common = mi->common; + if (common->type != FILE) + RET( -1 ); - current = 0; - month = 0; - while (month < 12) { - if (sec <= current + days[month]) { - break; - } - current += days[month]; - month++; - } - month++; + /* Seek to the end in order to get the file size */ + hfs_seek(common->file, 0, HFS_SEEK_END); + count = common->file->pos; + hfs_seek(common->file, 0, HFS_SEEK_SET); - day = sec - current + 1; + RET ( hfs_read( common->file, buf, count ) ); +} - forth_printf("%d-%02d-%02d %02d:%02d:%02d ", - year, month, day, hour, minute, second); +/* ( -- success? ) */ +static void +hfs_files_open_nwrom( hfs_info_t *mi ) +{ + /* Switch to an existing ROM image file on the fs! */ + if ( _do_search( mi, NULL ) ) + RET( -1 ); + + RET( 0 ); } +/* ( -- cstr ) */ static void -dir_fs( file_desc_t *fd ) +hfs_files_get_path( hfs_info_t *mi ) { - hfscommon *common = (hfscommon*)fd; + char buf[256], buf2[256]; + hfscommon *common = mi->common; + hfsvol *vol = hfs_getvol( NULL ); hfsdirent ent; + int start, ns; + ulong id; - if (common->type != DIR) - return; + if (common->type != FILE) + RET( 0 ); - forth_printf("\n"); - while( !hfs_readdir(common->dir, &ent) ) { - forth_printf("% 10d ", ent.u.file.dsize); - print_date(ent.mddate); - if( ent.flags & HFS_ISDIR ) - forth_printf("%s\\\n", ent.name); - else - forth_printf("%s\n", ent.name); + hfs_fstat( common->file, &ent ); + start = sizeof(buf) - strlen(ent.name) - 1; + if( start <= 0 ) + RET ( 0 ); + strcpy( buf+start, ent.name ); + buf[--start] = '\\'; + + ns = start; + for( id=ent.parid ; !hfs_dirinfo(vol, &id, buf2) ; ) { + start = ns; + ns -= strlen(buf2); + if( ns <= 0 ) + RET( 0 ); + strcpy( buf+ns, buf2 ); + buf[--ns] = buf[start] = '\\'; } + if( strlen(buf) >= sizeof(buf) ) + RET( 0 ); + + RET( (ucell) strdup(buf+start) ); } -static const char * -get_fstype( fs_ops_t *fs ) +/* ( -- cstr ) */ +static void +hfs_files_get_fstype( hfs_info_t *mi ) { - return ("HFS"); + PUSH( (ucell)strdup("HFS") ); } -static const fs_ops_t hfs_ops = { - .dir = dir_fs, - .close_fs = close_fs, - .open_path = open_path, - .search_rom = search_rom, - .search_file = search_file, - .vol_name = vol_name, - - .get_path = get_path, - .close = file_close, - .read = file_read, - .lseek = file_lseek, +/* ( -- cstr|0 ) */ +static void +hfs_files_volume_name( hfs_info_t *mi ) +{ + int fd; + char *volname = malloc(VOLNAME_SIZE); - .get_fstype = get_fstype, -}; + fd = open_ih(my_self()); + get_hfs_vol_name(fd, volname, VOLNAME_SIZE); + close_io(fd); + + PUSH ((ucell)volname); +} -int -fs_hfs_open( int os_fd, fs_ops_t *fs ) +/* static method, ( pos.d ih -- flag? ) */ +static void +hfs_files_probe( hfs_info_t *dummy ) { - hfsvol *vol = hfs_mount( os_fd, 0 ); + ihandle_t ih = POP_ih(); + llong offs = DPOP(); + int fd, ret = 0; - if( !vol ) - return -1; + fd = open_ih(ih); + if (hfs_probe(fd, offs)) + ret = -1; - *fs = hfs_ops; - fs->fs_data = vol; + close_io(fd); - return 0; + RET (ret); } -int -fs_hfs_probe( int fd, llong offs ) +static void +hfs_initializer( hfs_info_t *dummy ) { - if (hfs_probe(fd, offs)) - return 0; + fword("register-fs-package"); +} + +NODE_METHODS( hfs ) = { + { "probe", hfs_files_probe }, + { "open", hfs_files_open }, + { "close", hfs_files_close }, + { "read", hfs_files_read }, + { "seek", hfs_files_seek }, + { "load", hfs_files_load }, + + /* special */ + { "open-nwrom", hfs_files_open_nwrom }, + { "get-path", hfs_files_get_path }, + { "get-fstype", hfs_files_get_fstype }, + { "volume-name", hfs_files_volume_name }, - return -1; + { NULL, hfs_initializer }, +}; + +void +hfs_init( void ) +{ + REGISTER_NODE( hfs ); } Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sun Jul 4 01:22:21 2010 (r811) +++ trunk/openbios-devel/packages/init.c Sun Jul 4 01:29:37 2010 (r812) @@ -33,6 +33,9 @@ #ifdef CONFIG_HFSP hfsp_init(); #endif +#ifdef CONFIG_HFS + hfs_init(); +#endif #ifdef CONFIG_ISO9660 iso9660_init(); #endif Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sun Jul 4 01:22:21 2010 (r811) +++ trunk/openbios-devel/packages/misc-files.c Sun Jul 4 01:29:37 2010 (r812) @@ -57,12 +57,9 @@ err = (fd = open_ih(ih)) == -1; if( !err ) { - err = fs_hfs_open(fd, fs); - - if( err ) { - err = fs_ext2_open(fd, fs); - DPRINTF("--- ext2 returned %d\n", err); - } + + err = fs_ext2_open(fd, fs); + DPRINTF("--- ext2 returned %d\n", err); if( err ) { err = fs_grubfs_open(fd, fs); @@ -341,13 +338,8 @@ err = (fd = open_ih(ih)) == -1; if( !err ) { - err = fs_hfs_probe(fd, offs); - DPRINTF("--- HFS returned %d\n", err); - - if( err ) { - err = fs_ext2_probe(fd, offs); - DPRINTF("--- ext2 returned %d\n", err); - } + err = fs_ext2_probe(fd, offs); + DPRINTF("--- ext2 returned %d\n", err); if( err ) { err = fs_grubfs_probe(fd, offs); Modified: trunk/openbios-devel/packages/packages.h ============================================================================== --- trunk/openbios-devel/packages/packages.h Sun Jul 4 01:22:21 2010 (r811) +++ trunk/openbios-devel/packages/packages.h Sun Jul 4 01:29:37 2010 (r812) @@ -22,6 +22,7 @@ extern void files_init( void ); extern void iso9660_init( void ); extern void hfsp_init( void ); +extern void hfs_init( void ); extern void macparts_init( void ); extern void pcparts_init( void ); extern void sunparts_init( void );

1 0

[commit] r811 - trunk/openbios-devel/fs/hfsplus
by repository service 04 Jul '10

04 Jul '10

Author: mcayland Date: Sun Jul 4 01:22:21 2010 New Revision: 811 URL: http://tracker.coreboot.org/trac/openbios/changeset/811 Log: Fix a couple of incorrect error codes in hfsp_files_open(), and also revert the filesystem type return value to a cstr to maintain the existing API. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sat Jul 3 21:02:43 2010 (r810) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sun Jul 4 01:22:21 2010 (r811) @@ -216,7 +216,7 @@ if (volume_open(mi->vol, fd)) { free( path ); close_io( fd ); - RET( -1 ); + RET( 0 ); } mi->hfspfile = malloc( sizeof(hfsp_file_t) ); @@ -244,7 +244,7 @@ if( !search_files(&(mi->hfspfile->rec), 0, match_path, path, mi->hfspfile ) ) RET ( -1 ); - RET ( 0 ); + RET ( -1 ); } /* ( -- ) */ @@ -383,11 +383,11 @@ RET ( act_count ); } -/* ( -- str len ) */ +/* ( -- cstr ) */ static void hfsp_files_get_fstype( hfsp_info_t *mi ) { - push_str("HFS+"); + PUSH( (ucell)strdup("HFS+") ); } /* ( -- cstr ) */

1 0

[commit] r810 - in trunk/openbios-devel: fs/hfsplus packages
by repository service 03 Jul '10

03 Jul '10

Author: mcayland Date: Sat Jul 3 21:02:43 2010 New Revision: 810 URL: http://tracker.coreboot.org/trac/openbios/changeset/810 Log: Move the HFS+ filesystem handler into its own new package /packages/hfsplus-files. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c trunk/openbios-devel/packages/init.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/packages.h Modified: trunk/openbios-devel/fs/hfsplus/hfsp_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sat Jul 3 16:39:49 2010 (r809) +++ trunk/openbios-devel/fs/hfsplus/hfsp_fs.c Sat Jul 3 21:02:43 2010 (r810) @@ -2,11 +2,12 @@ * Creation Date: <2001/05/05 23:33:49 samuel> * Time-stamp: <2004/01/12 10:25:39 samuel> * - * <hfsp_fs.c> + * /package/hfsplus-files * * HFS+ file system interface (and ROM lookup support) * * Copyright (C) 2001, 2002, 2003, 2004 Samuel Rydh (samuel(a)ibrium.se) + * Copyright (C) 2010 Mark Cave-Ayland (mark.cave-ayland(a)siriusit.co.uk) * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -15,13 +16,14 @@ */ #include "config.h" +#include "libopenbios/bindings.h" #include "fs/fs.h" #include "libhfsp.h" #include "volume.h" #include "record.h" #include "unicode.h" #include "blockiter.h" - +#include "libc/diskio.h" #define MAC_OS_ROM_CREATOR 0x63687270 /* 'chrp' */ #define MAC_OS_ROM_TYPE 0x74627869 /* 'tbxi' */ @@ -32,14 +34,23 @@ #define SYSTEM_TYPE 0x7A737973 /* 'zsys' */ #define SYSTEM_CREATOR 0x4D414353 /* 'MACS' */ +#define VOLNAME_SIZE 64 + +extern void hfsp_init( void ); typedef struct { record rec; char *path; - off_t pos; } hfsp_file_t; +typedef struct { + volume *vol; + hfsp_file_t *hfspfile; +} hfsp_info_t; + +DECLARE_NODE( hfsp, 0, sizeof(hfsp_info_t), "+/packages/hfsplus-files" ); + /************************************************************************/ /* Search implementation */ @@ -88,9 +99,8 @@ } static int -root_search_files( fs_ops_t *fs, int recursive, match_proc_t proc, const void *match_data, hfsp_file_t *pt ) +root_search_files( volume *vol, int recursive, match_proc_t proc, const void *match_data, hfsp_file_t *pt ) { - volume *vol = (volume*)fs->fs_data; record r; record_init_root( &r, &vol->catalog ); @@ -183,34 +193,34 @@ /************************************************************************/ -/* File System Operations */ +/* Standard package methods */ /************************************************************************/ +/* ( -- success? ) */ static void -close_fs( fs_ops_t *fs ) +hfsp_files_open( hfsp_info_t *mi ) { - volume *vol = (volume*)fs->fs_data; - volume_close( vol ); - free( vol ); -} + int fd; + char *path = my_args_copy(); -static file_desc_t * -_create_fops( hfsp_file_t *t ) -{ - hfsp_file_t *r = malloc( sizeof(hfsp_file_t) ); + if ( ! path ) + RET( 0 ); - *r = *t; - r->pos = 0; - return (file_desc_t*)r; -} + fd = open_ih( my_parent() ); + if ( fd == -1 ) { + free( path ); + RET( 0 ); + } -static file_desc_t * -open_path( fs_ops_t *fs, const char *path ) -{ - hfsp_file_t t; - volume *vol = (volume*)fs->fs_data; - record r; + mi->vol = malloc( sizeof(volume) ); + if (volume_open(mi->vol, fd)) { + free( path ); + close_io( fd ); + RET( -1 ); + } + mi->hfspfile = malloc( sizeof(hfsp_file_t) ); + /* Leading \\ means system folder. The finder info block has * the following meaning. * @@ -219,80 +229,104 @@ * [5] MacOS X boot directory ID */ if( !strncmp(path, "\\\\", 2) ) { - int *p = (int*)&vol->vol.finder_info[0]; + int *p = (int*)&(mi->vol)->vol.finder_info[0]; int cnid = p[0]; /* printk(" p[0] = %x, p[3] = %x, p[5] = %x\n", p[0], p[3], p[5] ); */ if( p[0] == p[5] && p[3] ) cnid = p[3]; - if( record_init_cnid(&r, &vol->catalog, cnid) ) - return NULL; + if( record_init_cnid(&(mi->hfspfile->rec), &(mi->vol)->catalog, cnid) ) + RET ( 0 ); path += 2; } else { - record_init_root( &r, &vol->catalog ); + record_init_root( &(mi->hfspfile->rec), &(mi->vol)->catalog ); } - if( !search_files(&r, 0, match_path, path, &t) ) - return _create_fops( &t ); - return NULL; + if( !search_files(&(mi->hfspfile->rec), 0, match_path, path, mi->hfspfile ) ) + RET ( -1 ); + + RET ( 0 ); } -static file_desc_t * -search_rom( fs_ops_t *fs ) +/* ( -- ) */ +static void +hfsp_files_close( hfsp_info_t *mi ) { - hfsp_file_t t; + volume_close(mi->vol); - if( !root_search_files(fs, 1, match_rom, NULL, &t) ) - return _create_fops( &t ); - return NULL; + if( mi->hfspfile->path ) + free( mi->hfspfile->path ); + free( mi->hfspfile ); } -static file_desc_t * -search_file( fs_ops_t *fs, const char *name ) +/* ( buf len -- actlen ) */ +static void +hfsp_files_read( hfsp_info_t *mi ) { - hfsp_file_t t; + int count = POP(); + char *buf = (char *)POP(); - if( !root_search_files(fs, 1, match_file, name, &t) ) - return _create_fops( &t ); - return NULL; -} + hfsp_file_t *t = mi->hfspfile; + volume *vol = t->rec.tree->vol; + UInt32 blksize = vol->blksize; + hfsp_cat_file *file = &t->rec.record.u.file; + blockiter iter; + char buf2[blksize]; + int act_count, curpos=0; + + blockiter_init( &iter, vol, &file->data_fork, HFSP_EXTENT_DATA, file->id ); + while( curpos + blksize < t->pos ) { + if( blockiter_next( &iter ) ) { + RET ( -1 ); + return; + } + curpos += blksize; + } + act_count = 0; + while( act_count < count ){ + UInt32 block = blockiter_curr(&iter); + int max = blksize, add = 0, size; -/************************************************************************/ -/* File Operations */ -/************************************************************************/ + if( volume_readinbuf( vol, buf2, block ) ) + break; -static char * -get_path( file_desc_t *fd, char *buf, int len ) -{ - hfsp_file_t *t = (hfsp_file_t*)fd; - if( !t->path ) - return NULL; + if( curpos < t->pos ){ + add += t->pos - curpos; + max -= t->pos - curpos; + } + size = (count-act_count > max)? max : count-act_count; + memcpy( (char *)buf + act_count, &buf2[add], size ); + + curpos += blksize; + act_count += size; + + if( blockiter_next( &iter ) ) + break; + } - strncpy( buf, t->path, len ); - buf[len-1] = 0; - return buf; + t->pos += act_count; + + RET ( act_count ); } +/* ( pos.d -- status ) */ static void -file_close( file_desc_t *fd ) +hfsp_files_seek( hfsp_info_t *mi ) { - hfsp_file_t *t = (hfsp_file_t*)fd; - if( t->path ) - free( t->path ); - free( t ); -} + llong pos = DPOP(); + int offs = (int)pos; + int whence = SEEK_SET; -static int -file_lseek( file_desc_t *fd, off_t offs, int whence ) -{ - hfsp_file_t *t = (hfsp_file_t*)fd; + hfsp_file_t *t = mi->hfspfile; hfsp_cat_file *file = &t->rec.record.u.file; int total = file->data_fork.total_size; + if( offs == -1 ) { + offs = 0; + whence = SEEK_END; + } + switch( whence ){ - case SEEK_CUR: - t->pos += offs; - break; case SEEK_END: t->pos = total + offs; break; @@ -308,101 +342,139 @@ if( t->pos > total ) t->pos = total; - return t->pos; + RET ( 0 ); } -static int -file_read( file_desc_t *fd, void *buf, size_t count ) +/* ( addr -- size ) */ +static void +hfsp_files_load( hfsp_info_t *mi ) { - hfsp_file_t *t = (hfsp_file_t*)fd; + char *buf = (char *)POP(); + + hfsp_file_t *t = mi->hfspfile; volume *vol = t->rec.tree->vol; UInt32 blksize = vol->blksize; hfsp_cat_file *file = &t->rec.record.u.file; + int total = file->data_fork.total_size; blockiter iter; char buf2[blksize]; - int act_count, curpos=0; + int act_count; blockiter_init( &iter, vol, &file->data_fork, HFSP_EXTENT_DATA, file->id ); - while( curpos + blksize < t->pos ) { - if( blockiter_next( &iter ) ) - return -1; - curpos += blksize; - } + act_count = 0; - while( act_count < count ){ + while( act_count < total ){ UInt32 block = blockiter_curr(&iter); - int max = blksize, add = 0, size; + int max = blksize, size; if( volume_readinbuf( vol, buf2, block ) ) break; - if( curpos < t->pos ){ - add += t->pos - curpos; - max -= t->pos - curpos; - } - size = (count-act_count > max)? max : count-act_count; - memcpy( (char *)buf + act_count, &buf2[add], size ); + size = (total-act_count > max)? max : total-act_count; + memcpy( (char *)buf + act_count, &buf2, size ); - curpos += blksize; act_count += size; if( blockiter_next( &iter ) ) break; } - t->pos += act_count; - return (act_count > 0)? act_count : -1; + RET ( act_count ); } -static char * -vol_name( fs_ops_t *fs, char *buf, int size ) +/* ( -- str len ) */ +static void +hfsp_files_get_fstype( hfsp_info_t *mi ) { - return get_hfs_vol_name( fs->fd, buf, size ); + push_str("HFS+"); } -static const char * -get_fstype( fs_ops_t *fs ) +/* ( -- cstr ) */ +static void +hfsp_files_get_path( hfsp_info_t *mi ) { - return ("HFS+"); -} + char *buf; + hfsp_file_t *t = mi->hfspfile; + if( !t->path ) + RET ( 0 ); -static const fs_ops_t fs_ops = { - .close_fs = close_fs, - .open_path = open_path, - .search_rom = search_rom, - .search_file = search_file, - .vol_name = vol_name, + buf = malloc(strlen(t->path) + 1); + strncpy( buf, t->path, strlen(t->path) ); + buf[strlen(t->path)] = 0; - .get_path = get_path, - .close = file_close, - .read = file_read, - .lseek = file_lseek, + PUSH ((ucell)buf); +} - .get_fstype = get_fstype -}; +/* ( -- success? ) */ +static void +hfsp_files_open_nwrom( hfsp_info_t *mi ) +{ + /* Switch to an existing ROM image file on the fs! */ + if( !root_search_files(mi->vol, 1, match_rom, NULL, mi->hfspfile) ) + RET ( -1 ); + + RET ( 0 ); +} -int -fs_hfsp_open( int os_fd, fs_ops_t *fs ) +/* ( -- cstr|0 ) */ +static void +hfsp_files_volume_name( hfsp_info_t *mi ) { - volume *vol = malloc( sizeof(volume) ); + int fd; + char *volname = malloc(VOLNAME_SIZE); - if( volume_open(vol, os_fd) ) { - free( vol ); - return -1; - } - *fs = fs_ops; - fs->fs_data = vol; + fd = open_ih(my_self()); + get_hfs_vol_name(fd, volname, VOLNAME_SIZE); + close_io(fd); - return 0; + PUSH ((ucell)volname); } -int -fs_hfsp_probe(int fd, llong offs) +/* static method, ( pos.d ih -- flag? ) */ +static void +hfsp_files_probe( hfsp_info_t *dummy ) { + ihandle_t ih = POP_ih(); + llong offs = DPOP(); + int fd, ret = 0; + + fd = open_ih(ih); if (volume_probe(fd, offs)) - return 0; + ret = -1; + + close_io(fd); + + RET (ret); +} - return -1; + +static void +hfsp_initializer( hfsp_info_t *dummy ) +{ + fword("register-fs-package"); +} + +NODE_METHODS( hfsp ) = { + { "probe", hfsp_files_probe }, + { "open", hfsp_files_open }, + { "close", hfsp_files_close }, + { "read", hfsp_files_read }, + { "seek", hfsp_files_seek }, + { "load", hfsp_files_load }, + + /* special */ + { "open-nwrom", hfsp_files_open_nwrom }, + { "get-path", hfsp_files_get_path }, + { "get-fstype", hfsp_files_get_fstype }, + { "volume-name", hfsp_files_volume_name }, + + { NULL, hfsp_initializer }, +}; + +void +hfsp_init( void ) +{ + REGISTER_NODE( hfsp ); } Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sat Jul 3 16:39:49 2010 (r809) +++ trunk/openbios-devel/packages/init.c Sat Jul 3 21:02:43 2010 (r810) @@ -30,6 +30,9 @@ #ifdef CONFIG_DISK_LABEL disklabel_init(); #endif +#ifdef CONFIG_HFSP + hfsp_init(); +#endif #ifdef CONFIG_ISO9660 iso9660_init(); #endif Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sat Jul 3 16:39:49 2010 (r809) +++ trunk/openbios-devel/packages/misc-files.c Sat Jul 3 21:02:43 2010 (r810) @@ -57,14 +57,8 @@ err = (fd = open_ih(ih)) == -1; if( !err ) { - err = fs_hfsp_open(fd, fs); - DPRINTF("--- HFSP returned %d\n", err); - - if( err ) { - err = fs_hfs_open(fd, fs); - DPRINTF("--- HFS returned %d\n", err); - } - + err = fs_hfs_open(fd, fs); + if( err ) { err = fs_ext2_open(fd, fs); DPRINTF("--- ext2 returned %d\n", err); @@ -347,13 +341,8 @@ err = (fd = open_ih(ih)) == -1; if( !err ) { - err = fs_hfsp_probe(fd, offs); - DPRINTF("--- HFSP returned %d\n", err); - - if( err ) { - err = fs_hfs_probe(fd, offs); - DPRINTF("--- HFS returned %d\n", err); - } + err = fs_hfs_probe(fd, offs); + DPRINTF("--- HFS returned %d\n", err); if( err ) { err = fs_ext2_probe(fd, offs); Modified: trunk/openbios-devel/packages/packages.h ============================================================================== --- trunk/openbios-devel/packages/packages.h Sat Jul 3 16:39:49 2010 (r809) +++ trunk/openbios-devel/packages/packages.h Sat Jul 3 21:02:43 2010 (r810) @@ -21,6 +21,7 @@ extern void disklabel_init( void ); extern void files_init( void ); extern void iso9660_init( void ); +extern void hfsp_init( void ); extern void macparts_init( void ); extern void pcparts_init( void ); extern void sunparts_init( void );

1 0

[commit] r809 - in trunk/openbios-devel: config/examples fs/iso9660 packages
by repository service 03 Jul '10

03 Jul '10

Author: mcayland Date: Sat Jul 3 16:39:49 2010 New Revision: 809 URL: http://tracker.coreboot.org/trac/openbios/changeset/809 Log: Move the separate ISO9660 handler into a new /packages/iso9660-files package in preparation for some future work. Based heavily on Laurent's original patch posted to the list. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/config/examples/cross-sparc32_config.xml trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/fs/iso9660/iso9660_fs.c trunk/openbios-devel/packages/disk-label.c trunk/openbios-devel/packages/init.c trunk/openbios-devel/packages/mac-parts.c trunk/openbios-devel/packages/misc-files.c trunk/openbios-devel/packages/packages.h trunk/openbios-devel/packages/pc-parts.c trunk/openbios-devel/packages/sun-parts.c Modified: trunk/openbios-devel/config/examples/cross-sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-sparc32_config.xml Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/config/examples/cross-sparc32_config.xml Sat Jul 3 16:39:49 2010 (r809) @@ -56,6 +56,7 @@ <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_ISO9660" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml Sat Jul 3 16:39:49 2010 (r809) @@ -56,6 +56,7 @@ <option name="CONFIG_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> <option name="CONFIG_HFSP" type="boolean" value="false"/> + <option name="CONFIG_ISO9660" type="boolean" value="false"/> <option name="CONFIG_GRUBFS" type="boolean" value="true"/> <option name="CONFIG_FSYS_EXT2FS" type="boolean" value="true"/> <option name="CONFIG_FSYS_FAT" type="boolean" value="false"/> Modified: trunk/openbios-devel/fs/iso9660/iso9660_fs.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/fs/iso9660/iso9660_fs.c Sat Jul 3 16:39:49 2010 (r809) @@ -1,12 +1,18 @@ /* + * /packages/iso9660-files filesystem handler * * (c) 2009 Laurent Vivier <Laurent(a)vivier.eu> - * + * (c) 2010 Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> */ +#include "config.h" +#include "libopenbios/bindings.h" #include "libiso9660.h" #include "fs/fs.h" #include "libc/vsprintf.h" +#include "libc/diskio.h" + +extern void iso9660_init( void ); typedef struct { enum { FILE, DIR } type; @@ -16,34 +22,159 @@ }; } iso9660_COMMON; +typedef struct { + iso9660_VOLUME *volume; + iso9660_COMMON *common; +} iso9660_info_t; + +DECLARE_NODE( iso9660, 0, sizeof(iso9660_info_t), "+/packages/iso9660-files" ); + +/* ( -- success? ) */ +static void +iso9660_files_open( iso9660_info_t *mi ) +{ + int fd; + char *path = my_args_copy(); + + if ( ! path ) + RET( 0 ); + + fd = open_ih( my_parent() ); + if ( fd == -1 ) { + free( path ); + RET( 0 ); + } + + mi->volume = iso9660_mount( fd ); + if ( mi->volume == NULL ) { + free( path ); + close_io( fd ); + RET( -1 ); + } + + mi->common->dir = iso9660_opendir( mi->volume, path ); + if ( mi->common->dir == NULL ) { + mi->common->file = iso9660_open( mi->volume, path ); + if (mi->common->file == NULL) { + iso9660_umount( mi->volume ); + close_io( fd ); + free( path ); + RET( -1 ); + } + mi->common->type = FILE; + free( path ); + RET( 0 ); + } + mi->common->type = DIR; + free( path ); + + RET( -1 ); +} + +/* ( -- ) */ +static void +iso9660_files_close( iso9660_info_t *mi ) +{ + int fd = mi->volume->fd; + + if (mi->common->type == FILE ) + iso9660_close( mi->common->file ); + else if ( mi->common->type == DIR ) + iso9660_closedir( mi->common->dir ); + iso9660_umount( mi->volume ); + close_io( fd ); +} + +/* ( buf len -- actlen ) */ +static void +iso9660_files_read( iso9660_info_t *mi ) +{ + int count = POP(); + char *buf = (char *)POP(); + int ret; + + if ( mi->common->type != FILE ) + PUSH( 0 ); + + ret = iso9660_read( mi->common->file, buf, count ); + + PUSH( ret ); +} + +/* ( pos.d -- status ) */ +static void +iso9660_files_seek( iso9660_info_t *mi ) +{ + llong pos = DPOP(); + cell ret; + int offs = (int)pos; + int whence = SEEK_SET; + + if (mi->common->type != FILE) + PUSH( -1 ); + + if( offs == -1 ) { + offs = 0; + whence = SEEK_END; + } + + ret = iso9660_lseek(mi->common->file, offs, whence); + + PUSH( (ret < 0)? -1 : 0 ); +} + +/* ( -- filepos.d ) */ static void -umount( fs_ops_t *fs ) +iso9660_files_offset( iso9660_info_t *mi ) { - iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; + if ( mi->common->type != FILE ) + DPUSH( -1 ); + + DPUSH( mi->common->file->offset ); +} - iso9660_umount( volume ); +/* ( addr -- size ) */ +static void +iso9660_files_load( iso9660_info_t *mi) +{ + char *buf = (char*)POP(); + int ret, size; + + if ( mi->common->type != FILE ) + PUSH( 0 ); + + size = 0; + while(1) { + ret = iso9660_read( mi->common->file, buf, 512 ); + if (ret <= 0) + break; + buf += ret; + size += ret; + if (ret != 512) + break; + } + PUSH( size ); } static void -dir_fs ( file_desc_t *fd ) +iso9660_files_dir( iso9660_info_t *mi ) { - iso9660_COMMON *common = (iso9660_COMMON *)fd; struct iso_directory_record *idr; char name_buf[256]; - - if (common->type != DIR) + + if (mi->common->type != DIR) return; forth_printf("\n"); - while ( (idr = iso9660_readdir(common->dir)) ) { - + while ( (idr = iso9660_readdir(mi->common->dir)) ) { + forth_printf("% 10d ", isonum_733(idr->size)); forth_printf("%d-%02d-%02d %02d:%02d:%02d ", idr->date[0] + 1900, /* year */ idr->date[1], /* month */ idr->date[2], /* day */ idr->date[3], idr->date[4], idr->date[5]); - iso9660_name(common->dir->volume, idr, name_buf); + iso9660_name(mi->common->dir->volume, idr, name_buf); if (idr->flags[0] & 2) forth_printf("%s\\\n", name_buf); else @@ -51,126 +182,50 @@ } } -static file_desc_t * -open_path( fs_ops_t *fs, const char *path ) -{ - iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; - iso9660_COMMON *common; - - common = (iso9660_COMMON *)malloc(sizeof(*common)); - if (common == NULL) - return NULL; - - common->dir = iso9660_opendir(volume, path); - if (common->dir == NULL) { - common->file = iso9660_open(volume, path); - if (common->file == NULL) { - free(common); - return NULL; - } - common->type = FILE; - return (file_desc_t *)common; - } - common->type = DIR; - return (file_desc_t *)common; -} - -static char * -get_path( file_desc_t *fd, char *buf, int size ) -{ - iso9660_COMMON *common = (iso9660_COMMON *)fd; - - if (common->type != FILE) - return NULL; - - strncpy(buf, common->file->path, size); - - return buf; -} - -static int -file_lseek( file_desc_t *fd, off_t offs, int whence ) -{ - iso9660_COMMON *common = (iso9660_COMMON *)fd; - - if (common->type != FILE) - return -1; - - return iso9660_lseek(common->file, offs, whence); -} - +/* static method, ( pos.d ih -- flag? ) */ static void -file_close( file_desc_t *fd ) +iso9660_files_probe( iso9660_info_t *dummy ) { - iso9660_COMMON *common = (iso9660_COMMON *)fd; + ihandle_t ih = POP_ih(); + llong offs = DPOP(); + int fd, ret = 0; - if (common->type == FILE) - iso9660_close(common->file); - else if (common->type == DIR) - iso9660_closedir(common->dir); - free(common); -} - -static int -file_read( file_desc_t *fd, void *buf, size_t count ) -{ - iso9660_COMMON *common = (iso9660_COMMON *)fd; + fd = open_ih(ih); + if (iso9660_probe(fd, offs)) + ret = -1; - if (common->type != FILE) - return -1; + close_io(fd); - return iso9660_read(common->file, buf, count); + RET (ret); } -static char * -vol_name( fs_ops_t *fs, char *buf, int size ) +static void +iso9660_files_block_size( iso9660_info_t *dummy ) { - iso9660_VOLUME *volume = (iso9660_VOLUME *)fs->fs_data; - - strncpy(buf, volume->descriptor->volume_id, size); - - return buf; + PUSH(2048); } - -static const char * -get_fstype( fs_ops_t *fs ) + +static void +iso9660_initializer( iso9660_info_t *dummy ) { - return "ISO9660"; + fword("register-fs-package"); } - -static const fs_ops_t iso9660_ops = { - .dir = dir_fs, - .close_fs = umount, - - .open_path = open_path, - .get_path = get_path, - .close = file_close, - .read = file_read, - .lseek = file_lseek, - - .vol_name = vol_name, - .get_fstype = get_fstype, + +NODE_METHODS( iso9660 ) = { + { "probe", iso9660_files_probe }, + { "open", iso9660_files_open }, + { "close", iso9660_files_close }, + { "read", iso9660_files_read }, + { "seek", iso9660_files_seek }, + { "offset", iso9660_files_offset }, + { "load", iso9660_files_load }, + { "dir", iso9660_files_dir }, + { "block-size", iso9660_files_block_size }, + { NULL, iso9660_initializer }, }; -int -fs_iso9660_probe( int fd, llong offs ) -{ - if (iso9660_probe(fd, offs)) - return 0; - - return -1; -} - -int fs_iso9660_open(int fd, fs_ops_t *fs) +void +iso9660_init( void ) { - iso9660_VOLUME *volume; - - volume = iso9660_mount(fd); - if (volume == NULL) - return -1; - - *fs = iso9660_ops; - fs->fs_data = volume; - - return 0; + REGISTER_NODE( iso9660 ); } Modified: trunk/openbios-devel/packages/disk-label.c ============================================================================== --- trunk/openbios-devel/packages/disk-label.c Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/packages/disk-label.c Sat Jul 3 16:39:49 2010 (r809) @@ -16,6 +16,7 @@ #include "config.h" #include "libopenbios/bindings.h" +#include "libopenbios/load.h" #include "libc/diskio.h" #include "libc/vsprintf.h" #include "packages.h" @@ -68,6 +69,8 @@ DPRINTF("dlabel-open '%s'\n", path ); + di->part_ih = 0; + /* Find parent methods */ di->parent_seek_xt = find_parent_method("seek"); di->parent_tell_xt = find_parent_method("tell"); @@ -111,9 +114,16 @@ selfword("find-filesystem"); ph = POP_ph(); if( ph ) { - push_str( path ); - PUSH_ph( ph ); - fword("interpose"); + /* If we have been asked to open a particular file, interpose the filesystem package with the passed filename as an argument */ + DPRINTF("path: %s length: %d\n", path, strlen(path)); + + if (strlen(path)) { + DPRINTF("INTERPOSE!\n"); + + push_str( path ); + PUSH_ph( ph ); + fword("interpose"); + } } else if (*path && strcmp(path, "%BOOT") != 0) { goto out; } @@ -175,14 +185,24 @@ DPRINTF("load invoked with address %p\n", buf); - xt = find_ih_method("load", di->part_ih); - if (!xt) { - forth_printf("load currently not implemented for ihandle " FMT_ucellx "\n", di->part_ih); - PUSH(0); - return; - } + /* If we have a partition handle, invoke the load word on it */ + if (di->part_ih) { + xt = find_ih_method("load", di->part_ih); + if (!xt) { + forth_printf("load currently not implemented for ihandle " FMT_ucellx "\n", di->part_ih); + PUSH(0); + return; + } + + DPRINTF("calling load on ihandle " FMT_ucellx "\n", di->part_ih); + + call_package(xt, di->part_ih); + } else { + /* Otherwise attempt load directly on the raw disk */ + DPRINTF("calling load on raw disk ihandle " FMT_ucellx "\n", my_self()); - call_package(xt, di->part_ih); + load(my_self()); + } } NODE_METHODS( dlabel ) = { Modified: trunk/openbios-devel/packages/init.c ============================================================================== --- trunk/openbios-devel/packages/init.c Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/packages/init.c Sat Jul 3 16:39:49 2010 (r809) @@ -30,6 +30,9 @@ #ifdef CONFIG_DISK_LABEL disklabel_init(); #endif +#ifdef CONFIG_ISO9660 + iso9660_init(); +#endif #ifdef CONFIG_FS files_init(); #endif Modified: trunk/openbios-devel/packages/mac-parts.c ============================================================================== --- trunk/openbios-devel/packages/mac-parts.c Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/packages/mac-parts.c Sat Jul 3 16:39:49 2010 (r809) @@ -36,6 +36,7 @@ ucell offs_hi, offs_lo; ucell size_hi, size_lo; uint blocksize; + phandle_t filesystem_ph; } macparts_info_t; DECLARE_NODE( macparts, INSTALL_OPEN, sizeof(macparts_info_t), "+/packages/mac-parts" ); @@ -111,6 +112,7 @@ DPRINTF("want_bootcode %d\n", want_bootcode); DPRINTF("macparts_open %d\n", parnum); + di->filesystem_ph = 0; di->read_xt = find_parent_method("read"); di->seek_xt = find_parent_method("seek"); @@ -244,10 +246,16 @@ ph = POP_ph(); if( ph ) { - DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, str); - push_str( argstr ); - PUSH_ph( ph ); - fword("interpose"); + DPRINTF("mac-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); + di->filesystem_ph = ph; + + /* If we have been asked to open a particular file, interpose the filesystem package with + the passed filename as an argument */ + if (strlen(argstr)) { + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } } else { DPRINTF("mac-parts: no filesystem found; bypassing misc-files interpose\n"); } Modified: trunk/openbios-devel/packages/misc-files.c ============================================================================== --- trunk/openbios-devel/packages/misc-files.c Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/packages/misc-files.c Sat Jul 3 16:39:49 2010 (r809) @@ -66,11 +66,6 @@ } if( err ) { - err = fs_iso9660_open(fd, fs); - DPRINTF("--- ISO9660 returned %d\n", err); - } - - if( err ) { err = fs_ext2_open(fd, fs); DPRINTF("--- ext2 returned %d\n", err); } @@ -361,11 +356,6 @@ } if( err ) { - err = fs_iso9660_probe(fd, offs); - DPRINTF("--- ISO9660 returned %d\n", err); - } - - if( err ) { err = fs_ext2_probe(fd, offs); DPRINTF("--- ext2 returned %d\n", err); } Modified: trunk/openbios-devel/packages/packages.h ============================================================================== --- trunk/openbios-devel/packages/packages.h Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/packages/packages.h Sat Jul 3 16:39:49 2010 (r809) @@ -20,6 +20,7 @@ extern void deblocker_init( void ); extern void disklabel_init( void ); extern void files_init( void ); +extern void iso9660_init( void ); extern void macparts_init( void ); extern void pcparts_init( void ); extern void sunparts_init( void ); Modified: trunk/openbios-devel/packages/pc-parts.c ============================================================================== --- trunk/openbios-devel/packages/pc-parts.c Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/packages/pc-parts.c Sat Jul 3 16:39:49 2010 (r809) @@ -32,6 +32,7 @@ xt_t seek_xt, read_xt; ucell offs_hi, offs_lo; ucell size_hi, size_lo; + phandle_t filesystem_ph; } pcparts_info_t; DECLARE_NODE( pcparts, INSTALL_OPEN, sizeof(pcparts_info_t), "+/packages/pc-parts" ); @@ -134,6 +135,7 @@ if( parnum < 0 ) parnum = 0; + di->filesystem_ph = 0; di->read_xt = find_parent_method("read"); di->seek_xt = find_parent_method("seek"); @@ -264,10 +266,16 @@ ph = POP_ph(); if( ph ) { - DPRINTF("pc-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, str); - push_str( argstr ); - PUSH_ph( ph ); - fword("interpose"); + DPRINTF("pc-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); + di->filesystem_ph = ph; + + /* If we have been asked to open a particular file, interpose the filesystem package with + the passed filename as an argument */ + if (strlen(argstr)) { + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } } else { DPRINTF("pc-parts: no filesystem found; bypassing misc-files interpose\n"); } Modified: trunk/openbios-devel/packages/sun-parts.c ============================================================================== --- trunk/openbios-devel/packages/sun-parts.c Sat Jul 3 10:07:59 2010 (r808) +++ trunk/openbios-devel/packages/sun-parts.c Sat Jul 3 16:39:49 2010 (r809) @@ -33,6 +33,7 @@ ucell offs_hi, offs_lo; ucell size_hi, size_lo; int type; + phandle_t filesystem_ph; } sunparts_info_t; DECLARE_NODE( sunparts, INSTALL_OPEN, sizeof(sunparts_info_t), "+/packages/sun-parts" ); @@ -152,6 +153,7 @@ DPRINTF("parstr: %s argstr: %s parnum: %d\n", parstr, argstr, parnum); + di->filesystem_ph = 0; di->read_xt = find_parent_method("read"); di->seek_xt = find_parent_method("seek"); @@ -205,10 +207,16 @@ ph = POP_ph(); if( ph ) { - DPRINTF("sun-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, str); - push_str( argstr ); - PUSH_ph( ph ); - fword("interpose"); + DPRINTF("sun-parts: filesystem found with ph " FMT_ucellx " and args %s\n", ph, argstr); + di->filesystem_ph = ph; + + /* If we have been asked to open a particular file, interpose the filesystem package with + the passed filename as an argument */ + if (strlen(argstr)) { + push_str( argstr ); + PUSH_ph( ph ); + fword("interpose"); + } } else { DPRINTF("sun-parts: no filesystem found; bypassing misc-files interpose\n"); }

1 0

[commit] r808 - trunk/openbios-devel/config/scripts
by repository service 03 Jul '10

03 Jul '10

Author: blueswirl Date: Sat Jul 3 10:07:59 2010 New Revision: 808 URL: http://tracker.coreboot.org/trac/openbios/changeset/808 Log: Fix cross compiler detection with dash shell Based on patch by Andreas Färber. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sat Jul 3 10:07:57 2010 (r807) +++ trunk/openbios-devel/config/scripts/switch-arch Sat Jul 3 10:07:59 2010 (r808) @@ -88,7 +88,7 @@ { for TARGET in ${1}-linux-gnu- ${1}-elf- ${1}-eabi- do - if type -p ${TARGET}gcc > /dev/null + if type ${TARGET}gcc > /dev/null 2>&1 then return fi

1 0

[commit] r807 - trunk/openbios-devel/include/libopenbios
by repository service 03 Jul '10

03 Jul '10

Author: blueswirl Date: Sat Jul 3 10:07:57 2010 New Revision: 807 URL: http://tracker.coreboot.org/trac/openbios/changeset/807 Log: Remove unused asm.m4 Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Deleted: trunk/openbios-devel/include/libopenbios/asm.m4

1 0

[commit] r805 - in trunk/openbios-devel: arch/ppc/qemu arch/sparc32 arch/sparc64 forth/admin
by repository service 28 Jun '10

28 Jun '10

Author: mcayland Date: Mon Jun 28 13:58:28 2010 New Revision: 805 URL: http://tracker.coreboot.org/trac/openbios/changeset/805 Log: Fix up NVRAM settings for boot-device and boot-args. This patch originally started as a fix for PPC, in that the NVRAM initialiser wasn't been run on startup (this is why printenv on PPC always showed much much less than on SPARC). However, it also showed up some inconsistent logic for boot device selection, which must also happen *before* boot is called in order for load to work correctly. With this patch applied, bootpath and bootargs are set from boot-device and boot-args respectively on startup for SPARC32, SPARC64 and PPC. Note: there is a small chance SPARC32 may break on some images - please let me know if it does. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/arch/ppc/qemu/qemu.fs trunk/openbios-devel/arch/sparc32/openbios.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/openbios.c trunk/openbios-devel/forth/admin/nvram.fs Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Mon Jun 28 07:18:47 2010 (r804) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Mon Jun 28 13:58:28 2010 (r805) @@ -714,9 +714,39 @@ stdout_path = "screen"; } + /* Setup nvram variables */ + push_str("/options"); + fword("find-device"); + + uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); + switch (boot_device) { + case 'c': + push_str("hd:"); + break; + default: + case 'd': + push_str("cd:"); + break; + } + + fword("encode-string"); + push_str("boot-device"); + fword("property"); + + /* Set up other properties */ push_str("/chosen"); fword("find-device"); + /* bootpath/bootargs should be set to NVRAM default */ + fword("boot-device"); + fword("encode-string"); + push_str("bootpath"); + fword("property"); + fword("boot-args"); + fword("encode-string"); + push_str("bootargs"); + fword("property"); + push_str(stdin_path); fword("open-dev"); fword("encode-int"); Modified: trunk/openbios-devel/arch/ppc/qemu/main.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c Mon Jun 28 07:18:47 2010 (r804) +++ trunk/openbios-devel/arch/ppc/qemu/main.c Mon Jun 28 13:58:28 2010 (r805) @@ -221,43 +221,19 @@ if (!path) { NEWWORLD_DPRINTF("Entering boot, no path\n"); - push_str("boot-device"); - push_str("/options"); + + /* No path specified, so grab defaults from /chosen */ + push_str("bootpath"); + push_str("/chosen"); fword("(find-dev)"); POP(); fword("get-package-property"); - if (!POP()) { - path = pop_fstr_copy(); - param = strchr(path, ' '); - if (param) { - *param = '\0'; - param++; - } else { - push_str("boot-args"); - push_str("/options"); - fword("(find-dev)"); - POP(); - fword("get-package-property"); - POP(); - param = pop_fstr_copy(); - } - try_path(path, NULL, param); - for (i = 0; chrp_path[i]; i++) - try_path(path, chrp_path[i], param); - } else { - uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); - switch (boot_device) { - case 'c': - path = strdup("hd:"); - break; - default: - case 'd': - path = strdup("cd:"); - break; - } - for (i = 0; chrp_path[i]; i++) - try_path(path, chrp_path[i], param); - } + POP(); + path = pop_fstr_copy(); + + for (i = 0; chrp_path[i]; i++) + try_path(path, chrp_path[i], param); + } else { NEWWORLD_DPRINTF("Entering boot, path %s\n", path); try_path(path, NULL, param); Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Mon Jun 28 07:18:47 2010 (r804) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Mon Jun 28 13:58:28 2010 (r805) @@ -56,3 +56,7 @@ stdout @ encode-int " stdout" property device-end ; + +:noname + set-defaults +; PREPOST-initializer Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Mon Jun 28 07:18:47 2010 (r804) +++ trunk/openbios-devel/arch/sparc32/openbios.c Mon Jun 28 13:58:28 2010 (r805) @@ -21,6 +21,9 @@ #include "openbios.h" #include "boot.h" #include "packages/video.h" +#define NO_QEMU_PROTOS +#define NO_OPENBIOS_PROTOS +#include "arch/common/fw_cfg.h" #define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ #define DICTIONARY_SIZE (256*1024) /* 256K for the dictionary */ @@ -149,6 +152,20 @@ #endif device_end(); + /* Set up other properties */ + push_str("/chosen"); + fword("find-device"); + + /* bootpath/bootargs should be set to NVRAM default */ + fword("boot-device"); + fword("encode-string"); + push_str("bootpath"); + fword("property"); + fword("boot-args"); + fword("encode-string"); + push_str("bootargs"); + fword("property"); + bind_func("platform-boot", boot ); } Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Mon Jun 28 07:18:47 2010 (r804) +++ trunk/openbios-devel/arch/sparc64/boot.c Mon Jun 28 13:58:28 2010 (r805) @@ -151,30 +151,14 @@ } if(!path) { - push_str("boot-device"); - push_str("/options"); + /* No path specified, so grab defaults from /chosen */ + push_str("bootpath"); + push_str("/chosen"); fword("(find-dev)"); POP(); fword("get-package-property"); - if (!POP()) { - path = pop_fstr_copy(); - } else { - switch (boot_device) { - case 'a': - path = strdup("/obio/SUNW,fdtwo"); - break; - case 'c': - path = strdup("disk"); - break; - default: - case 'd': - path = strdup("cdrom"); - break; - case 'n': - path = strdup("net"); - break; - } - } + POP(); + path = pop_fstr_copy(); } param = strchr(path, ' '); Modified: trunk/openbios-devel/arch/sparc64/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/openbios.c Mon Jun 28 07:18:47 2010 (r804) +++ trunk/openbios-devel/arch/sparc64/openbios.c Mon Jun 28 13:58:28 2010 (r805) @@ -468,6 +468,31 @@ ob_mmu_init(cpu->name, ram_size); + /* Setup nvram variables */ + push_str("/options"); + fword("find-device"); + + switch (boot_device) { + case 'a': + push_str("/obio/SUNW,fdtwo"); + break; + case 'c': + push_str("disk"); + break; + default: + case 'd': + push_str("cdrom"); + break; + case 'n': + push_str("net"); + break; + } + + fword("encode-string"); + push_str("boot-device"); + fword("property"); + + /* Set up other properties */ push_str("/chosen"); fword("find-device"); @@ -480,6 +505,16 @@ push_str("bootpath"); fword("property"); + /* bootpath/bootargs should be set to NVRAM default */ + fword("boot-device"); + fword("encode-string"); + push_str("bootpath"); + fword("property"); + fword("boot-args"); + fword("encode-string"); + push_str("bootargs"); + fword("property"); + push_str(obio_cmdline); fword("encode-string"); push_str("bootargs"); Modified: trunk/openbios-devel/forth/admin/nvram.fs ============================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs Mon Jun 28 07:18:47 2010 (r804) +++ trunk/openbios-devel/forth/admin/nvram.fs Mon Jun 28 13:58:28 2010 (r805) @@ -329,7 +329,6 @@ [IFDEF] CONFIG_PPC \ ---- PPC ---- -s" disk" s" boot-device" str-config \ 7.4.3.5 s" false" s" little-endian?" bool-config s" false" s" real-mode?" bool-config s" -1" s" real-base" int-config @@ -341,7 +340,6 @@ [IFDEF] CONFIG_X86 \ ---- X86 ---- -s" disk" s" boot-device" str-config \ 7.4.3.5 s" true" s" little-endian?" bool-config [THEN] @@ -367,6 +365,7 @@ s" " s" boot-screen" str-config s" " s" boot-script" str-config s" false" s" use-generic?" bool-config +s" disk" s" boot-device" str-config \ 7.4.3.5 s" " s" boot-args" str-config \ ??? \ defers

3 2

[commit] r806 - trunk/openbios-devel/arch/sparc32
by repository service 28 Jun '10

28 Jun '10

Author: mcayland Date: Mon Jun 28 19:43:48 2010 New Revision: 806 URL: http://tracker.coreboot.org/trac/openbios/changeset/806 Log: Fix up SPARC32 boot from CDROM. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/openbios.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Mon Jun 28 13:58:28 2010 (r805) +++ trunk/openbios-devel/arch/sparc32/boot.c Mon Jun 28 19:43:48 2010 (r806) @@ -157,38 +157,30 @@ int result; if(!path) { - push_str("boot-device"); - push_str("/options"); - fword("(find-dev)"); - POP(); - fword("get-package-property"); - if (!POP()) { - path = pop_fstr_copy(); - } else { - switch (boot_device) { - case 'a': - path = strdup("/obio/SUNW,fdtwo"); - oldpath = "fd()"; - break; - case 'c': - path = strdup("disk"); - oldpath = "sd(0,0,0):d"; - break; - default: - case 'd': - path = strdup("cdrom"); - // FIXME: hardcoding this looks almost definitely wrong. - // With sd(0,2,0):b we get to see the solaris kernel though - //oldpath = "sd(0,2,0):d"; - oldpath = "sd(0,2,0):b"; - unit = 2; - break; - case 'n': - path = strdup("net"); - oldpath = "le()"; - break; - } - } + /* No path specified, so grab defaults from firmware */ + switch (boot_device) { + case 'a': + path = strdup("/obio/SUNW,fdtwo"); + oldpath = "fd()"; + break; + case 'c': + path = strdup("disk"); + oldpath = "sd(0,0,0):d"; + break; + default: + case 'd': + path = strdup("cdrom"); + // FIXME: hardcoding this looks almost definitely wrong. + // With sd(0,2,0):b we get to see the solaris kernel though + //oldpath = "sd(0,2,0):d"; + oldpath = "sd(0,2,0):b"; + unit = 2; + break; + case 'n': + path = strdup("net"); + oldpath = "le()"; + break; + } } obp_arg.boot_dev_ctrl = 0; Modified: trunk/openbios-devel/arch/sparc32/openbios.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/openbios.c Mon Jun 28 13:58:28 2010 (r805) +++ trunk/openbios-devel/arch/sparc32/openbios.c Mon Jun 28 19:43:48 2010 (r806) @@ -22,7 +22,6 @@ #include "boot.h" #include "packages/video.h" #define NO_QEMU_PROTOS -#define NO_OPENBIOS_PROTOS #include "arch/common/fw_cfg.h" #define MEMORY_SIZE (128*1024) /* 16K ram for hosted system */ @@ -166,6 +165,8 @@ push_str("bootargs"); fword("property"); + boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); + bind_func("platform-boot", boot ); }

1 0

[commit] r804 - trunk/openbios-devel/packages
by repository service 28 Jun '10

28 Jun '10

Author: mcayland Date: Mon Jun 28 07:18:47 2010 New Revision: 804 URL: http://tracker.coreboot.org/trac/openbios/changeset/804 Log: Commit a couple of minor fixes to packages/nvram.c which allow it to be compiled with debugging enabled on platforms where sizeof(int) != sizeof(void *). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/packages/nvram.c Modified: trunk/openbios-devel/packages/nvram.c ============================================================================== --- trunk/openbios-devel/packages/nvram.c Mon Jun 28 07:16:15 2010 (r803) +++ trunk/openbios-devel/packages/nvram.c Mon Jun 28 07:18:47 2010 (r804) @@ -19,6 +19,8 @@ #include "arch/common/nvram.h" #include "packages/nvram.h" +//#define CONFIG_DEBUG_NVRAM 1 + #ifdef CONFIG_DEBUG_NVRAM #define DPRINTF(fmt, args...) \ do { printk("NVRAM: " fmt , ##args); } while (0) @@ -262,7 +264,7 @@ n++; } PUSH(n); - DPRINTF("read %08x %x -- %x\n", (int)p, len, n); + DPRINTF("read %p %x -- %x\n", p, len, n); } /* ( addr len -- actual ) */ @@ -278,7 +280,7 @@ n++; } PUSH(n); - DPRINTF("write %08x %x -- %x\n", (int)p, len, n ); + DPRINTF("write %p %x -- %x\n", p, len, n ); } /* ( -- size ) */

1 0

[commit] r803 - in trunk/openbios-devel/forth: admin bootstrap debugging
by repository service 28 Jun '10

28 Jun '10

Author: mcayland Date: Mon Jun 28 07:16:15 2010 New Revision: 803 URL: http://tracker.coreboot.org/trac/openbios/changeset/803 Log: Fix up parse word so that it can correctly handle empty arguments and (encode-bootpath) word so that it can handle optional arguments. With these fixes in place we can now switch the boot word to use (encode-bootpath) which means that the bootpath and bootarg properties are now set exactly the same when executing boot and/or load. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/forth/admin/userboot.fs trunk/openbios-devel/forth/bootstrap/bootstrap.fs trunk/openbios-devel/forth/debugging/client.fs Modified: trunk/openbios-devel/forth/admin/userboot.fs ============================================================================== --- trunk/openbios-devel/forth/admin/userboot.fs Sun Jun 27 22:08:21 2010 (r802) +++ trunk/openbios-devel/forth/admin/userboot.fs Mon Jun 28 07:16:15 2010 (r803) @@ -1,7 +1,7 @@ \ 7.4.3.5 User commands for booting : boot ( "{param-text}<cr>" -- ) - linefeed parse cr + (encode-bootpath) s" platform-boot" $find if execute else Modified: trunk/openbios-devel/forth/bootstrap/bootstrap.fs ============================================================================== --- trunk/openbios-devel/forth/bootstrap/bootstrap.fs Sun Jun 27 22:08:21 2010 (r802) +++ trunk/openbios-devel/forth/bootstrap/bootstrap.fs Mon Jun 28 07:16:15 2010 (r803) @@ -704,6 +704,11 @@ >r \ save delimiter ib >in @ + span @ >in @ - \ ib+offs len-offset. + dup 0 < if \ if we are already at the end of the string, return an empty string + + 0 \ move to end of input string + r> drop + exit + then 2dup r> \ ib+offs len-offset ib+offs len-offset delim findchar if \ look for the delimiter. nip dup 1+ Modified: trunk/openbios-devel/forth/debugging/client.fs ============================================================================== --- trunk/openbios-devel/forth/debugging/client.fs Sun Jun 27 22:08:21 2010 (r802) +++ trunk/openbios-devel/forth/debugging/client.fs Mon Jun 28 07:16:15 2010 (r803) @@ -56,13 +56,21 @@ ; : (encode-bootpath) ( "{params}<cr>" -- bootpath-str bootpath-len) - bl parse 2dup encode-string - " /chosen" (find-dev) if - " bootpath" rot (property) + \ Parse the current input buffer of a load/boot command and set both + \ the bootargs and bootpath properties as appropriate. + bl parse dup if + 2dup encode-string + " /chosen" (find-dev) if + " bootpath" rot (property) + then then - linefeed parse encode-string - " /chosen" (find-dev) if - " bootargs" rot (property) + linefeed parse dup if + encode-string + " /chosen" (find-dev) if + " bootargs" rot (property) + then + else + 2drop then ;

1 0

[commit] r802 - trunk/openbios-devel/forth/admin
by repository service 27 Jun '10

27 Jun '10

Author: blueswirl Date: Sun Jun 27 22:08:21 2010 New Revision: 802 URL: http://tracker.coreboot.org/trac/openbios/changeset/802 Log: Fix Sparc32 boot breakage: define load-base Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/admin/nvram.fs Modified: trunk/openbios-devel/forth/admin/nvram.fs ============================================================================== --- trunk/openbios-devel/forth/admin/nvram.fs Sun Jun 27 16:00:37 2010 (r801) +++ trunk/openbios-devel/forth/admin/nvram.fs Sun Jun 27 22:08:21 2010 (r802) @@ -347,6 +347,7 @@ [IFDEF] CONFIG_SPARC32 \ ---- SPARC32 ---- +s" 4000" s" load-base" int-config s" true" s" tpe-link-test?" bool-config s" 9600,8,n,1,-" s" ttya-mode" str-config s" true" s" ttya-ignore-cd" bool-config

1 0

[commit] r801 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 arch/x86 include/libopenbios libopenbios
by repository service 27 Jun '10

27 Jun '10

Author: mcayland Date: Sun Jun 27 16:00:37 2010 New Revision: 801 URL: http://tracker.coreboot.org/trac/openbios/changeset/801 Log: Move a.out loader into the new C load implementation (also fix up the header includes in load.c). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc32/boot.h trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/sparc64/boot.h trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/arch/x86/boot.h trunk/openbios-devel/arch/x86/openbios.c trunk/openbios-devel/include/libopenbios/aout_load.h trunk/openbios-devel/include/libopenbios/sys_info.h trunk/openbios-devel/libopenbios/aout_load.c trunk/openbios-devel/libopenbios/load.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Jun 27 16:00:37 2010 (r801) @@ -54,7 +54,7 @@ #ifdef CONFIG_LOADER_AOUT /* a.out loader */ - aout_load(&sys_info, path); + aout_load(&sys_info, dev); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/arch/sparc32/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.h Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/arch/sparc32/boot.h Sun Jun 27 16:00:37 2010 (r801) @@ -17,7 +17,6 @@ void *init_openprom(void); // boot.c -extern struct sys_info sys_info; extern const char *bootpath; extern void boot(void); extern void go(void); Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Jun 27 16:00:37 2010 (r801) @@ -46,7 +46,7 @@ #ifdef CONFIG_LOADER_AOUT /* a.out loader */ - aout_load(&sys_info, path); + aout_load(&sys_info, dev); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/arch/sparc64/boot.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.h Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/arch/sparc64/boot.h Sun Jun 27 16:00:37 2010 (r801) @@ -15,7 +15,6 @@ uint64_t start_client_image(uint64_t entry_point, uint64_t cif_handler); // boot.c -extern struct sys_info sys_info; extern uint64_t kernel_image; extern uint64_t kernel_size; extern uint64_t qemu_cmdline; Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/arch/x86/boot.c Sun Jun 27 16:00:37 2010 (r801) @@ -43,7 +43,7 @@ #ifdef CONFIG_LOADER_AOUT /* a.out loader */ - aout_load(&sys_info, path); + aout_load(&sys_info, dev); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/arch/x86/boot.h ============================================================================== --- trunk/openbios-devel/arch/x86/boot.h Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/arch/x86/boot.h Sun Jun 27 16:00:37 2010 (r801) @@ -14,6 +14,5 @@ unsigned int start_elf(unsigned long entry_point, unsigned long param); /* boot.c */ -extern struct sys_info sys_info; extern void boot(void); extern void go(void); Modified: trunk/openbios-devel/arch/x86/openbios.c ============================================================================== --- trunk/openbios-devel/arch/x86/openbios.c Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/arch/x86/openbios.c Sun Jun 27 16:00:37 2010 (r801) @@ -75,7 +75,6 @@ int openbios(void) { - extern struct sys_info sys_info; #ifdef CONFIG_DEBUG_CONSOLE #ifdef CONFIG_DEBUG_CONSOLE_SERIAL uart_init(CONFIG_SERIAL_PORT, CONFIG_SERIAL_SPEED); Modified: trunk/openbios-devel/include/libopenbios/aout_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/aout_load.h Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/include/libopenbios/aout_load.h Sun Jun 27 16:00:37 2010 (r801) @@ -21,7 +21,7 @@ #include "libopenbios/sys_info.h" extern int is_aout(struct exec *ehdr); -extern int aout_load(struct sys_info *info, const char *filename); +extern int aout_load(struct sys_info *info, ihandle_t dev); extern void aout_init_program(void); #endif /* _H_AOUTLOAD */ Modified: trunk/openbios-devel/include/libopenbios/sys_info.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/sys_info.h Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/include/libopenbios/sys_info.h Sun Jun 27 16:00:37 2010 (r801) @@ -22,6 +22,8 @@ unsigned long *dict_end; }; +extern struct sys_info sys_info; + void collect_elfboot_info(struct sys_info *info); void collect_linuxbios_info(struct sys_info *info); Modified: trunk/openbios-devel/libopenbios/aout_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/aout_load.c Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/libopenbios/aout_load.c Sun Jun 27 16:00:37 2010 (r801) @@ -68,7 +68,7 @@ } int -aout_load(struct sys_info *info, const char *filename) +aout_load(struct sys_info *info, ihandle_t dev) { int retval = -1; struct exec ehdr; @@ -80,7 +80,7 @@ /* Mark the saved-program-state as invalid */ feval("0 state-valid !"); - fd = open_io(filename); + fd = open_ih(dev); if (!fd) goto out; @@ -113,8 +113,8 @@ if (size < 7680) size = 7680; - - start = 0x4000; // N_TXTADDR(ehdr); + fword("load-base"); + start = POP(); // N_TXTADDR(ehdr); if (!check_mem_ranges(info, start, size)) goto out; Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Sun Jun 27 15:14:03 2010 (r800) +++ trunk/openbios-devel/libopenbios/load.c Sun Jun 27 16:00:37 2010 (r801) @@ -17,15 +17,30 @@ #include "config.h" #include "kernel/kernel.h" #include "libopenbios/bindings.h" +#include "libopenbios/sys_info.h" #include "libopenbios/load.h" +#ifdef CONFIG_LOADER_AOUT +#include "libopenbios/aout_load.h" +#endif + +#ifdef CONFIG_LOADER_FCODE #include "libopenbios/fcode_load.h" +#endif + +#ifdef CONFIG_LOADER_FORTH #include "libopenbios/forth_load.h" +#endif + void load(ihandle_t dev) { /* Invoke the loaders on the specified device */ +#ifdef CONFIG_LOADER_AOUT + aout_load(&sys_info, dev); +#endif + #ifdef CONFIG_LOADER_FCODE fcode_load(dev); #endif

1 0

[commit] r800 - trunk/openbios-devel/libopenbios
by repository service 27 Jun '10

27 Jun '10

Author: mcayland Date: Sun Jun 27 15:14:03 2010 New Revision: 800 URL: http://tracker.coreboot.org/trac/openbios/changeset/800 Log: Move Forth loader into the new C load implementation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/load.c Modified: trunk/openbios-devel/libopenbios/load.c ============================================================================== --- trunk/openbios-devel/libopenbios/load.c Sun Jun 27 15:06:38 2010 (r799) +++ trunk/openbios-devel/libopenbios/load.c Sun Jun 27 15:14:03 2010 (r800) @@ -20,7 +20,7 @@ #include "libopenbios/load.h" #include "libopenbios/fcode_load.h" - +#include "libopenbios/forth_load.h" void load(ihandle_t dev) { @@ -30,4 +30,8 @@ fcode_load(dev); #endif +#ifdef CONFIG_LOADER_FORTH + forth_load(dev); +#endif + }

1 0

[commit] r799 - in trunk/openbios-devel: arch/sparc32 arch/sparc64 arch/x86 include/libopenbios libopenbios
by repository service 27 Jun '10

27 Jun '10

Author: mcayland Date: Sun Jun 27 15:06:38 2010 New Revision: 799 URL: http://tracker.coreboot.org/trac/openbios/changeset/799 Log: Switch Forth loader over to using an ihandle rather than a direct path reference. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc32/boot.c trunk/openbios-devel/arch/sparc64/boot.c trunk/openbios-devel/arch/x86/boot.c trunk/openbios-devel/include/libopenbios/forth_load.h trunk/openbios-devel/libopenbios/forth_load.c Modified: trunk/openbios-devel/arch/sparc32/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc32/boot.c Fri Jun 25 22:42:00 2010 (r798) +++ trunk/openbios-devel/arch/sparc32/boot.c Sun Jun 27 15:06:38 2010 (r799) @@ -72,7 +72,7 @@ #ifdef CONFIG_LOADER_FORTH /* Forth loader */ - forth_load(path); + forth_load(dev); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/arch/sparc64/boot.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/boot.c Fri Jun 25 22:42:00 2010 (r798) +++ trunk/openbios-devel/arch/sparc64/boot.c Sun Jun 27 15:06:38 2010 (r799) @@ -64,7 +64,7 @@ #ifdef CONFIG_LOADER_FORTH /* Forth loader */ - forth_load(path); + forth_load(dev); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/arch/x86/boot.c ============================================================================== --- trunk/openbios-devel/arch/x86/boot.c Fri Jun 25 22:42:00 2010 (r798) +++ trunk/openbios-devel/arch/x86/boot.c Sun Jun 27 15:06:38 2010 (r799) @@ -61,7 +61,7 @@ #ifdef CONFIG_LOADER_FORTH /* Forth loader */ - forth_load(path); + forth_load(dev); feval("state-valid @"); valid = POP(); if (valid) Modified: trunk/openbios-devel/include/libopenbios/forth_load.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/forth_load.h Fri Jun 25 22:42:00 2010 (r798) +++ trunk/openbios-devel/include/libopenbios/forth_load.h Sun Jun 27 15:06:38 2010 (r799) @@ -18,7 +18,7 @@ #define _H_FORTHLOAD extern int is_forth(char *forth); -extern int forth_load(const char *filename); +extern int forth_load(ihandle_t dev); extern void forth_init_program(void); #endif /* _H_FORTHLOAD */ Modified: trunk/openbios-devel/libopenbios/forth_load.c ============================================================================== --- trunk/openbios-devel/libopenbios/forth_load.c Fri Jun 25 22:42:00 2010 (r798) +++ trunk/openbios-devel/libopenbios/forth_load.c Sun Jun 27 15:06:38 2010 (r799) @@ -23,7 +23,7 @@ return (forth[0] == '\\' && forth[1] == ' '); } -int forth_load(const char *filename) +int forth_load(ihandle_t dev) { char magic[2]; unsigned long forthsize; @@ -32,7 +32,7 @@ /* Mark the saved-program-state as invalid */ feval("0 state-valid !"); - fd = open_io(filename); + fd = open_ih(dev); if (!fd) goto out;

1 0