OpenBIOS November 2008

openbios@openbios.org

13 participants
62 discussions

Support for Acer Aspire 3680?
by Daniel Levine 29 Nov '08

29 Nov '08

Are Acer Aspire series laptops such as the 3680 currently supported by OpenBIOS? As the 3680's BIOS is limited in functionality and very buggy, I'm looking for alternatives to it, and Coreboot, which appears largely Linux-centric, isn't looking so great. (I'm trying to get FreeBSD running on the laptop, and being hampered by the buggy BIOS.) As for the laptop's hardware: - Northbridge is Intel 945GM. Is this supported? - Southbridge is Intel ICH7. This I'm more concerned about, as Coreboot support for it seems to be still in development. Is this supported by OpenBIOS, or should I be looking at Coreboot snapshots instead? Thanks, and apologies if I've got the wrong mailing list - this looked as good a place as any to ask end-user questions about OpenBIOS.

3 2

r268 - openbios-devel/kernel
by svn＠openbios.org 28 Nov '08

28 Nov '08

Author: blueswirl Date: 2008-11-28 21:28:23 +0100 (Fri, 28 Nov 2008) New Revision: 268 Modified: openbios-devel/kernel/forth.c Log: Delete unnecessary definition Modified: openbios-devel/kernel/forth.c =================================================================== --- openbios-devel/kernel/forth.c 2008-11-28 20:21:46 UTC (rev 267) +++ openbios-devel/kernel/forth.c 2008-11-28 20:28:23 UTC (rev 268) @@ -6,8 +6,6 @@ * the copyright and warranty status of this work. */ -extern uint32_t isa_io_base; - /* * dup ( x -- x x ) */

1 0

r267 - openbios-devel/drivers
by svn＠openbios.org 28 Nov '08

28 Nov '08

Author: blueswirl Date: 2008-11-28 21:21:46 +0100 (Fri, 28 Nov 2008) New Revision: 267 Modified: openbios-devel/drivers/pci.c Log: Fix PPC compilation Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-11-28 19:40:28 UTC (rev 266) +++ openbios-devel/drivers/pci.c 2008-11-28 20:21:46 UTC (rev 267) @@ -21,6 +21,7 @@ #include "openbios/drivers.h" #include "timer.h" +#include "openbios/pci.h" #include "pci.h" #define set_bool_property(ph, name) set_property(ph, name, NULL, 0);

1 0

r266 - in openbios-devel: arch/ppc include/ppc
by svn＠openbios.org 28 Nov '08

28 Nov '08

