OpenBIOS February 2011

openbios@openbios.org

9 participants
25 discussions

[commit] r1031 - in trunk/openbios-devel: include/arch/amd64 include/arch/ppc include/arch/sparc32 include/arch/sparc64 include/arch/x86 kernel
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 23:30:14 2011 New Revision: 1031 URL: http://tracker.coreboot.org/trac/openbios/changeset/1031 Log: Tidy cell types and format strings Always define [u]cell in terms of fixed-width POSIX types, so that their PRI* macros can be reused. 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/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 trunk/openbios-devel/kernel/cross.h Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -24,12 +24,12 @@ /* cell based types */ -typedef long long cell; -typedef unsigned long long ucell; -typedef __int128_t dcell; +typedef int64_t cell; +typedef uint64_t ucell; +typedef __int128_t dcell; typedef __uint128_t ducell; -#define FMT_ucellx "%016llx" +#define FMT_ucellx "%016" PRIx64 typedef int64_t prom_arg_t; typedef uint64_t prom_uarg_t; Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -55,10 +55,10 @@ typedef int64_t dcell; typedef uint64_t ducell; -#define FMT_cell "%d" -#define FMT_ucell "%u" -#define FMT_ucellx "%08x" -#define FMT_ucellX "%08X" +#define FMT_cell "%" PRId32 +#define FMT_ucell "%" PRIu32 +#define FMT_ucellx "%08" PRIx32 +#define FMT_ucellX "%08" PRIX32 typedef int32_t prom_arg_t; typedef uint32_t prom_uarg_t; Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -54,8 +54,8 @@ #define FMT_cell "%" PRId32 #define FMT_ucell "%" PRIu32 -#define FMT_ucellx "%08x" -#define FMT_ucellX "%08X" +#define FMT_ucellx "%08" PRIx32 +#define FMT_ucellX "%08" PRIX32 typedef int32_t prom_arg_t; typedef uint32_t prom_uarg_t; Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -45,13 +45,13 @@ #define FMT_plx "%016" PRIx64 /* cell based types */ -typedef long long cell; -typedef unsigned long long ucell; +typedef int64_t cell; +typedef uint64_t ucell; -#define FMT_cell "%lld" -#define FMT_ucell "%llu" -#define FMT_ucellx "%016llx" -#define FMT_ucellX "%016llX" +#define FMT_cell "%" PRId64 +#define FMT_ucell "%" PRIu64 +#define FMT_ucellx "%016" PRIx64 +#define FMT_ucellX "%016" PRIX64 typedef int64_t prom_arg_t; typedef uint64_t prom_uarg_t; Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 23:30:14 2011 (r1031) @@ -30,10 +30,10 @@ typedef int64_t dcell; typedef uint64_t ducell; -#define FMT_cell "%ld" -#define FMT_ucell "%lu" -#define FMT_ucellx "%08x" -#define FMT_ucellX "%08X" +#define FMT_cell "%" PRId32 +#define FMT_ucell "%" PRIu32 +#define FMT_ucellx "%08" PRIx32 +#define FMT_ucellX "%08" PRIX32 typedef int32_t prom_arg_t; typedef uint32_t prom_uarg_t; Modified: trunk/openbios-devel/kernel/cross.h ============================================================================== --- trunk/openbios-devel/kernel/cross.h Sun Feb 13 22:08:59 2011 (r1030) +++ trunk/openbios-devel/kernel/cross.h Sun Feb 13 23:30:14 2011 (r1031) @@ -103,11 +103,11 @@ /* bit width handling */ #if BITS==32 -#define FMT_CELL_x "x" -#define FMT_CELL_d "d" +#define FMT_CELL_x PRIx32 +#define FMT_CELL_d PRId32 #else -#define FMT_CELL_x "llx" -#define FMT_CELL_d "lld" +#define FMT_CELL_x PRIx64 +#define FMT_CELL_d PRId64 #endif #ifdef NATIVE_BITWIDTH_SMALLER_THAN_HOST_BITWIDTH

1 0

