Revised OFMEM patches in preparation for SPARC32 OFMEM patches v2
by Mark Cave-Ayland
Based upon feedback, I've revised this patchset and will resend it to
the list shortly.
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
9 years
- 1
- 0
[PATCH 1/5] Fix alignment of memory allocated by OFMEM's ofmem_malloc().
by Mark Cave-Ayland
A casual glance at the source code suggests that pointers returned by ofmem_malloc() are aligned, but in fact they are not
because sizeof(alloc_desc_t) is added to the final pointer return value. Create some additional padding after the previous value
of ofmem->next_malloc so we can store the alloc_desc_t underneath the final return pointer in memory, thus ensuring that the
final pointer is aligned correctly.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk>
---
openbios-devel/libopenbios/ofmem_common.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/openbios-devel/libopenbios/ofmem_common.c b/openbios-devel/libopenbios/ofmem_common.c
index 20a4cba..a4e199c 100644
--- a/openbios-devel/libopenbios/ofmem_common.c
+++ b/openbios-devel/libopenbios/ofmem_common.c
@@ -33,6 +33,11 @@ static inline size_t ALIGN_SIZE(size_t x, size_t a)
return (x + a - 1) & ~(a-1);
}
+static inline void * ALIGN_PTR(uintptr_t x, size_t a)
+{
+ return (void *)((x + a - 1) & ~(a-1));
+}
+
static ucell get_ram_size( void )
{
ofmem_t *ofmem = ofmem_arch_get_private();
@@ -102,29 +107,29 @@ void* ofmem_malloc( size_t size )
/* waste at most 4K by taking an entry from the freelist */
if( *pp && (**pp).size < size + 0x1000 ) {
- ret = (char*)*pp + sizeof(alloc_desc_t);
- memset( ret, 0, (**pp).size - sizeof(alloc_desc_t) );
+ ret = (char *)((uintptr_t)*pp + sizeof(alloc_desc_t));
+ memset( (char *)ret, 0, (**pp).size - sizeof(alloc_desc_t) );
*pp = (**pp).next;
- return ret;
+ return (void *)ret;
}
top = ofmem_arch_get_heap_top();
- if( pointer2cell(ofmem->next_malloc) + size > top ) {
+ ret = (char *)ALIGN_PTR((uintptr_t)ofmem->next_malloc + sizeof(alloc_desc_t), CONFIG_OFMEM_MALLOC_ALIGN);
+ if( pointer2cell((void *)ret) + size > top ) {
printk("out of malloc memory (%x)!\n", size );
return NULL;
}
- d = (alloc_desc_t*) ofmem->next_malloc;
+ d = (alloc_desc_t*)((uintptr_t)ret - sizeof(alloc_desc_t));
ofmem->next_malloc += size;
d->next = NULL;
d->size = size;
- ret = (char*)d + sizeof(alloc_desc_t);
- memset( ret, 0, size - sizeof(alloc_desc_t) );
+ memset( (char *)ret, 0, size - sizeof(alloc_desc_t) );
- return ret;
+ return (void *)ret;
}
void ofmem_free( void *ptr )
--
1.7.1
9 years
- 4
- 22
[PATCH 1/4] ppc: Prepare more assembler macros for ppc64 compatibility
by Andreas Färber
Adopt macro names from Linux.
Cc: Alexander Graf <agraf(a)suse.de>
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
---
include/arch/ppc/asmdefs.h | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/include/arch/ppc/asmdefs.h b/include/arch/ppc/asmdefs.h
index 05a89b2..e20e8ee 100644
--- a/include/arch/ppc/asmdefs.h
+++ b/include/arch/ppc/asmdefs.h
@@ -100,13 +100,21 @@
#endif
#ifdef __powerpc64__
+#define PPC_LL ld
+#define PPC_STL std
+#define PPC_STLU stdu
#define RFI rfid
#define MTMSRD(r) mtmsrd r
#define BRANCH_LABEL(name) . ## name
+#define PPC_LR_STKOFF 16
#else
+#define PPC_LL lwz
+#define PPC_STL stw
+#define PPC_STLU stwu
#define RFI rfi
#define MTMSRD(r) mtmsr r
#define BRANCH_LABEL(name) name
+#define PPC_LR_STKOFF 4
#endif
#ifndef __darwin__
--
1.7.3
9 years
- 2
- 15
[commit] r988 - trunk/openbios-devel/arch/ppc/qemu
by repository service
Author: afaerber
Date: Fri Dec 24 23:36:33 2010
New Revision: 988
URL: http://tracker.coreboot.org/trac/openbios/changeset/988
Log:
ppc64: Set up TOC pointer for of_client_interface()
Avoids 'unpredictable' memory accesses there.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
Modified:
trunk/openbios-devel/arch/ppc/qemu/start.S
Modified: trunk/openbios-devel/arch/ppc/qemu/start.S
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/start.S Fri Dec 24 23:33:34 2010 (r987)
+++ trunk/openbios-devel/arch/ppc/qemu/start.S Fri Dec 24 23:36:33 2010 (r988)
@@ -578,6 +578,10 @@
PPC_STL r30, (STKOFF + 31 * ULONG_SIZE)(r1)
PPC_STL r31, (STKOFF + 32 * ULONG_SIZE)(r1)
+#ifdef CONFIG_PPC64
+ LOAD_REG_IMMEDIATE(r2, of_client_interface)
+ ld r2, 8(r2)
+#endif
bl BRANCH_LABEL(of_client_interface)
/* restore r5 - r31 */
9 years
- 1
- 0
[commit] r987 - in trunk/openbios-devel: arch/ppc/qemu include/arch/ppc
by repository service
Author: afaerber
Date: Fri Dec 24 23:33:34 2010
New Revision: 987
URL: http://tracker.coreboot.org/trac/openbios/changeset/987
Log:
ppc: Adjust call_elf() and CIF prologues and epilogues for ppc64
Respect differing register widths and stack frame ABI differences.
Fix of_client_callback stack alignment for both ppc and ppc64.
v3:
* Introduced DATA_LONG() macro, suggested by Alex.
Cc: Alexander Graf <agraf(a)suse.de>
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/asmdefs.h
Modified: trunk/openbios-devel/arch/ppc/qemu/start.S
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/start.S Sun Dec 19 14:37:43 2010 (r986)
+++ trunk/openbios-devel/arch/ppc/qemu/start.S Fri Dec 24 23:33:34 2010 (r987)
@@ -179,6 +179,9 @@
#undef stl
#undef ll
+#define ULONG_SIZE 4
+#define STACKFRAME_MINSIZE 16
+
#else /* !CONFIG_PPC_64BITSUPPORT */
#ifdef __powerpc64__
@@ -471,16 +474,16 @@
*/
.data
saved_stack:
- .long 0
+ DATA_LONG(0)
.previous
/* void call_elf( arg1, arg2, entry ) */
_GLOBAL(call_elf):
mflr r0
- stwu r1,-16(r1)
- stw r0,20(r1)
+ PPC_STLU r1, -STACKFRAME_MINSIZE(r1)
+ PPC_STL r0, (STACKFRAME_MINSIZE + PPC_LR_STKOFF)(r1)
mtlr r5
LOAD_REG_IMMEDIATE(r8, saved_stack) // save our stack pointer
- stw r1,0(r8)
+ PPC_STL r1,0(r8)
mfsdr1 r1
addi r1, r1, -32768 /* - 32 KiB exception stack */
addis r1, r1, -1 /* - 64 KiB stack */
@@ -488,137 +491,147 @@
li r6,0 // r6 = address of client program arguments (unused)
li r7,0 // r7 = length of client program arguments (unused)
li r0,MSR_FP | MSR_ME | MSR_DR | MSR_IR
- mtmsr r0
+ MTMSRD(r0)
blrl
LOAD_REG_IMMEDIATE(r8, saved_stack) // restore stack pointer
mr r1,r8
- lwz r0,20(r1)
+ PPC_LL r0, (STACKFRAME_MINSIZE + PPC_LR_STKOFF)(r1)
mtlr r0
- addi r1,r1,16
+ addi r1, r1, STACKFRAME_MINSIZE
// XXX: should restore r12-r31 etc..
// we should not really come here though
blr
-#define SAVE_SPACE 140
+#ifdef __powerpc64__
+#define STKOFF STACKFRAME_MINSIZE
+#define SAVE_SPACE 320
+#else
+#define STKOFF 8
+#define SAVE_SPACE 144
+#endif
GLOBL(of_client_callback):
- stwu r1, -12(r1)
+#ifdef CONFIG_PPC64
+ PPC_STLU r1, -(STACKFRAME_MINSIZE + 16)(r1)
+#else
+ PPC_STLU r1, -STACKFRAME_MINSIZE(r1) /* fits within alignment */
+#endif
/* save r4 */
- stw r4, 8(r1)
+ PPC_STL r4, STKOFF(r1)
/* save lr */
mflr r4
- stw r4, 4(r1)
+ PPC_STL r4, PPC_LR_STKOFF(r1)
/* restore OF stack */
LOAD_REG_IMMEDIATE(r4, saved_stack)
- lwz r4,0(r4)
+ PPC_LL r4, 0(r4)
- stwu r4,-SAVE_SPACE(r4)
- stw r1,8(r4) // save caller stack
+ PPC_STLU r4,-SAVE_SPACE(r4)
+ PPC_STL r1,(STKOFF)(r4) // save caller stack
mr r1,r4
- stw r2,12(r1)
- stw r0,16(r1)
+ PPC_STL r2, (STKOFF + 1 * ULONG_SIZE)(r1)
+ PPC_STL r0, (STKOFF + 2 * ULONG_SIZE)(r1)
/* save ctr, cr and xer */
mfctr r2
- stw r2,20(r1)
+ PPC_STL r2, (STKOFF + 3 * ULONG_SIZE)(r1)
mfcr r2
- stw r2,24(r1)
+ PPC_STL r2, (STKOFF + 4 * ULONG_SIZE)(r1)
mfxer r2
- stw r2,28(r1)
+ PPC_STL r2, (STKOFF + 5 * ULONG_SIZE)(r1)
/* save r5 - r31 */
- stw r5, 32(r1)
- stw r6,36(r1)
- stw r7,40(r1)
- stw r8,44(r1)
- stw r9,48(r1)
- stw r10,52(r1)
- stw r11,56(r1)
- stw r12,60(r1)
- stw r13,64(r1)
- stw r14,68(r1)
- stw r15,72(r1)
- stw r16,76(r1)
- stw r17,80(r1)
- stw r18,84(r1)
- stw r19,88(r1)
- stw r20,92(r1)
- stw r21,96(r1)
- stw r22,100(r1)
- stw r23,104(r1)
- stw r24,108(r1)
- stw r25,112(r1)
- stw r26,116(r1)
- stw r27,120(r1)
- stw r28,124(r1)
- stw r29,128(r1)
- stw r30,132(r1)
- stw r31,136(r1)
+ PPC_STL r5, (STKOFF + 6 * ULONG_SIZE)(r1)
+ PPC_STL r6, (STKOFF + 7 * ULONG_SIZE)(r1)
+ PPC_STL r7, (STKOFF + 8 * ULONG_SIZE)(r1)
+ PPC_STL r8, (STKOFF + 9 * ULONG_SIZE)(r1)
+ PPC_STL r9, (STKOFF + 10 * ULONG_SIZE)(r1)
+ PPC_STL r10, (STKOFF + 11 * ULONG_SIZE)(r1)
+ PPC_STL r11, (STKOFF + 12 * ULONG_SIZE)(r1)
+ PPC_STL r12, (STKOFF + 13 * ULONG_SIZE)(r1)
+ PPC_STL r13, (STKOFF + 14 * ULONG_SIZE)(r1)
+ PPC_STL r14, (STKOFF + 15 * ULONG_SIZE)(r1)
+ PPC_STL r15, (STKOFF + 16 * ULONG_SIZE)(r1)
+ PPC_STL r16, (STKOFF + 17 * ULONG_SIZE)(r1)
+ PPC_STL r17, (STKOFF + 18 * ULONG_SIZE)(r1)
+ PPC_STL r18, (STKOFF + 19 * ULONG_SIZE)(r1)
+ PPC_STL r19, (STKOFF + 20 * ULONG_SIZE)(r1)
+ PPC_STL r20, (STKOFF + 21 * ULONG_SIZE)(r1)
+ PPC_STL r21, (STKOFF + 22 * ULONG_SIZE)(r1)
+ PPC_STL r22, (STKOFF + 23 * ULONG_SIZE)(r1)
+ PPC_STL r23, (STKOFF + 24 * ULONG_SIZE)(r1)
+ PPC_STL r24, (STKOFF + 25 * ULONG_SIZE)(r1)
+ PPC_STL r25, (STKOFF + 26 * ULONG_SIZE)(r1)
+ PPC_STL r26, (STKOFF + 27 * ULONG_SIZE)(r1)
+ PPC_STL r27, (STKOFF + 28 * ULONG_SIZE)(r1)
+ PPC_STL r28, (STKOFF + 29 * ULONG_SIZE)(r1)
+ PPC_STL r29, (STKOFF + 30 * ULONG_SIZE)(r1)
+ PPC_STL r30, (STKOFF + 31 * ULONG_SIZE)(r1)
+ PPC_STL r31, (STKOFF + 32 * ULONG_SIZE)(r1)
- bl of_client_interface
+ bl BRANCH_LABEL(of_client_interface)
/* restore r5 - r31 */
- lwz r5,32(r1)
- lwz r6,36(r1)
- lwz r7,40(r1)
- lwz r8,44(r1)
- lwz r9,48(r1)
- lwz r10,52(r1)
- lwz r11,56(r1)
- lwz r12,60(r1)
- lwz r13,64(r1)
- lwz r14,68(r1)
- lwz r15,72(r1)
- lwz r16,76(r1)
- lwz r17,80(r1)
- lwz r18,84(r1)
- lwz r19,88(r1)
- lwz r20,92(r1)
- lwz r21,96(r1)
- lwz r22,100(r1)
- lwz r23,104(r1)
- lwz r24,108(r1)
- lwz r25,112(r1)
- lwz r26,116(r1)
- lwz r27,120(r1)
- lwz r28,124(r1)
- lwz r29,128(r1)
- lwz r30,132(r1)
- lwz r31,136(r1)
+ PPC_LL r5, (STKOFF + 6 * ULONG_SIZE)(r1)
+ PPC_LL r6, (STKOFF + 7 * ULONG_SIZE)(r1)
+ PPC_LL r7, (STKOFF + 8 * ULONG_SIZE)(r1)
+ PPC_LL r8, (STKOFF + 9 * ULONG_SIZE)(r1)
+ PPC_LL r9, (STKOFF + 10 * ULONG_SIZE)(r1)
+ PPC_LL r10, (STKOFF + 11 * ULONG_SIZE)(r1)
+ PPC_LL r11, (STKOFF + 12 * ULONG_SIZE)(r1)
+ PPC_LL r12, (STKOFF + 13 * ULONG_SIZE)(r1)
+ PPC_LL r13, (STKOFF + 14 * ULONG_SIZE)(r1)
+ PPC_LL r14, (STKOFF + 15 * ULONG_SIZE)(r1)
+ PPC_LL r15, (STKOFF + 16 * ULONG_SIZE)(r1)
+ PPC_LL r16, (STKOFF + 17 * ULONG_SIZE)(r1)
+ PPC_LL r17, (STKOFF + 18 * ULONG_SIZE)(r1)
+ PPC_LL r18, (STKOFF + 19 * ULONG_SIZE)(r1)
+ PPC_LL r19, (STKOFF + 20 * ULONG_SIZE)(r1)
+ PPC_LL r20, (STKOFF + 21 * ULONG_SIZE)(r1)
+ PPC_LL r21, (STKOFF + 22 * ULONG_SIZE)(r1)
+ PPC_LL r22, (STKOFF + 23 * ULONG_SIZE)(r1)
+ PPC_LL r23, (STKOFF + 24 * ULONG_SIZE)(r1)
+ PPC_LL r24, (STKOFF + 25 * ULONG_SIZE)(r1)
+ PPC_LL r25, (STKOFF + 26 * ULONG_SIZE)(r1)
+ PPC_LL r26, (STKOFF + 27 * ULONG_SIZE)(r1)
+ PPC_LL r27, (STKOFF + 28 * ULONG_SIZE)(r1)
+ PPC_LL r28, (STKOFF + 29 * ULONG_SIZE)(r1)
+ PPC_LL r29, (STKOFF + 30 * ULONG_SIZE)(r1)
+ PPC_LL r30, (STKOFF + 31 * ULONG_SIZE)(r1)
+ PPC_LL r31, (STKOFF + 32 * ULONG_SIZE)(r1)
/* restore ctr, cr and xer */
- lwz r2,20(r1)
+ PPC_LL r2, (STKOFF + 3 * ULONG_SIZE)(r1)
mtctr r2
- lwz r2,24(r1)
+ PPC_LL r2, (STKOFF + 4 * ULONG_SIZE)(r1)
mtcr r2
- lwz r2,28(r1)
+ PPC_LL r2, (STKOFF + 5 * ULONG_SIZE)(r1)
mtxer r2
/* restore r0 and r2 */
- lwz r2,12(r1)
- lwz r0,16(r1)
+ PPC_LL r2, (STKOFF + 1 * ULONG_SIZE)(r1)
+ PPC_LL r0, (STKOFF + 2 * ULONG_SIZE)(r1)
/* restore caller stack */
- lwz r1,8(r1)
+ PPC_LL r1, (STKOFF)(r1)
- lwz r4, 4(r1)
+ PPC_LL r4, PPC_LR_STKOFF(r1)
mtlr r4
- lwz r4, 8(r1)
- lwz r1, 0(r1)
+ PPC_LL r4, STKOFF(r1)
+ PPC_LL r1, 0(r1)
blr
Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h
==============================================================================
--- trunk/openbios-devel/include/arch/ppc/asmdefs.h Sun Dec 19 14:37:43 2010 (r986)
+++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Fri Dec 24 23:33:34 2010 (r987)
@@ -105,6 +105,7 @@
#define PPC_STLU stdu
#define RFI rfid
#define MTMSRD(r) mtmsrd r
+#define DATA_LONG(x) .quad x
#define BRANCH_LABEL(name) . ## name
#define PPC_LR_STKOFF 16
#else
@@ -113,6 +114,7 @@
#define PPC_STLU stwu
#define RFI rfi
#define MTMSRD(r) mtmsr r
+#define DATA_LONG(x) .long x
#define BRANCH_LABEL(name) name
#define PPC_LR_STKOFF 4
#endif
9 years
- 1
- 0
Bug in ESP DMA implementation?
by Mark Cave-Ayland
Hi all,
Continuing more with my work on migrating SPARC32 to OFMEM, I've hit an
issue with the ESP driver which is causing me a bit of a problem.
At the moment, I have a hybrid old-mem/OFMEM SPARC32 setup where I am
migrating the various memory calls over to OFMEM one at a time.
Currently my implementation just uses OFMEM for allocating MMU page
tables, and with the default compile option of -Os looks like this:
Configuration device id QEMU version 1 machine id 32
Unhandled Exception 0x0000001f
PC = 0xffd12f08 NPC = 0xffd12f0c
Stopping execution
The interesting part is that this problem goes away if I compile with
any -O3 or -O0 or but shows when I compile with -O2, -O1 or -Os. So I
wonder if I've hit some kind of logic bug in OpenBIOS?
Looking at the SPARCv8 specification, exception 0x1f is equivalent to
IRQ15 and the offending code where the error occurs can be found in
drivers/esp.c:do_command():
esp->ll->regs[ESP_BUSID] = sd->id & 7;
// Set DMA address
esp->espdma.regs->st_addr = esp->buffer_dvma;
// Set DMA length
esp->ll->regs[ESP_TCLOW] = cmdlen & 0xff;
esp->ll->regs[ESP_TCMED] = (cmdlen >> 8) & 0xff;
// Set DMA direction and enable DMA
esp->espdma.regs->cond_reg = DMA_ENABLE;
/* Crash occurs somewhere in this section... */
// Set ATN, issue command
esp->ll->regs[ESP_CMD] = ESP_CMD_SELA | ESP_CMD_DMA;
// Wait for DMA to complete. Can this fail?
while ((esp->espdma.regs->cond_reg & DMA_HNDL_INTR) == 0)
/* End of crash section */;
// Check status
status = esp->ll->regs[ESP_STATUS];
// Clear interrupts to avoid guests seeing spurious interrupts
(void)esp->ll->regs[ESP_INTRPT];
I notice from the code above there is an explicit comment that mentions
clearing interrupts to prevent the guest from seeing them so I would
have thought that this wouldn't be an issue? I've checked the espdma
structures to ensure that they are marked volatile (or _volatile_) and
this appears to be the case - so I'm a little bit stumped. Can anyone
point me in the right direction or spot the mistake?
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
9 years
- 2
- 4
[RFC] libopenbios: Adapt CIF handling for ppc64
by Andreas Färber
On ppc64 neither long nor pointers can be used for the client interface.
Introduce new types prom_[u]arg_t to abstract this and add helpers
get_service() and arg2pointer() as well as format strings.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
---
libopenbios/client.c | 302 ++++++++++++++++++++++++++++----------------------
1 files changed, 170 insertions(+), 132 deletions(-)
diff --git a/libopenbios/client.c b/libopenbios/client.c
index d8a9fdf..d986226 100644
--- a/libopenbios/client.c
+++ b/libopenbios/client.c
@@ -30,13 +30,47 @@
* (it doesn't) or if the function is unimplemented.
*/
+#ifdef CONFIG_PPC64
+typedef int prom_arg_t;
+typedef unsigned int prom_uarg_t;
+#define PRIdARG "d"
+#define PRIxARG "x"
+#define FMT_arg "%" PRIdARG
+#define FMT_argx "%08" PRIxARG
+#else
+typedef long prom_arg_t;
+typedef unsigned long prom_uarg_t;
+#define PRIdARG "ld"
+#define PRIxARG "lx"
+#define FMT_arg "%" PRIdARG
+#define FMT_argx "%08" PRIxARG
+#endif
+
#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;
+#ifdef CONFIG_PPC64
+ prom_uarg_t service;
+#else
+ const char *service;
+#endif
+ prom_arg_t nargs;
+ prom_arg_t nret;
+ prom_uarg_t args[PROM_MAX_ARGS];
+} __attribute__((packed)) prom_args_t;
+
+static inline void* arg2pointer(prom_uarg_t value)
+{
+ return (void*)(uintptr_t)value;
+}
+
+static inline const char* get_service(prom_args_t *pb)
+{
+#ifdef CONFIG_PPC64
+ return arg2pointer(pb->service);
+#else
+ return pb->service;
+#endif
+}
#ifdef DEBUG_CIF
static void memdump(const char *mem, unsigned long size)
@@ -73,83 +107,84 @@ static void memdump(const char *mem, unsigned long size)
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\") = ", (char*)arg2pointer(pb->args[0]));
+ } else if (strcmp(service, "peer") == 0) {
+ printk("peer(0x" FMT_argx ") = ", pb->args[0]);
+ } else if (strcmp(service, "child") == 0) {
+ printk("child(0x" FMT_argx ") = ", pb->args[0]);
+ } else if (strcmp(service, "parent") == 0) {
+ printk("parent(0x" FMT_argx ") = ", pb->args[0]);
+ } else if (strcmp(service, "instance-to-package") == 0) {
+ printk("instance-to-package(0x" FMT_argx ") = ", pb->args[0]);
+ } else if (strcmp(service, "getproplen") == 0) {
+ printk("getproplen(0x" FMT_argx ", \"%s\") = ",
+ pb->args[0], (char*)arg2pointer(pb->args[1]));
+ } else if (strcmp(service, "getprop") == 0) {
+ printk("getprop(0x" FMT_argx ", \"%s\", 0x" FMT_argx ", " FMT_arg ") = ",
+ pb->args[0], (char*)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_argx ", \"%s\", 0x" FMT_argx ") = ",
+ pb->args[0], (char*)arg2pointer(pb->args[1]), pb->args[2]);
+ } else if (strcmp(service, "setprop") == 0) {
+ printk("setprop(0x" FMT_argx ", \"%s\", 0x" FMT_argx ", " FMT_arg ")\n",
+ pb->args[0], (char*)arg2pointer(pb->args[1]),
pb->args[2], pb->args[3]);
- memdump((char*)pb->args[2], pb->args[3]);
+ memdump((char*)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_argx ", " FMT_arg ")\n",
+ (char*)arg2pointer(pb->args[0]), pb->args[1], pb->args[2]);
+ } else if (strcmp(service, "finddevice") == 0) {
+ printk("finddevice(\"%s\") = ", (char*)arg2pointer(pb->args[0]));
+ } else if (strcmp(service, "instance-to-path") == 0) {
+ printk("instance-to-path(0x" FMT_argx ", 0x" FMT_argx ", " FMT_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_argx ", 0x" FMT_argx ", " FMT_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\") = ", (char*)arg2pointer(pb->args[0]));
+ } else if (strcmp(service, "close") == 0) {
+ printk("close(0x" FMT_argx ")\n", pb->args[0]);
+ } else if (strcmp(service, "read") == 0) {
#ifdef DUMP_IO
- printk("read(0x%08lx, 0x%08lx, %ld) = ",
+ printk("read(0x" FMT_argx ", 0x" FMT_argx ", " FMT_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_argx ", 0x" FMT_argx ", " FMT_arg ")\n",
pb->args[0], pb->args[1], pb->args[2]);
- memdump((char*)pb->args[1], pb->args[2]);
+ memdump((char*)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_argx ", 0x" FMT_argx ", 0x" FMT_argx ") = ",
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_argx ", " FMT_arg ", " FMT_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_argx ", " FMT_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", (char*)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_argx ", \"%s\") = ",
+ pb->args[0], (char*)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(" %" PRIxARG, pb->args[i]);
printk("\n");
}
}
@@ -157,71 +192,72 @@ static void dump_service(prom_args_t *pb)
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_arg "\n", pb->args[pb->nargs]);
+ } else if (strcmp(service, "peer") == 0) {
+ printk("0x" FMT_argx "\n", pb->args[pb->nargs]);
+ } else if (strcmp(service, "child") == 0) {
+ printk("0x" FMT_argx "\n", pb->args[pb->nargs]);
+ } else if (strcmp(service, "parent") == 0) {
+ printk("0x" FMT_argx "\n", pb->args[pb->nargs]);
+ } else if (strcmp(service, "instance-to-package") == 0) {
+ printk("0x" FMT_argx "\n", pb->args[pb->nargs]);
+ } else if (strcmp(service, "getproplen") == 0) {
+ printk("0x" FMT_argx "\n", pb->args[pb->nargs]);
+ } else if (strcmp(service, "getprop") == 0) {
+ printk(FMT_arg "\n", pb->args[pb->nargs]);
+ if ((prom_arg_t)pb->args[pb->nargs] != -1)
+ memdump((char*)arg2pointer(pb->args[2]), MIN(pb->args[3], pb->args[pb->nargs]));
+ } else if (strcmp(service, "nextprop") == 0) {
+ printk(FMT_arg "\n", pb->args[pb->nargs]);
+ memdump((char*)arg2pointer(pb->args[2]), pb->args[pb->nargs]);
+ } else if (strcmp(service, "setprop") == 0) {
+ printk(FMT_arg "\n", pb->args[pb->nargs]);
+ } else if (strcmp(service, "canon") == 0) {
+ printk(FMT_arg "\n", pb->args[pb->nargs]);
+ memdump((char*)arg2pointer(pb->args[1]), pb->args[pb->nargs]);
+ } else if (strcmp(service, "finddevice") == 0) {
+ printk("0x" FMT_argx "\n", pb->args[pb->nargs]);
+ } else if (strcmp(service, "instance-to-path") == 0) {
+ printk(FMT_arg "\n", pb->args[pb->nargs]);
+ memdump((char*)arg2pointer(pb->args[1]), pb->args[pb->nargs]);
+ } else if (strcmp(service, "package-to-path") == 0) {
+ printk(FMT_arg "\n", pb->args[pb->nargs]);
+ memdump((char*)arg2pointer(pb->args[1]), pb->args[pb->nargs]);
+ } else if (strcmp(service, "open") == 0) {
+ printk("0x" FMT_argx "\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_arg "\n", pb->args[pb->nargs]);
+ memdump((char*)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_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_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_argx "\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_argx "\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(" %" PRIxARG, pb->args[pb->nargs + i]);
}
printk("\n");
}
@@ -233,17 +269,18 @@ static int
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_arg "] -- [" FMT_arg "])\n", get_service(pb),
+ (char *)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 +297,18 @@ handle_calls( prom_args_t *pb )
}
#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_arg "--" FMT_arg ") got %d\n",
+ get_service(pb), (char*)arg2pointer(pb->args[0]),
+ pb->nargs - 2, pb->nret, i);
+ }
+
+ printk("handle_calls return:");
+ for (i = 0; i < pb->nret; i++) {
+ printk(" %" PRIxARG, pb->args[pb->nargs + i]);
+ }
+ printk("\n");
#endif
dstackcnt = dstacksave;
@@ -292,21 +330,21 @@ of_client_interface( int *params )
#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_arg "] -- [" FMT_arg "])\n",
+ get_service(pb), pb->nargs, pb->nret );
#ifdef DEBUG_CIF
else
printk("ERROR!\n");
@@ -320,7 +358,7 @@ of_client_interface( int *params )
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.7.3
9 years
- 3
- 6
[commit] r986 - trunk/openbios-devel/include/arch/ppc
by repository service
Author: afaerber
Date: Sun Dec 19 14:37:43 2010
New Revision: 986
URL: http://tracker.coreboot.org/trac/openbios/changeset/986
Log:
ppc: Prepare more assembler macros for ppc64 compatibility
Adopt macro names from Linux.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
Acked-by: Alexander Graf <agraf(a)suse.de>
Modified:
trunk/openbios-devel/include/arch/ppc/asmdefs.h
Modified: trunk/openbios-devel/include/arch/ppc/asmdefs.h
==============================================================================
--- trunk/openbios-devel/include/arch/ppc/asmdefs.h Fri Dec 17 15:25:14 2010 (r985)
+++ trunk/openbios-devel/include/arch/ppc/asmdefs.h Sun Dec 19 14:37:43 2010 (r986)
@@ -100,13 +100,21 @@
#endif
#ifdef __powerpc64__
+#define PPC_LL ld
+#define PPC_STL std
+#define PPC_STLU stdu
#define RFI rfid
#define MTMSRD(r) mtmsrd r
#define BRANCH_LABEL(name) . ## name
+#define PPC_LR_STKOFF 16
#else
+#define PPC_LL lwz
+#define PPC_STL stw
+#define PPC_STLU stwu
#define RFI rfi
#define MTMSRD(r) mtmsr r
#define BRANCH_LABEL(name) name
+#define PPC_LR_STKOFF 4
#endif
#ifndef __darwin__
9 years
- 1
- 0
[RFT] ppc64 OpenBIOS
by Andreas Färber
Hello,
Except for some fs/iso9660/ issues, ppc64 guests are booting for me
with the last five OpenBIOS patches posted.
You can find them together with the config change to use fs/grubfs/
here:
git://repo.or.cz/openbios/afaerber.git ppc64-boot
Please test your favorite ppc64 kernels and images with obj-ppc64/
openbios-qemu.elf!
If I don't hear of regressions, I'll commit those patches. Once that
is done and the iso9660 issues hopefully fixed, I would ask for Blue
to commit openbios-ppc and openbios-ppc64 blobs to QEMU. I'll then
prepare a QEMU patch to switch the default qemu-system-ppc64
ppc_newworld.c BIOS from openbios-ppc to openbios-ppc64.
Thanks,
Andreas
9 years, 1 month
- 2
- 3
[PATCH] ppc: unexpected_excep() needs an absolute branch
by Andreas Färber
When called from address 0x700, trap_error must not use a relative branch
to unexpected_excep() since that is beyond __vectors_end.
Signed-off-by: Andreas Färber <andreas.faerber(a)web.de>
---
arch/ppc/qemu/start.S | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S
index b227ef2..4b25650 100644
--- a/arch/ppc/qemu/start.S
+++ b/arch/ppc/qemu/start.S
@@ -288,7 +288,9 @@ exception_return:
_GLOBAL(__divide_error):
trap_error:
mflr r3
- b BRANCH_LABEL(unexpected_excep)
+ LOAD_REG_FUNC(r4, unexpected_excep)
+ mtctr r4
+ bctr
VECTOR( 0x100, "SRE" ):
b _entry
--
1.7.3
9 years, 1 month
- 1
- 1