Author: blueswirl Date: 2008-11-28 20:40:28 +0100 (Fri, 28 Nov 2008) New Revision: 266 Modified: openbios-devel/arch/ppc/build.xml openbios-devel/arch/ppc/misc.S openbios-devel/arch/ppc/start.S openbios-devel/arch/ppc/timebase.S openbios-devel/include/ppc/asmdefs.h Log: Eliminate M4 macros Modified: openbios-devel/arch/ppc/build.xml =================================================================== --- openbios-devel/arch/ppc/build.xml 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/arch/ppc/build.xml 2008-11-28 19:40:28 UTC (rev 266) @@ -102,9 +102,7 @@ <library name="briq" target="target" type="static" condition="BRIQ"> <object source="misc.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> <object source="briq/briq.c" flags="-Iarch/ppc"/> @@ -119,9 +117,7 @@ <library name="pearpc" target="target" type="static" condition="PEARPC"> <object source="misc.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> <object source="pearpc/pearpc.c" flags="-Iarch/ppc"/> @@ -138,9 +134,7 @@ <library name="qemu" target="target" type="static" condition="QEMU"> <object source="misc.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> <object source="qemu/qemu.c" flags="-Iarch/ppc"/> @@ -157,9 +151,7 @@ <library name="mol" target="target" type="static" condition="MOL"> <object source="misc.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="ofmem.c"/> <object source="mol/init.c" flags="-Iarch/ppc"/> @@ -184,15 +176,11 @@ </rule> <object source="start.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="timebase.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <external-object source="libbriq.a"/> <external-object source="libbootstrap.a"/> @@ -212,15 +200,11 @@ </rule> <object source="start.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="timebase.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <external-object source="libpearpc.a"/> <external-object source="libbootstrap.a"/> @@ -239,15 +223,11 @@ </rule> <object source="start.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <object source="timebase.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <external-object source="libqemu.a"/> <external-object source="libbootstrap.a"/> @@ -270,9 +250,7 @@ </rule> <object source="start.S"> <rule><![CDATA[ - $(CPP) -D__ASSEMBLY__ $(INCLUDES) $< | $(M4) -s $(M4_NO_GNU) | tr ';' '\n' > $@.s - $(AS) $@.s $(AS_FLAGS) -o $@ - ]]></rule> + $(CC) $$EXTRACFLAGS $(AS_FLAGS) $(CFLAGS) $(INCLUDES) -c -o $@ $^]]></rule> </object> <external-object source="libmol.a"/> <external-object source="libbootstrap.a"/> Modified: openbios-devel/arch/ppc/misc.S =================================================================== --- openbios-devel/arch/ppc/misc.S 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/arch/ppc/misc.S 2008-11-28 19:40:28 UTC (rev 266) @@ -20,7 +20,6 @@ * */ -changequote([[[[[,]]]]]) [[[[[ /* shield includes from m4-expansion */ #include "asm/asmdefs.h" #include "asm/processor.h" Modified: openbios-devel/arch/ppc/start.S =================================================================== --- openbios-devel/arch/ppc/start.S 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/arch/ppc/start.S 2008-11-28 19:40:28 UTC (rev 266) @@ -14,7 +14,6 @@ * */ -changequote([[[[[,]]]]]) [[[[[ /* shield includes from m4-expansion */ #include "asm/asmdefs.h" #include "asm/processor.h" #include "osi.h" @@ -26,40 +25,39 @@ #define ILLEGAL_VECTOR( v ) .org __vectors + v ; bl trap_error ; #define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v -MACRO(EXCEPTION_PREAMBLE, [ - mtsprg1 r1 // scratch - mfsprg0 r1 // exception stack in sprg0 - addi r1,r1,-80 // push exception frame +#define EXCEPTION_PREAMBLE \ + mtsprg1 r1 ; /* scratch */ \ + mfsprg0 r1 ; /* exception stack in sprg0 */ \ + addi r1,r1,-80 ; /* push exception frame */ \ + \ + stw r0,0(r1) ; /* save r0 */ \ + mfsprg1 r0 ; \ + stw r0,4(r1) ; /* save r1 */ \ + stw r2,8(r1) ; /* save r2 */ \ + stw r3,12(r1) ; /* save r3 */ \ + stw r4,16(r1) ; \ + stw r5,20(r1) ; \ + stw r6,24(r1) ; \ + stw r7,28(r1) ; \ + stw r8,32(r1) ; \ + stw r9,36(r1) ; \ + stw r10,40(r1) ; \ + stw r11,44(r1) ; \ + stw r12,48(r1) ; \ + \ + mflr r0 ; \ + stw r0,52(r1) ; \ + mfcr r0 ; \ + stw r0,56(r1) ; \ + mfctr r0 ; \ + stw r0,60(r1) ; \ + mfxer r0 ; \ + stw r0,64(r1) ; \ + \ + /* 76(r1) unused */ \ + addi r1,r1,-16 ; /* call conventions uses 0(r1) and 4(r1)... */ - stw r0,0(r1) // save r0 - mfsprg1 r0 - stw r0,4(r1) // save r1 - stw r2,8(r1) // save r2 - stw r3,12(r1) // save r3 - stw r4,16(r1) - stw r5,20(r1) - stw r6,24(r1) - stw r7,28(r1) - stw r8,32(r1) - stw r9,36(r1) - stw r10,40(r1) - stw r11,44(r1) - stw r12,48(r1) - mflr r0 - stw r0,52(r1) - mfcr r0 - stw r0,56(r1) - mfctr r0 - stw r0,60(r1) - mfxer r0 - stw r0,64(r1) - - // 76(r1) unused - addi r1,r1,-16 // call conventions uses 0(r1) and 4(r1)... -]) - - /************************************************************************/ /* stack space */ /************************************************************************/ @@ -86,12 +84,15 @@ li r0,0 mtmsr r0 - LOADI r1,estack + lis r1,HA(estack) + addi r1,r1,LO(estack) mtsprg0 r1 // setup exception stack - LOADI r1,stack + lis r1,HA(stack) + addi r1,r1,LO(stack) // copy exception vectors - LOADI r3,__vectors + lis r3,HA(__vectors) + addi r3,r3,LO(__vectors) li r4,0 li r5,__vectors_end - __vectors + 16 rlwinm r5,r5,0,0,28 @@ -136,17 +137,21 @@ stwu r1,-16(r1) stw r0,20(r1) mtlr r3 - LOADI r8,saved_stack // save our stack pointer + lis r8,HA(saved_stack) + addi r8,r8,LO(saved_stack) // save our stack pointer stw r1,0(r8) - LOADI r1,client_stack - LOADI r5,of_client_callback // r5 = callback + lis r1,HA(client_stack) + addi r1,r1,LO(client_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) li r7,0 // r7 = length of client program arguments (unused) li r0,MSR_FP | MSR_ME | MSR_DR | MSR_IR mtmsr r0 blrl - LOADI r8,saved_stack // restore stack pointer + lis r8,HA(saved_stack) + addi r8,r8,LO(saved_stack) // restore stack pointer mr r1,r8 lwz r0,20(r1) mtlr r0 @@ -156,7 +161,8 @@ blr GLOBL(of_client_callback): - LOADI r4,saved_stack + lis r4,HA(saved_stack) + addi r4,r4,LO(saved_stack) lwz r4,0(r4) stwu r4,-32(r4) mflr r5 @@ -191,8 +197,10 @@ /* r3 = argument buffer, r4 = of_rtas_start */ /* according to the CHRP standard, cr must be preserved (cr0/cr1 too?) */ mr r6,r3 - LOADI r3,OSI_SC_MAGIC_R3 - LOADI r4,OSI_SC_MAGIC_R4 + lis r3,HA(OSI_SC_MAGIC_R3) + addi r3,r3,LO(OSI_SC_MAGIC_R3) + lis r4,HA(OSI_SC_MAGIC_R4) + addi r4,r4,LO(OSI_SC_MAGIC_R4) li r5,OSI_OF_RTAS sc blr @@ -203,7 +211,8 @@ GLOBL(nw_dec_calibration): .long 0 GLOBL(timer_calib_start): - LOADI r3,nw_dec_calibration + lis r3,HA(nw_dec_calibration) + addi r3,r3,LO(nw_dec_calibration) lwz r3,0(r3) blr GLOBL(timer_calib_end): @@ -254,14 +263,16 @@ VECTOR( 0x300, "DSI" ): EXCEPTION_PREAMBLE - LOADI r3,dsi_exception + lis r3,HA(dsi_exception) + addi r3,r3,LO(dsi_exception) mtctr r3 bctrl b exception_return VECTOR( 0x400, "ISI" ): EXCEPTION_PREAMBLE - LOADI r3,isi_exception + lis r3,HA(isi_exception) + addi r3,r3,LO(isi_exception) mtctr r3 bctrl b exception_return Modified: openbios-devel/arch/ppc/timebase.S =================================================================== --- openbios-devel/arch/ppc/timebase.S 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/arch/ppc/timebase.S 2008-11-28 19:40:28 UTC (rev 266) @@ -1,4 +1,3 @@ -changequote([[[[[,]]]]]) [[[[[ /* shield includes from m4-expansion */ #include "asm/asmdefs.h" #include "asm/processor.h" Modified: openbios-devel/include/ppc/asmdefs.h =================================================================== --- openbios-devel/include/ppc/asmdefs.h 2008-11-25 19:54:01 UTC (rev 265) +++ openbios-devel/include/ppc/asmdefs.h 2008-11-28 19:40:28 UTC (rev 266) @@ -18,13 +18,6 @@ #ifndef _H_ASMDEFS #define _H_ASMDEFS -#include "openbios/asm.m4" - -#ifndef __ASSEMBLY__ -#error This file is only to be included from assembler code! -#endif - - /************************************************************************/ /* High/low halfword compatibility macros */ /************************************************************************/ @@ -38,325 +31,51 @@ #define HI(v) hi16(v) #define LO(v) lo16(v) - -/************************************************************************/ -/* Register name prefix */ -/************************************************************************/ +/* from Linux: include/asm-powerpc/ppc_asm.h */ +/* + * Copyright (C) 1995-1999 Gary Thomas, Paul Mackerras, Cort Dougan. + */ -#ifdef __linux__ -define([rPREFIX], []) -define([fPREFIX], []) -define([srPREFIX], []) -#else -define([rPREFIX], [r]) -define([fPREFIX], [f]) -define([srPREFIX], [sr]) -/* frN -> fN */ -mFORLOOP([i],0,31,[define(fr[]i,f[]i)]) -#endif +/* General Purpose Registers (GPRs) */ -/************************************************************************/ -/* Macros and definitions */ -/************************************************************************/ +#define r0 0 +#define r1 1 +#define r2 2 +#define r3 3 +#define r4 4 +#define r5 5 +#define r6 6 +#define r7 7 +#define r8 8 +#define r9 9 +#define r10 10 +#define r11 11 +#define r12 12 +#define r13 13 +#define r14 14 +#define r15 15 +#define r16 16 +#define r17 17 +#define r18 18 +#define r19 19 +#define r20 20 +#define r21 21 +#define r22 22 +#define r23 23 +#define r24 24 +#define r25 25 +#define r26 26 +#define r27 27 +#define r28 28 +#define r29 29 +#define r30 30 +#define r31 31 -#ifdef __darwin__ -#define balign_4 .align 2,0 -#define balign_8 .align 3,0 -#define balign_16 .align 4,0 -#define balign_32 .align 5,0 -#endif - -#ifdef __linux__ -#define balign_4 .balign 4,0 -#define balign_8 .balign 8,0 -#define balign_16 .balign 16,0 -#define balign_32 .balign 32,0 -#endif - -MACRO(LOADVAR, [dreg, variable], [ - lis _dreg,HA(_variable) - lwz _dreg,LO(_variable)(_dreg) -]) - -MACRO(LOADI, [dreg, addr], [ - lis _dreg,HA(_addr) - addi _dreg,_dreg,LO(_addr) -]) - -MACRO(LOAD_GPR_RANGE, [start, endx, offs, base], [ - mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _endx) - lwz rPREFIX[]i,_offs+i[]*4(_base) - .endif -])]) - -MACRO(STORE_GPR_RANGE, [start, endx, offs, base], [ - mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _endx) - stw rPREFIX[]i,_offs+i[]*4(_base) - .endif -])]) - -MACRO(LOAD_FPR_RANGE, [start, endx, offs, base], [ - mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _endx) - lfd fPREFIX[]i,_offs+i[]*8(_base) - .endif -])]) - -MACRO(STORE_FPR_RANGE, [start, endx, offs, base], [ - mFORLOOP([i],0,31,[ .if (i >= _start) & (i <= _endx) - stfd fPREFIX[]i,_offs+i[]*8(_base) - .endif -])]) - /************************************************************************/ -/* FPU load/save macros */ -/************************************************************************/ - - // The FPU macros are used both in the kernel and in - // mainloop_asm.h. - -MACRO(xFPR_LOAD_RANGE, [from, to, mbase], [ - LOAD_FPR_RANGE _from,_to,xFPR_BASE,_mbase -]) -MACRO(xFPR_SAVE_RANGE, [from, to, mbase], [ - STORE_FPR_RANGE _from,_to,xFPR_BASE,_mbase -]) - // The low half of the fpu is fr0-fr12. I.e. the FPU registers - // that might be overwritten when a function call is taken - // (fr13 and fpscr are treated specially). - -MACRO(xLOAD_LOW_FPU, [mbase], [ - xFPR_LOAD_RANGE 0,12,_mbase -]) - -MACRO(xLOAD_TOPHALF_FPU, [mbase], [ - xFPR_LOAD_RANGE 14,31,_mbase -]) -MACRO(xLOAD_FULL_FPU, [mbase], [ - xLOAD_LOW_FPU _mbase - xLOAD_TOPHALF_FPU _mbase -]) - -MACRO(xSAVE_LOW_FPU, [mbase], [ - xFPR_SAVE_RANGE 0,12,_mbase -]) -MACRO(xSAVE_TOPHALF_FPU, [mbase], [ - xFPR_SAVE_RANGE 14,31,_mbase -]) -MACRO(xSAVE_FULL_FPU, [mbase], [ - xSAVE_LOW_FPU _mbase - xSAVE_TOPHALF_FPU _mbase -]) - - -/************************************************************************/ -/* GPR load/save macros */ -/************************************************************************/ - -MACRO(xGPR_SAVE_RANGE, [from, to, mbase], [ - STORE_GPR_RANGE _from, _to, xGPR0, _mbase -]) - -MACRO(xGPR_LOAD_RANGE, [from, to, mbase], [ - LOAD_GPR_RANGE _from, _to, xGPR0, _mbase -]) - - -/************************************************************************/ -/* AltiVec */ -/************************************************************************/ - -#ifdef __linux__ - -define(vPREFIX,[]) - -#ifndef HAVE_ALTIVEC -#define VEC_OPCODE( op1,op2,A,B,C ) \ - .long (((op1) << (32-6)) | (op2) | ((A) << (32-11)) | ((B) << (32-16)) | ((C) << (32-21))) ; - -#define __stvx( vS,rA,rB ) VEC_OPCODE( 31,0x1ce,vS,rA,rB ) -#define __lvx( vD,rA,rB ) VEC_OPCODE( 31,0xce, vD,rA,rB ) -#define __mfvscr( vD ) VEC_OPCODE( 4,1540,vD,0,0 ) -#define __mtvscr( vB ) VEC_OPCODE( 4,1604,0,0,vB ) -#define __stvewx( vS,rA,rB ) VEC_OPCODE( 31,(199<<1), vS,rA,rB ) - -mFORLOOP([i],0,31,[define(v[]i,[]i)]) -MACRO(stvx, [vS,rA,rB], [ __stvx( _vS,_rA,_rB ) ; ]) -MACRO(lvx, [vD,rA,rB], [ __lvx( _vD,_rA,_rB ) ; ]) -MACRO(mfvscr, [vD], [ __mfvscr( _vD ) ; ]) -MACRO(mtvscr, [vB], [ __mtvscr( _vB ) ; ]) -MACRO(stvewx, [vS,rA,rB], [ __stvewx( _vS,_rA,_rB ) ; ]) -#endif -#else /* __linux__ */ - -define(vPREFIX,[v]) - -#endif /* __linux__ */ - - -// NOTE: Writing to VSCR won't cause exceptions (this -// is different compared to FPSCR). - -MACRO(xVEC_SAVE, [mbase, scr], [ - addi _scr,_mbase,xVEC_BASE - mFORLOOP([i],0,31,[ - stvx vPREFIX[]i,0,_scr - addi _scr,_scr,16 - ]) - addi _scr,_mbase,xVSCR-12 - mfvscr v0 - stvx v0,0,_scr - addi _scr,_mbase,xVEC0 - lvx v0,0,_scr - mfspr _scr,S_VRSAVE - stw _scr,xVRSAVE(_mbase) -]) - -MACRO(xVEC_LOAD, [mbase, scr], [ - addi _scr,_mbase,xVSCR-12 - lvx v0,0,_scr - mtvscr v0 - addi _scr,_mbase,xVEC_BASE - mFORLOOP([i],0,31,[ - lvx vPREFIX[]i,0,_scr - addi _scr,_scr,16 - ]) - lwz _scr,xVRSAVE(_mbase) - mtspr S_VRSAVE,_scr -]) - -/************************************************************************/ -/* Instructions */ -/************************************************************************/ - -#ifdef __darwin__ -MACRO(mtsprg0, [reg], [mtspr SPRG0,_reg] ) -MACRO(mtsprg1, [reg], [mtspr SPRG1,_reg] ) -MACRO(mtsprg2, [reg], [mtspr SPRG2,_reg] ) -MACRO(mtsprg3, [reg], [mtspr SPRG3,_reg] ) -MACRO(mfsprg0, [reg], [mfspr _reg,SPRG0] ) -MACRO(mfsprg1, [reg], [mfspr _reg,SPRG1] ) -MACRO(mfsprg2, [reg], [mfspr _reg,SPRG2] ) -MACRO(mfsprg3, [reg], [mfspr _reg,SPRG3] ) -#endif - -/************************************************************************/ -/* Register names */ -/************************************************************************/ - -#ifdef __darwin__ -/* These symbols are not defined under Darwin */ -#define cr0 0 -#define cr1 1 -#define cr2 2 -#define cr3 3 -#define cr4 4 -#define cr5 5 -#define cr6 6 -#define cr7 7 -#define cr8 8 -#define lt 0 /* Less than */ -#define gt 1 /* Greater than */ -#define eq 2 /* Equal */ -#define so 3 /* Summary Overflow */ -#define un 3 /* Unordered (after floating point) */ -#endif - -/* FPU register names (to be used as macro arguments) */ -#define FR0 0 -#define FR1 1 -#define FR2 2 -#define FR3 3 -#define FR4 4 -#define FR5 5 -#define FR6 6 -#define FR7 7 -#define FR8 8 -#define FR9 9 -#define FR10 10 -#define FR11 11 -#define FR12 12 -#define FR13 13 -#define FR14 14 -#define FR15 15 -#define FR16 16 -#define FR17 17 -#define FR18 18 -#define FR19 19 -#define FR20 20 -#define FR21 21 -#define FR22 22 -#define FR23 23 -#define FR24 24 -#define FR25 25 -#define FR26 26 -#define FR27 27 -#define FR28 28 -#define FR29 29 -#define FR30 30 -#define FR31 31 - -/* GPR register names (to be used as macro arguments) */ -#define R0 0 -#define R1 1 -#define R2 2 -#define R3 3 -#define R4 4 -#define R5 5 -#define R6 6 -#define R7 7 -#define R8 8 -#define R9 9 -#define R10 10 -#define R11 11 -#define R12 12 -#define R13 13 -#define R14 14 -#define R15 15 -#define R16 16 -#define R17 17 -#define R18 18 -#define R19 19 -#define R20 20 -#define R21 21 -#define R22 22 -#define R23 23 -#define R24 24 -#define R25 25 -#define R26 26 -#define R27 27 -#define R28 28 -#define R29 29 -#define R30 30 -#define R31 31 - -#ifndef __darwin__ - -/* GPR register names, rN -> N, frN -> N, vN -> N */ -mFORLOOP([i],0,31,[define(r[]i,[]i)]) -mFORLOOP([i],0,31,[define(fr[]i,[]i)]) -mFORLOOP([i],0,31,[define(v[]i,[]i)]) - -#endif /* __darwin__ */ - - -/************************************************************************/ -/* useful macros */ -/************************************************************************/ - -MACRO(ori_, [reg1, reg2, value], [ - .if (_value & 0xffff) - ori _reg1, _reg2, (_value) & 0xffff - .endif - .if (_value & ~0xffff) - oris _reg1, _reg2, (_value) >> 16 - .endif -]) - -/************************************************************************/ /* MISC */ /************************************************************************/ -#ifdef __linux__ +#ifndef __darwin__ #define GLOBL( name ) .globl name ; name #define EXTERN( name ) name #else

1 0

Re: [OpenBIOS] r255 - in openbios-devel: arch/ppc/qemu include/openbios modules
by Blue Swirl 25 Nov '08

25 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:21:36 +0100 (Mon, 24 Nov 2008) > New Revision: 255 > void > -nvram_init( void ) > +nvram_init( char *path ) Bad idea, this breaks Sparc32 build. arch/sparc32/openbios.c: In function 'arch_init': arch/sparc32/openbios.c:121: error: too few arguments to function 'nvram_init' make[1]: *** [obj-sparc32/target/arch/sparc32/openbios.o] Error 1

4 4

[PATCH][macparts] Allow to open partition 0
by Laurent Vivier 25 Nov '08

25 Nov '08

Yaboot needs to be able to open partition 0. Add some traces. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info>

2 1

r265 - in openbios-devel: config/examples modules
by svn＠openbios.org 25 Nov '08

25 Nov '08

Author: blueswirl Date: 2008-11-25 20:54:01 +0100 (Tue, 25 Nov 2008) New Revision: 265 Modified: openbios-devel/config/examples/cross-ppc_config.xml openbios-devel/modules/mac-parts.c Log: Yaboot needs to be able to open partition 0. Add some traces. Signed-off-by: Laurent Vivier <Laurent(a)lvivier.info> Modified: openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_config.xml 2008-11-25 19:50:53 UTC (rev 264) +++ openbios-devel/config/examples/cross-ppc_config.xml 2008-11-25 19:54:01 UTC (rev 265) @@ -38,6 +38,8 @@  <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_FS" type="boolean" value="true"/> <option name="CONFIG_HFS" type="boolean" value="false"/> Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2008-11-25 19:50:53 UTC (rev 264) +++ openbios-devel/modules/mac-parts.c 2008-11-25 19:54:01 UTC (rev 265) @@ -19,6 +19,13 @@ #include "mac-parts.h" #include "modules.h" +#ifdef CONFIG_DEBUG_MAC_PARTS +#define DPRINTF(fmt, args...) \ +do { printk("MAC-PARTS: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do {} while(0) +#endif + typedef struct { ullong offs; ullong size; @@ -41,8 +48,6 @@ desc_map_t dmap; part_entry_t par; - /* printk("macparts_open '%s'\n", str ); */ - if( str ) { parnum = atol(str); if( !strlen(str) ) @@ -52,6 +57,7 @@ if( parnum < 0 ) parnum = 1; + DPRINTF("macparts_open %d\n", parnum); SEEK( 0 ); if( READ(&dmap, sizeof(dmap)) != sizeof(dmap) ) RET(0); @@ -66,6 +72,12 @@ if( par.pmSig == 0x504d /* 'PM' */ ) bs = 512; } + if (parnum == 0) { + di->offs = (llong)0; + di->size = (llong)dmap.sbBlkCount * bs; + PUSH( -1 ); + return; + } SEEK( bs ); if( READ(&par, sizeof(par)) != sizeof(par) ) RET(0); @@ -89,7 +101,8 @@ macparts_probe( macparts_info_t *dummy ) { 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 ) RET(0); RET(-1); @@ -102,6 +115,7 @@ PUSH( -1 ); /* no type */ DPUSH( di->offs ); DPUSH( di->size ); + DPRINTF("macparts_get_info %lld %lld\n", di->offs, di->size); } static void

1 0

Re: [OpenBIOS] r255 - in openbios-devel: arch/ppc/qemu include/openbios modules
by Blue Swirl 25 Nov '08

25 Nov '08

On 11/25/08, Blue Swirl <blauwirbel(a)gmail.com> wrote: > On 11/25/08, Laurent Vivier <laurent(a)lvivier.info> wrote: > > > > Le 25 nov. 08 à 17:40, Blue Swirl a écrit : > > > > > > > > > On 11/25/08, Laurent Vivier <Laurent.Vivier(a)bull.net> wrote: > > > > > > > Le lundi 24 novembre 2008 à 18:59 +0200, Blue Swirl a écrit : > > > > > > > > > > > > > On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > > > > > > > > > > > Author: stepan > > > > > > Date: 2008-11-24 13:21:36 +0100 (Mon, 24 Nov 2008) > > > > > > New Revision: 255 > > > > > > > > > > > > > > > > > > > > > > void > > > > > > -nvram_init( void ) > > > > > > +nvram_init( char *path ) > > > > > > > > > > > > > > > > Bad idea, this breaks Sparc32 build. > > > > > > > > > > > > > > > > > I've looked in the device tree of sparc32 and didn't find any entry for > > > > nvram, so is the call to nvram_init() really needed ??? > > > > > > > > > > Yes, not for registering it to the device tree, but for reading the > > > config from nvram. The same applies to Sparc64. > > > > > > The function could be changed to check for a NULL (passed to it by > > > Sparc32/64) and perform different actions then, or maybe nvconf_init > > > should be exported and Sparc changed to use it instead of nvram_init. > > > > > > > IMHO the best thing to fo is to export and call nvconf_init. > > > OK, I'm testing the attached patch. Committed as r262.

2 3

r264 - in openbios-devel: arch/ppc/briq arch/ppc/mol arch/ppc/pearpc modules
by svn＠openbios.org 25 Nov '08

25 Nov '08

Author: blueswirl Date: 2008-11-25 20:50:53 +0100 (Tue, 25 Nov 2008) New Revision: 264 Modified: openbios-devel/arch/ppc/briq/init.c openbios-devel/arch/ppc/mol/init.c openbios-devel/arch/ppc/pearpc/init.c openbios-devel/modules/nvram.c Log: Add some debug macros and correct nvram_init() call for other PPC architectures (Laurent Vivier). Modified: openbios-devel/arch/ppc/briq/init.c =================================================================== --- openbios-devel/arch/ppc/briq/init.c 2008-11-25 19:41:41 UTC (rev 263) +++ openbios-devel/arch/ppc/briq/init.c 2008-11-25 19:50:53 UTC (rev 264) @@ -91,7 +91,7 @@ devtree_init(); node_methods_init(); - nvram_init(); + nvram_init("/pci/mac-io/nvram"); modules_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); Modified: openbios-devel/arch/ppc/mol/init.c =================================================================== --- openbios-devel/arch/ppc/mol/init.c 2008-11-25 19:41:41 UTC (rev 263) +++ openbios-devel/arch/ppc/mol/init.c 2008-11-25 19:50:53 UTC (rev 264) @@ -84,7 +84,7 @@ devtree_init(); node_methods_init(); - nvram_init(); + nvram_init("/pci/mac-io/nvram"); modules_init(); pseudodisk_init(); osiblk_init(); Modified: openbios-devel/arch/ppc/pearpc/init.c =================================================================== --- openbios-devel/arch/ppc/pearpc/init.c 2008-11-25 19:41:41 UTC (rev 263) +++ openbios-devel/arch/ppc/pearpc/init.c 2008-11-25 19:50:53 UTC (rev 264) @@ -93,7 +93,7 @@ int autoboot; devtree_init(); - nvram_init(); + nvram_init("/pci/mac-io/nvram"); modules_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); Modified: openbios-devel/modules/nvram.c =================================================================== --- openbios-devel/modules/nvram.c 2008-11-25 19:41:41 UTC (rev 263) +++ openbios-devel/modules/nvram.c 2008-11-25 19:50:53 UTC (rev 264) @@ -18,6 +18,13 @@ #include "openbios/bindings.h" #include "openbios/nvram.h" +#ifdef CONFIG_DEBUG_NVRAM +#define DPRINTF(fmt, args...) \ +do { printk("NVRAM: " fmt , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do {} while(0) +#endif + #define DEF_SYSTEM_SIZE 0xc10 #define NV_SIG_SYSTEM 0x70 @@ -228,7 +235,7 @@ int pos_hi = POP(); int pos_lo = POP(); - /* printk("NVRAM: seek %08x %08x\n", pos_hi, pos_lo ); */ + DPRINTF("seek %08x %08x\n", pos_hi, pos_lo ); nd->mark_lo = pos_lo; nd->mark_hi = pos_hi; @@ -254,7 +261,7 @@ n++; } PUSH(n); - /* printk("NVRAM: read %08x %x -- %x\n", (int)p, len, n); */ + DPRINTF("read %08x %x -- %x\n", (int)p, len, n); } /* ( addr len -- actual ) */ @@ -270,13 +277,14 @@ n++; } PUSH(n); - /* printk("NVRAM: write %08x %x -- %x\n", (int)p, len, n ); */ + DPRINTF("write %08x %x -- %x\n", (int)p, len, n ); } /* ( -- size ) */ static void nvram_size( __attribute__((unused)) nvram_ibuf_t *nd ) { + DPRINTF("nvram_size %d\n", nvram.size); PUSH( nvram.size ); }

1 0

Re: [OpenBIOS] r251 - in openbios-devel: config/examples kernel
by Blue Swirl 25 Nov '08

25 Nov '08

On 11/24/08, svn(a)openbios.org <svn(a)openbios.org> wrote: > Author: stepan > Date: 2008-11-24 13:13:40 +0100 (Mon, 24 Nov 2008) > New Revision: 251 > -HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) > +HOSTCFLAGS := -Os -Wall -W -DFCOMPILER -DBOOTSTRAP $(CROSSCFLAGS) -DSWAP_ENDIANNESS Bad idea, SWAP_ENDIANNESS is defined by config/scripts/crosscflags. Didn't it work correctly for you?

2 2