[commit] r1030 - trunk/openbios-devel/include/arch/ppc
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 22:08:59 2011 New Revision: 1030 URL: http://tracker.coreboot.org/trac/openbios/changeset/1030 Log: ppc: Use inttypes.h It defines the PRI* macros for the host. Cf. r1026. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/include/arch/ppc/types.h Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 21:54:47 2011 (r1029) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 22:08:59 2011 (r1030) @@ -12,7 +12,7 @@ #include "mconfig.h" #ifdef BOOTSTRAP -#include <stdint.h> +#include <inttypes.h> #else typedef unsigned char uint8_t; typedef unsigned short uint16_t;

1 0

[commit] r1029 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 21:54:47 2011 New Revision: 1029 URL: http://tracker.coreboot.org/trac/openbios/changeset/1029 Log: ppc64: Re-enable SF bit after returning from ELF binary When returning from the binary, enable Sixty-Four Bit Mode. Leave it disabled on entry, as enabling it breaks multiple guests. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S trunk/openbios-devel/include/arch/ppc/processor.h Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Feb 13 21:31:14 2011 (r1028) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sun Feb 13 21:54:47 2011 (r1029) @@ -494,6 +494,11 @@ MTMSRD(r0) blrl +#ifdef CONFIG_PPC64 + /* Restore SF bit */ + LOAD_REG_IMMEDIATE(r0, MSR_SF | MSR_FP | MSR_ME | MSR_DR | MSR_IR) + MTMSRD(r0) +#endif LOAD_REG_IMMEDIATE(r8, saved_stack) // restore stack pointer mr r1,r8 PPC_LL r0, (STACKFRAME_MINSIZE + PPC_LR_STKOFF)(r1) Modified: trunk/openbios-devel/include/arch/ppc/processor.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/processor.h Sun Feb 13 21:31:14 2011 (r1028) +++ trunk/openbios-devel/include/arch/ppc/processor.h Sun Feb 13 21:54:47 2011 (r1029) @@ -40,6 +40,8 @@ #ifndef MSR_VEC +#define MSR_SF (1 << 63) /* Sixty-Four Bit Mode */ + #define MSR_VEC (1<<25) /* 6: Enable AltiVec */ #define MSR_POW (1<<18) /* 13: Enable Power Management */ #define MSR_TGPR (1<<17) /* 14: TLB Update registers in use */

1 0

