OpenBIOS August 2010

openbios@openbios.org

13 participants
46 discussions

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

22 Aug '10

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

1 0

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

22 Aug '10

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

1 0

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

21 Aug '10

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

4 7

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

21 Aug '10

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

1 0

fword and feval
by Programmingkid 19 Aug '10

19 Aug '10

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

2 1

QEMU and OpenBIOS
by Steven Noonan 18 Aug '10

18 Aug '10

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

2 2

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

17 Aug '10

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

1 0

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

17 Aug '10

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

3 4

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

16 Aug '10

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

5 13

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

11 Aug '10

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

1 0