[commit] r1028 - in trunk/openbios-devel: include/arch/amd64 include/arch/ia64 include/arch/ppc include/arch/sparc32 include/arch/sparc64 include/arch/x86 libopenbios
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 21:31:14 2011 New Revision: 1028 URL: http://tracker.coreboot.org/trac/openbios/changeset/1028 Log: libopenbios: Adapt CIF handling for ppc64 On ppc64, currently neither long nor pointers can be used for the client interface. Introduce new types prom_[u]arg_t as abstraction and add helpers get_service() and arg2pointer() as well as format strings. 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 trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/include/arch/amd64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -31,6 +31,16 @@ #define FMT_ucellx "%016llx" +typedef int64_t prom_arg_t; +typedef uint64_t prom_uarg_t; + +#define PRIdPROMARG PRId64 +#define PRIuPROMARG PRIu64 +#define PRIxPROMARG PRIx64 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%016" PRIxPROMARG + #define FMT_elf "%#x" #define bitspercell (sizeof(cell)<<3) Modified: trunk/openbios-devel/include/arch/ia64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ia64/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/ia64/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -30,6 +30,16 @@ typedef __int128_t dcell; typedef __uint128_t ducell; +typedef int64_t prom_arg_t; +typedef uint64_t prom_uarg_t; + +#define PRIdPROMARG PRId64 +#define PRIuPROMARG PRIu64 +#define PRIxPROMARG PRIx64 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%016" PRIxPROMARG + #define bitspercell (sizeof(cell)<<3) #define bitsperdcell (sizeof(dcell)<<3) Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -60,6 +60,16 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +typedef int32_t prom_arg_t; +typedef uint32_t prom_uarg_t; + +#define PRIdPROMARG PRId32 +#define PRIuPROMARG PRIu32 +#define PRIxPROMARG PRIx32 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%08" PRIxPROMARG + #define FMT_elf "%#x" #define FMT_sizet "%lx" #define FMT_aout_ehdr "%lx" Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -57,6 +57,16 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +typedef int32_t prom_arg_t; +typedef uint32_t prom_uarg_t; + +#define PRIdPROMARG PRId32 +#define PRIuPROMARG PRIu32 +#define PRIxPROMARG PRIx32 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%08" PRIxPROMARG + #define FMT_elf "%#x" #define FMT_sizet "%lx" #define FMT_aout_ehdr "%lx" Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -53,6 +53,16 @@ #define FMT_ucellx "%016llx" #define FMT_ucellX "%016llX" +typedef int64_t prom_arg_t; +typedef uint64_t prom_uarg_t; + +#define PRIdPROMARG PRId64 +#define PRIuPROMARG PRIu64 +#define PRIxPROMARG PRIx64 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%016" PRIxPROMARG + #define FMT_elf "%#llx" #define FMT_sizet "%lx" #define FMT_aout_ehdr "%x" Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 21:31:14 2011 (r1028) @@ -35,6 +35,16 @@ #define FMT_ucellx "%08x" #define FMT_ucellX "%08X" +typedef int32_t prom_arg_t; +typedef uint32_t prom_uarg_t; + +#define PRIdPROMARG PRId32 +#define PRIuPROMARG PRIu32 +#define PRIxPROMARG PRIx32 +#define FMT_prom_arg "%" PRIdPROMARG +#define FMT_prom_uarg "%" PRIuPROMARG +#define FMT_prom_uargx "%08" PRIxPROMARG + #define FMT_elf "%#x" #define bitspercell (sizeof(cell)<<3) Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sun Feb 13 20:56:29 2011 (r1027) +++ trunk/openbios-devel/libopenbios/client.c Sun Feb 13 21:31:14 2011 (r1028) @@ -32,11 +32,23 @@ #define PROM_MAX_ARGS 10 typedef struct prom_args { - const char *service; - long nargs; - long nret; - unsigned long args[PROM_MAX_ARGS]; -} prom_args_t; + prom_uarg_t service; + prom_arg_t nargs; + prom_arg_t nret; + prom_uarg_t args[PROM_MAX_ARGS]; +} __attribute__((packed)) prom_args_t; + +static inline const char * +arg2pointer(prom_uarg_t value) +{ + return (char*)(uintptr_t)value; +} + +static inline const char * +get_service(prom_args_t *pb) +{ + return arg2pointer(pb->service); +} #ifdef DEBUG_CIF static void memdump(const char *mem, unsigned long size) @@ -73,83 +85,84 @@ static void dump_service(prom_args_t *pb) { int i; - if (strcmp(pb->service, "test") == 0) { - printk("test(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "peer") == 0) { - printk("peer(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "child") == 0) { - printk("child(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "parent") == 0) { - printk("parent(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "instance-to-package") == 0) { - printk("instance-to-package(0x%08lx) = ", pb->args[0]); - } else if (strcmp(pb->service, "getproplen") == 0) { - printk("getproplen(0x%08lx, \"%s\") = ", - pb->args[0], (char*)pb->args[1]); - } else if (strcmp(pb->service, "getprop") == 0) { - printk("getprop(0x%08lx, \"%s\", 0x%08lx, %ld) = ", - pb->args[0], (char*)pb->args[1], + const char *service = get_service(pb); + if (strcmp(service, "test") == 0) { + printk("test(\"%s\") = ", arg2pointer(pb->args[0])); + } else if (strcmp(service, "peer") == 0) { + printk("peer(0x" FMT_prom_uargx ") = ", pb->args[0]); + } else if (strcmp(service, "child") == 0) { + printk("child(0x" FMT_prom_uargx ") = ", pb->args[0]); + } else if (strcmp(service, "parent") == 0) { + printk("parent(0x" FMT_prom_uargx ") = ", pb->args[0]); + } else if (strcmp(service, "instance-to-package") == 0) { + printk("instance-to-package(0x" FMT_prom_uargx ") = ", pb->args[0]); + } else if (strcmp(service, "getproplen") == 0) { + printk("getproplen(0x" FMT_prom_uargx ", \"%s\") = ", + pb->args[0], arg2pointer(pb->args[1])); + } else if (strcmp(service, "getprop") == 0) { + printk("getprop(0x" FMT_prom_uargx ", \"%s\", 0x" FMT_prom_uargx ", " FMT_prom_arg ") = ", + pb->args[0], arg2pointer(pb->args[1]), pb->args[2], pb->args[3]); - } else if (strcmp(pb->service, "nextprop") == 0) { - printk("nextprop(0x%08lx, \"%s\", 0x%08lx) = ", - pb->args[0], (char*)pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "setprop") == 0) { - printk("setprop(0x%08lx, \"%s\", 0x%08lx, %ld)\n", - pb->args[0], (char*)pb->args[1], + } else if (strcmp(service, "nextprop") == 0) { + printk("nextprop(0x" FMT_prom_uargx ", \"%s\", 0x" FMT_prom_uargx ") = ", + pb->args[0], arg2pointer(pb->args[1]), pb->args[2]); + } else if (strcmp(service, "setprop") == 0) { + printk("setprop(0x" FMT_prom_uargx ", \"%s\", 0x" FMT_prom_uargx ", " FMT_prom_arg ")\n", + pb->args[0], arg2pointer(pb->args[1]), pb->args[2], pb->args[3]); - memdump((char*)pb->args[2], pb->args[3]); + memdump(arg2pointer(pb->args[2]), pb->args[3]); printk(" = "); - } else if (strcmp(pb->service, "canon") == 0) { - printk("canon(\"%s\", 0x%08lx, %ld)\n", - (char*)pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "finddevice") == 0) { - printk("finddevice(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "instance-to-path") == 0) { - printk("instance-to-path(0x%08lx, 0x%08lx, %ld) = ", + } else if (strcmp(service, "canon") == 0) { + printk("canon(\"%s\", 0x" FMT_prom_uargx ", " FMT_prom_arg ")\n", + arg2pointer(pb->args[0]), pb->args[1], pb->args[2]); + } else if (strcmp(service, "finddevice") == 0) { + printk("finddevice(\"%s\") = ", arg2pointer(pb->args[0])); + } else if (strcmp(service, "instance-to-path") == 0) { + printk("instance-to-path(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", " FMT_prom_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "package-to-path") == 0) { - printk("package-to-path(0x%08lx, 0x%08lx, %ld) = ", + } else if (strcmp(service, "package-to-path") == 0) { + printk("package-to-path(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", " FMT_prom_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "open") == 0) { - printk("open(\"%s\") = ", (char*)pb->args[0]); - } else if (strcmp(pb->service, "close") == 0) { - printk("close(0x%08lx)\n", pb->args[0]); - } else if (strcmp(pb->service, "read") == 0) { + } else if (strcmp(service, "open") == 0) { + printk("open(\"%s\") = ", arg2pointer(pb->args[0])); + } else if (strcmp(service, "close") == 0) { + printk("close(0x" FMT_prom_uargx ")\n", pb->args[0]); + } else if (strcmp(service, "read") == 0) { #ifdef DUMP_IO - printk("read(0x%08lx, 0x%08lx, %ld) = ", + printk("read(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", " FMT_prom_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); #endif - } else if (strcmp(pb->service, "write") == 0) { + } else if (strcmp(service, "write") == 0) { #ifdef DUMP_IO - printk("write(0x%08lx, 0x%08lx, %ld)\n", + printk("write(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", " FMT_prom_arg ")\n", pb->args[0], pb->args[1], pb->args[2]); - memdump((char*)pb->args[1], pb->args[2]); + memdump(arg2pointer(pb->args[1]), pb->args[2]); printk(" = "); #endif - } else if (strcmp(pb->service, "seek") == 0) { + } else if (strcmp(service, "seek") == 0) { #ifdef DUMP_IO - printk("seek(0x%08lx, 0x%08lx, 0x%08lx) = ", + printk("seek(0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ", 0x" FMT_prom_uargx ") = ", pb->args[0], pb->args[1], pb->args[2]); #endif - } else if (strcmp(pb->service, "claim") == 0) { - printk("claim(0x%08lx, %ld, %ld) = ", + } else if (strcmp(service, "claim") == 0) { + printk("claim(0x" FMT_prom_uargx ", " FMT_prom_arg ", " FMT_prom_arg ") = ", pb->args[0], pb->args[1], pb->args[2]); - } else if (strcmp(pb->service, "release") == 0) { - printk("release(0x%08lx, %ld)\n", + } else if (strcmp(service, "release") == 0) { + printk("release(0x" FMT_prom_uargx ", " FMT_prom_arg ")\n", pb->args[0], pb->args[1]); - } else if (strcmp(pb->service, "boot") == 0) { - printk("boot \"%s\"\n", (char*)pb->args[0]); - } else if (strcmp(pb->service, "enter") == 0) { + } else if (strcmp(service, "boot") == 0) { + printk("boot \"%s\"\n", arg2pointer(pb->args[0])); + } else if (strcmp(service, "enter") == 0) { printk("enter()\n"); - } else if (strcmp(pb->service, "exit") == 0) { + } else if (strcmp(service, "exit") == 0) { printk("exit()\n"); - } else if (strcmp(pb->service, "test-method") == 0) { - printk("test-method(0x%08lx, \"%s\") = ", - pb->args[0], (char*)pb->args[1]); + } else if (strcmp(service, "test-method") == 0) { + printk("test-method(0x" FMT_prom_uargx ", \"%s\") = ", + pb->args[0], arg2pointer(pb->args[1])); } else { - printk("of_client_interface: %s ", pb->service ); + printk("of_client_interface: %s", service); for( i = 0; i < pb->nargs; i++ ) - printk("%lx ", pb->args[i] ); + printk(" " FMT_prom_uargx, pb->args[i]); printk("\n"); } } @@ -157,71 +170,72 @@ static void dump_return(prom_args_t *pb) { int i; - if (strcmp(pb->service, "test") == 0) { - printk(" %ld\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "peer") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "child") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "parent") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "instance-to-package") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } 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[pb->nargs]); - 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]); - } else if (strcmp(pb->service, "setprop") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "canon") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "finddevice") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "instance-to-path") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "package-to-path") == 0) { - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); - } else if (strcmp(pb->service, "open") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "close") == 0) { + const char *service = get_service(pb); + if (strcmp(service, "test") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "peer") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "child") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "parent") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "instance-to-package") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "getproplen") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "getprop") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + if ((prom_arg_t)pb->args[pb->nargs] != -1) + memdump(arg2pointer(pb->args[2]), MIN(pb->args[3], pb->args[pb->nargs])); + } else if (strcmp(service, "nextprop") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[2]), pb->args[pb->nargs]); + } else if (strcmp(service, "setprop") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "canon") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "finddevice") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "instance-to-path") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "package-to-path") == 0) { + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[1]), pb->args[pb->nargs]); + } else if (strcmp(service, "open") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "close") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "read") == 0) { + } else if (strcmp(service, "read") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[1], pb->args[pb->nargs]); + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); + memdump(arg2pointer(pb->args[1]), pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "write") == 0) { + } else if (strcmp(service, "write") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "seek") == 0) { + } else if (strcmp(service, "seek") == 0) { #ifdef DUMP_IO - printk("%ld\n", pb->args[pb->nargs]); + printk(FMT_prom_arg "\n", pb->args[pb->nargs]); #endif - } else if (strcmp(pb->service, "claim") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); - } else if (strcmp(pb->service, "release") == 0) { + } else if (strcmp(service, "claim") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); + } else if (strcmp(service, "release") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "boot") == 0) { + } else if (strcmp(service, "boot") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "enter") == 0) { + } else if (strcmp(service, "enter") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "exit") == 0) { + } else if (strcmp(service, "exit") == 0) { /* do nothing */ - } else if (strcmp(pb->service, "test-method") == 0) { - printk("0x%08lx\n", pb->args[pb->nargs]); + } else if (strcmp(service, "test-method") == 0) { + printk("0x" FMT_prom_uargx "\n", pb->args[pb->nargs]); } else { printk("of_client_interface return:"); for (i = 0; i < pb->nret; i++) { - printk(" %lx", pb->args[pb->nargs + i]); + printk(" " FMT_prom_uargx, pb->args[pb->nargs + i]); } printk("\n"); } @@ -233,17 +247,17 @@ handle_calls( prom_args_t *pb ) { int i, dstacksave = dstackcnt; - long val; + prom_uarg_t val; #ifdef DEBUG_CIF - printk("%s %s ([%ld] -- [%ld])\n", pb->service, (char *)pb->args[0], - pb->nargs, pb->nret); + printk("%s %s ([" FMT_prom_arg "] -- [" FMT_prom_arg "])\n", + get_service(pb), arg2pointer(pb->args[0]), pb->nargs, pb->nret); #endif for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); - push_str( pb->service ); + push_str(get_service(pb)); fword("client-call-iface"); /* Drop the return code from client-call-iface (status is handled by the @@ -260,17 +274,18 @@ } #ifdef DEBUG_CIF - /* useful for debug but not necessarily an error */ - if( i != pb->nret || dstackcnt != dstacksave ) { - printk("%s '%s': possible argument error (%ld--%ld) got %d\n", - pb->service, (char*)pb->args[0], pb->nargs-2, pb->nret, i ); - } - - printk("handle_calls return: "); - for (i = 0; i < pb->nret; i++) { - printk("%lx ", pb->args[pb->nargs + i]); - } - printk("\n"); + /* useful for debug but not necessarily an error */ + if (i != pb->nret || dstackcnt != dstacksave) { + printk("%s '%s': possible argument error (" FMT_prom_arg "--" FMT_prom_arg ") got %d\n", + get_service(pb), arg2pointer(pb->args[0]), + pb->nargs - 2, pb->nret, i); + } + + printk("handle_calls return:"); + for (i = 0; i < pb->nret; i++) { + printk(" " FMT_prom_uargx, pb->args[pb->nargs + i]); + } + printk("\n"); #endif dstackcnt = dstacksave; @@ -292,21 +307,21 @@ #endif /* call-method exceptions are special */ - if( !strcmp("call-method", pb->service) || !strcmp("interpret", pb->service) ) + if (!strcmp("call-method", get_service(pb)) || !strcmp("interpret", get_service(pb))) return handle_calls( pb ); dstacksave = dstackcnt; for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); - push_str( pb->service ); + push_str(get_service(pb)); fword("client-iface"); if( (val=POP()) ) { dstackcnt = dstacksave; if( val == -1 ) - printk("Unimplemented service %s ([%ld] -- [%ld])\n", - pb->service, pb->nargs, pb->nret ); + printk("Unimplemented service %s ([" FMT_prom_arg "] -- [" FMT_prom_arg "])\n", + get_service(pb), pb->nargs, pb->nret ); #ifdef DEBUG_CIF else printk("ERROR!\n"); @@ -320,7 +335,7 @@ if( dstackcnt != dstacksave ) { #ifdef DEBUG_CIF printk("service %s: possible argument error (%d %d)\n", - pb->service, i, dstackcnt - dstacksave ); + get_service(pb), i, dstackcnt - dstacksave ); #endif /* Some clients request less parameters than the CIF method returns, e.g. getprop with OpenSolaris. Hence we drop any

1 0

[commit] r1027 - in trunk/openbios-devel/include/arch: ppc sparc32 sparc64
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 20:56:29 2011 New Revision: 1027 URL: http://tracker.coreboot.org/trac/openbios/changeset/1027 Log: Add remaining PRI* macros For sparc32 some format macros had been added already. For symmetry, add PRI{d,u}64, too, and PRI{d,u}{32,64} for the other architectures as well. Add PRIX{32,64} for all. 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 Sun Feb 13 00:02:18 2011 (r1026) +++ trunk/openbios-devel/include/arch/ppc/types.h Sun Feb 13 20:56:29 2011 (r1027) @@ -26,8 +26,14 @@ typedef long long int64_t; typedef long intptr_t; +#define PRId32 "d" +#define PRIu32 "u" #define PRIx32 "x" +#define PRIX32 "X" +#define PRId64 "lld" +#define PRIu64 "llu" #define PRIx64 "llx" +#define PRIX64 "llX" #endif /* endianess */ Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 00:02:18 2011 (r1026) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 20:56:29 2011 (r1027) @@ -29,7 +29,11 @@ #define PRId32 "d" #define PRIu32 "u" #define PRIx32 "x" +#define PRIX32 "X" +#define PRId64 "lld" +#define PRIu64 "llu" #define PRIx64 "llx" +#define PRIX64 "llX" #endif /* endianess */ Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 00:02:18 2011 (r1026) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 20:56:29 2011 (r1027) @@ -26,8 +26,14 @@ typedef long long int64_t; typedef long intptr_t; +#define PRId32 "d" +#define PRIu32 "u" #define PRIx32 "x" +#define PRIX32 "X" +#define PRId64 "lld" +#define PRIu64 "llu" #define PRIx64 "llx" +#define PRIX64 "llX" #endif /* endianess */

1 0

[commit] r1026 - in trunk/openbios-devel/include/arch: amd64 ia64 sparc32 sparc64 x86
by repository service 13 Feb '11

13 Feb '11

Author: afaerber Date: Sun Feb 13 00:02:18 2011 New Revision: 1026 URL: http://tracker.coreboot.org/trac/openbios/changeset/1026 Log: PRI* macros need inttypes.h Ever since introducing PRI* macros for FMT_plx, we risked using them during bootstrap. According to POSIX.1-2008 the PRI* macros are defined in inttypes.h, which in turn includes stdint.h. 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/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 Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/amd64/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -11,7 +11,7 @@ #ifndef __TYPES_H #define __TYPES_H -#include <stdint.h> +#include <inttypes.h> /* endianess */ #include "autoconf.h" Modified: trunk/openbios-devel/include/arch/ia64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ia64/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/ia64/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -11,7 +11,7 @@ #ifndef __TYPES_H #define __TYPES_H -#include <stdint.h> +#include <inttypes.h> /* endianess */ Modified: trunk/openbios-devel/include/arch/sparc32/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc32/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/sparc32/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -12,7 +12,7 @@ #include "mconfig.h" #ifdef BOOTSTRAP -#include <stdint.h> +#include <inttypes.h> #else typedef unsigned char uint8_t; typedef unsigned short uint16_t; Modified: trunk/openbios-devel/include/arch/sparc64/types.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/sparc64/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -12,7 +12,7 @@ #include "mconfig.h" #ifdef BOOTSTRAP -#include <stdint.h> +#include <inttypes.h> #else typedef unsigned char uint8_t; typedef unsigned short uint16_t; Modified: trunk/openbios-devel/include/arch/x86/types.h ============================================================================== --- trunk/openbios-devel/include/arch/x86/types.h Sat Feb 12 17:28:06 2011 (r1025) +++ trunk/openbios-devel/include/arch/x86/types.h Sun Feb 13 00:02:18 2011 (r1026) @@ -11,7 +11,7 @@ #ifndef __TYPES_H #define __TYPES_H -#include <stdint.h> +#include <inttypes.h> /* endianess */

1 0

[PATCH] sparc32: fix __context corruption in __switch_context_nosave
by Artyom Tarasenko 12 Feb '11

12 Feb '11

__switch_context_nosave shall not write to __context, only read it. Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> --- arch/sparc32/switch.S (revision 1024) +++ arch/sparc32/switch.S (working copy) @@ -79,11 +79,14 @@ set (PSR_PS | PSR_S | PSR_PIL | PSR_EF), %g2 wr %g2, 0x0, %psr #endif - + set __context, %g1 + swap [%g1], %fp + ba __set_context __switch_context_nosave: - set __context, %g1 + set __context, %g1 /* Swap ctx pointer with %fp */ - swap [%g1], %fp + ld [%g1], %fp +__set_context: /* Load all registers */ /* offset 0: %g0, no need to load */ ld [%fp + 4], %g1 --- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

2 8

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

12 Feb '11

Author: blueswirl Date: Sat Feb 12 17:28:06 2011 New Revision: 1025 URL: http://tracker.coreboot.org/trac/openbios/changeset/1025 Log: sparc32: fix __context corruption in __switch_context_nosave __switch_context_nosave shall not write to __context, only read it. Signed-off-by: Artyom Tarasenko <atar4qemu(a)gmail.com> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc32/switch.S Modified: trunk/openbios-devel/arch/sparc32/switch.S ============================================================================== --- trunk/openbios-devel/arch/sparc32/switch.S Tue Feb 8 23:06:59 2011 (r1024) +++ trunk/openbios-devel/arch/sparc32/switch.S Sat Feb 12 17:28:06 2011 (r1025) @@ -79,11 +79,15 @@ set (PSR_PS | PSR_S | PSR_PIL | PSR_EF), %g2 wr %g2, 0x0, %psr #endif - + set __context, %g1 + /* Swap ctx pointer with %fp and jump*/ + ba __set_context + swap [%g1], %fp __switch_context_nosave: - set __context, %g1 - /* Swap ctx pointer with %fp */ - swap [%g1], %fp + set __context, %g1 + /* load %fp from ctx pointer */ + ld [%g1], %fp +__set_context: /* Load all registers */ /* offset 0: %g0, no need to load */ ld [%fp + 4], %g1

1 0

sparc32 __context initialization
by Artyom Tarasenko 11 Feb '11

11 Feb '11

According to the IEEE-1275 SPARC supplement, the default load address is the virtual address 0x4000, so looks like we don't have to map the addresses 0x0 - 0x3fff. I thought it might be useful actually not to map at least the page 0, as it would help to catch null pointer dereferences. So, I went on and made a trivial modification: --- arch/sparc32/lib.c (revision 1024) +++ arch/sparc32/lib.c (working copy) @@ -461,7 +461,7 @@ map_pages(pa, va, size, ofmem_arch_default_translation_mode(pa)); // 1:1 mapping for RAM - map_pages(0, 0, LOWMEMSZ, ofmem_arch_default_translation_mode(0)); + map_pages(0x4000, 0x4000, LOWMEMSZ, ofmem_arch_default_translation_mode(0)); /* * Flush cache ___ Surprisingly, with this modification a null pointer dereference happens much earlier than I'd expected: for some reason __context doesn't get initialized in arch/sparc32/context.c, so OpenBIOS dies before saying hello. If I initialize it in start_main the same way it should have been initialized statically, start_main(void) { + __context = &main_ctx; then OpenBIOS starts and is able to boot at least Debian. Any idea what might be wrong with the current static initialization? For convenience I paste the code from arch/sparc32/context.c : static struct context main_ctx = { .regs[REG_SP] = (uint32_t) &_estack - 96, .pc = (uint32_t) start_main, .npc = (uint32_t) start_main + 4, .return_addr = (uint32_t) __exit_context, }; /* This is used by assembly routine to load/store the context which * it is to switch/switched. */ struct context *__context = &main_ctx; -- Regards, Artyom Tarasenko solaris/sparc under qemu blog: http://tyom.blogspot.com/

4 10

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

08 Feb '11

Author: mcayland Date: Tue Feb 8 23:06:59 2011 New Revision: 1024 URL: http://tracker.coreboot.org/trac/openbios/changeset/1024 Log: OFMEM: Fix bogus tail entry added to the end of the virtual memory available list. Since top_address is 64-bit, the existing code would incorrectly think that the end of virtual memory had not been reached and so add a bogus tail entry. Casting -1 to ucell should ensure that we pass the correct top address for virtual memory. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/libopenbios/ofmem_common.c Modified: trunk/openbios-devel/libopenbios/ofmem_common.c ============================================================================== --- trunk/openbios-devel/libopenbios/ofmem_common.c Tue Feb 8 23:06:56 2011 (r1023) +++ trunk/openbios-devel/libopenbios/ofmem_common.c Tue Feb 8 23:06:59 2011 (r1024) @@ -347,7 +347,7 @@ ofmem_update_memory_available(s_phandle_memory, ofmem->phys_range, &phys_range_prop, &phys_range_prop_size, &phys_range_prop_used, ofmem_arch_get_phys_top()); ofmem_update_memory_available(s_phandle_mmu, ofmem->virt_range, - &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, -1ULL); + &virt_range_prop, &virt_range_prop_size, &virt_range_prop_used, (ucell)-1); ofmem_update_mmu_translations(); }

1 0