OpenBIOS December 2009

openbios@openbios.org

19 participants
44 discussions

r648 - in trunk/openbios-devel: arch/sparc64 drivers
by svn＠openbios.org 28 Dec '09

28 Dec '09

Author: blueswirl Date: 2009-12-28 11:15:33 +0100 (Mon, 28 Dec 2009) New Revision: 648 Modified: trunk/openbios-devel/arch/sparc64/entry.S trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/vga_vbe.c Log: Map VGA buffer only during PCI probe Also pass physical addresses instead of bus addresses to VGA init. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/sparc64/entry.S =================================================================== --- trunk/openbios-devel/arch/sparc64/entry.S 2009-12-21 09:57:53 UTC (rev 647) +++ trunk/openbios-devel/arch/sparc64/entry.S 2009-12-28 10:15:33 UTC (rev 648) @@ -180,24 +180,6 @@ bne 1b add %l2, %g5, %l2 - ! setup VGA buffer - setx 0x1ff004a0000, %g7, %g4 - mov 2, %g6 - set 48, %g7 - set 0x10000, %g5 -1: stxa %g4, [%g7] ASI_DMMU ! vaddr = 0x1ff004a0000, ctx=0 - set 0xa0000000, %g3 - sllx %g3, 32, %g3 - or %g3, 0x76, %g3 - or %g4, %g3, %g3 - ! valid, 64k, locked, cacheable(I/E/C), priv, writable - ! paddr = 0x1ff004a0000 - stxa %g3, [%g0] ASI_DTLB_DATA_IN - add %g4, %g5, %g4 - deccc %g6 - bne 1b - nop - #if 1 ! setup 0-16M mov %g0, %g4 Modified: trunk/openbios-devel/drivers/pci.c =================================================================== --- trunk/openbios-devel/drivers/pci.c 2009-12-21 09:57:53 UTC (rev 647) +++ trunk/openbios-devel/drivers/pci.c 2009-12-28 10:15:33 UTC (rev 648) @@ -322,6 +322,15 @@ set_property(dev, "ranges", (char *)props, ncells * sizeof(props[0])); } +static unsigned long pci_bus_addr_to_host_addr(uint32_t ba) +{ +#ifdef CONFIG_SPARC64 + return arch->cfg_data + (unsigned long)ba; +#else + return (unsigned long)ba; +#endif +} + int host_config_cb(const pci_config_t *config) { phandle_t aliases; @@ -547,10 +556,11 @@ int vga_config_cb (const pci_config_t *config) { if (config->assigned[0] != 0x00000000) - vga_vbe_init(config->path, config->assigned[0] & ~0x0000000F, - config->sizes[0], - config->assigned[1] & ~0x0000000F, - config->sizes[1]); + vga_vbe_init(config->path, + pci_bus_addr_to_host_addr(config->assigned[0] & ~0x0000000F), + config->sizes[0], + pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F), + config->sizes[1]); return 0; } Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-12-21 09:57:53 UTC (rev 647) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-12-28 10:15:33 UTC (rev 648) @@ -25,6 +25,7 @@ #include "asm/io.h" #include "libc/vsprintf.h" #include "video_subr.h" +#include "ofmem.h" /* VGA init. We use the Bochs VESA VBE extensions */ #define VBE_DISPI_INDEX_ID 0x0 @@ -142,7 +143,10 @@ depth = d; linebytes = (width * ((depth + 7) / 8)); } +#ifdef CONFIG_SPARC64 + ofmem_map_page_range(fb, fb, fb_size, 0x36); #endif +#endif vga_vbe_set_mode(width, height, depth);

1 0

Re: [OpenBIOS] r641 - in trunk/openbios-devel/forth: bootstrap device
by Nick Couchman 27 Dec '09

27 Dec '09

>>> On 2009/12/08 at 18:09, <svn(a)openbios.org> wrote: > Author: mcayland > Date: 2009-12-09 02:09:48 +0100 (Wed, 09 Dec 2009) > New Revision: 641 > > Modified: > trunk/openbios-devel/forth/bootstrap/bootstrap.fs > trunk/openbios-devel/forth/device/fcode.fs > Log: > Revert r638, apply previous patch to extend control flow stack items to 2 > data stack items, and fix the Fcode evaluator to use > this new information to correctly resolve destination (b<mark) references. > See the email archives for further discussion on why > this is required. > > Hopefully this should finally resolve the Fcode backward branch problem; at > least all previous incorrect resolutions now appear > correct and the Fcode evaluator no longer crashes or gets stuck in a loop > while attempting to boot Milax. > Updated and rebuilt OpenBIOS - still getting the same unhandled exception at the same place: (gdb) l *0x00000000ffd10e54 0xffd10e54 is in cfetch (../include/openbios/stack.h:34). 29 typedef ucell phandle_t; 30 31 32 33 34 static inline void PUSH(ucell value) { 35 dstack[++dstackcnt] = (value); 36 } 37 static inline void PUSH_xt( xt_t xt ) { PUSH( (ucell)xt ); } 38 static inline void PUSH_ih( ihandle_t ih ) { PUSH( (ucell)ih ); } What version of Milax are you using? I downloaded the 0.4 ISO and all I get is "Unsupported Image Format" when I try to boot. -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.

8 47

[PATCH 0/3] alternative implementation of sparc64 boot memory mapping
by Igor V. Kovalenko 27 Dec '09

27 Dec '09

The following series implements alternative approach to solve issue where qemu provides i/o and pci memory spaces within physical RAM address space, which makes low memory addresses unusable. Instead of changing qemu to move i/o and pci spaces out of RAM space we can remap 64M of i/o and pci spaces to above 32bit accessible by client program. Then we map physical RAM at 64M offset to start of virtual memory. A few extra changes are required. At very least we need to find where framebuffer virtual address is placed by startup code, helper change is provided. NOTE: this approach may hide up to 128M from client allocations so I tested with 'qemu-system-sparc64 -m 256' In my test these series are as efficient as qemu change to remap i/o and pci spaces in allowing milax032sparc.iso to not step over cmd646 registers. Currently milax loader gets a bit further and fails with Can't open /ramdisk-root byte-load: exception caught! --- Igor V. Kovalenko (3): sparc64: remap first 64M physical address space sparc64: claim memory mapped by startup code ofmem: helper to find first virtual address map entry arch/sparc64/entry.S | 68 +++++++++++++++++++----------------------- arch/sparc64/ofmem_sparc64.c | 2 + arch/sparc64/openbios.c | 19 ++++++++---- include/ofmem.h | 1 + modules/ofmem_common.c | 25 +++++++++++++++ modules/video.c | 9 +++++- 6 files changed, 80 insertions(+), 44 deletions(-) -- Kind regards, Igor V. Kovalenko

3 9

Feature request
by G 3 24 Dec '09

24 Dec '09

I think we should make OpenBIOS more complete by adding support for local variables.

1 0

Re: [OpenBIOS] [Qemu-devel] M68K Or PPC Status Update to Run Mac OS in Qemu
by Alexander Graf 22 Dec '09

22 Dec '09

Mark Cave-Ayland wrote: > Alexander Graf wrote: > >> OpenBIOS is missing an implementation for local variables. See this >> thread: >> http://www.openfirmware.info/pipermail/openbios/2009-July/003796.html >> >> Alex > > How do local variables work? Are they just substitutions for stack > places? I seriously am the last person to know anything about Forth :-). But I'm sure Stefan can help out here. He's been looking into that before. > If you can point me towards a specification for this, I can have a > look and see how feasible it would be to add this to OpenBIOS. 1) http://www.complang.tuwien.ac.at/viewcvs/cgi-bin/viewcvs.cgi/gforth/locals.… 2) http://www.openfirmware.info/FCODE_suite -> see "local value support" -> has an incompatible license -> contains links to documentation IIRC 3) http://www.forthos.org/ -> claims to have local value support, haven't found the sources yet The code BootX executes: http://www.openfirmware.info/pipermail/openbios/2009-July/003812.html Alex

1 0

r647 - trunk/openbios-devel/drivers
by svn＠openbios.org 21 Dec '09

21 Dec '09

Author: agraf Date: 2009-12-21 10:57:53 +0100 (Mon, 21 Dec 2009) New Revision: 647 Modified: trunk/openbios-devel/drivers/escc.c Log: I accidently set props[0] twice instead of going through both elements. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/escc.c =================================================================== --- trunk/openbios-devel/drivers/escc.c 2009-12-18 23:38:08 UTC (rev 646) +++ trunk/openbios-devel/drivers/escc.c 2009-12-21 09:57:53 UTC (rev 647) @@ -418,8 +418,8 @@ OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); - props[0] = 0; props[0] = (0x24) + offset; + props[1] = 0; NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 2 * sizeof(cell)));

1 0

[PATCH] Make interrupts work on newworld machines
by Alexander Graf 20 Dec '09

20 Dec '09

When running qemu in -M mac99 mode, interrupts failed on me all the time. I finally managed to track things down and it seems like we're missing some properties in several devices. While at it, I also bumped the ESCC IRQs to 0x24 / 0x25, as that's what qemu now maps them on. This patch (plus the qemu set) gets PPC64 Linux booting with console=ttyPZ0. Signed-off-by: Alexander Graf <agraf(a)suse.de> Index: drivers/macio.c =================================================================== --- drivers/macio.c (revision 644) +++ drivers/macio.c (working copy) @@ -145,6 +145,7 @@ static void openpic_init(const char *path, uint32_t addr) { + phandle_t target_node; phandle_t dnode; int props[2]; char buf[128]; @@ -154,7 +155,6 @@ fword("new-device"); push_str("interrupt-controller"); fword("device-name"); - fword("finish-device"); snprintf(buf, sizeof(buf), "%s/interrupt-controller", path); dnode = find_dev(buf); @@ -168,6 +168,21 @@ set_int_property(dnode, "#address-cells", 0); set_property(dnode, "interrupt-controller", "", 0); set_int_property(dnode, "clock-frequency", 4166666); + + fword("finish-device"); + + if (is_newworld()) { + /* patch in interrupt parent */ + dnode = find_dev(buf); + target_node = find_dev("/pci"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-a"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-b"); + set_int_property(target_node, "interrupt-parent", dnode); + } } DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io"); Index: drivers/escc.c =================================================================== --- drivers/escc.c (revision 644) +++ drivers/escc.c (working copy) @@ -418,6 +418,11 @@ OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); + props[0] = 0; + props[0] = (0x24) + offset; + NEWWORLD(set_property(dnode, "interrupts", + (char *)&props, 2 * sizeof(cell))); + device_end(); uart_init_line((unsigned char*)addr + IO_ESCC_OFFSET + offset * 0x20,

4 7

[PATCH] Fix typo in escc interrupt patch
by Alexander Graf 19 Dec '09

19 Dec '09

I accidently set props[0] twice instead of going through both elements. Signed-off-by: Alexander Graf <agraf(a)suse.de> Index: drivers/escc.c =================================================================== --- drivers/escc.c (revision 646) +++ drivers/escc.c (working copy) @@ -418,8 +418,8 @@ OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); - props[0] = 0; props[0] = (0x24) + offset; + props[1] = 0; NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 2 * sizeof(cell)));

1 0

r646 - trunk/openbios-devel/drivers
by svn＠openbios.org 19 Dec '09

19 Dec '09

Author: laurent Date: 2009-12-19 00:38:08 +0100 (Sat, 19 Dec 2009) New Revision: 646 Modified: trunk/openbios-devel/drivers/escc.c trunk/openbios-devel/drivers/macio.c Log: When running qemu in -M mac99 mode, interrupts failed on me all the time. I finally managed to track things down and it seems like we're missing some properties in several devices. While at it, I also bumped the ESCC IRQs to 0x24 / 0x25, as that's what qemu now maps them on. This patch (plus the qemu set) gets PPC64 Linux booting with console=ttyPZ0. Signed-off-by: Alexander Graf <agraf(a)suse.de> Modified: trunk/openbios-devel/drivers/escc.c =================================================================== --- trunk/openbios-devel/drivers/escc.c 2009-12-18 20:41:51 UTC (rev 645) +++ trunk/openbios-devel/drivers/escc.c 2009-12-18 23:38:08 UTC (rev 646) @@ -418,6 +418,11 @@ OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); + props[0] = 0; + props[0] = (0x24) + offset; + NEWWORLD(set_property(dnode, "interrupts", + (char *)&props, 2 * sizeof(cell))); + device_end(); uart_init_line((unsigned char*)addr + IO_ESCC_OFFSET + offset * 0x20, Modified: trunk/openbios-devel/drivers/macio.c =================================================================== --- trunk/openbios-devel/drivers/macio.c 2009-12-18 20:41:51 UTC (rev 645) +++ trunk/openbios-devel/drivers/macio.c 2009-12-18 23:38:08 UTC (rev 646) @@ -145,6 +145,7 @@ static void openpic_init(const char *path, uint32_t addr) { + phandle_t target_node; phandle_t dnode; int props[2]; char buf[128]; @@ -154,7 +155,6 @@ fword("new-device"); push_str("interrupt-controller"); fword("device-name"); - fword("finish-device"); snprintf(buf, sizeof(buf), "%s/interrupt-controller", path); dnode = find_dev(buf); @@ -168,6 +168,21 @@ set_int_property(dnode, "#address-cells", 0); set_property(dnode, "interrupt-controller", "", 0); set_int_property(dnode, "clock-frequency", 4166666); + + fword("finish-device"); + + if (is_newworld()) { + /* patch in interrupt parent */ + dnode = find_dev(buf); + target_node = find_dev("/pci"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-a"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-b"); + set_int_property(target_node, "interrupt-parent", dnode); + } } DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io");

1 0

[PATCH] Allow non-cross compilation
by Alexander Graf 18 Dec '09

18 Dec '09

I usually compile openbios on PowerPC for PowerPC. Apparently I'm the only one doing that, as that (really easy) case got broken by the cross compilation overhaul. Let's allow host = target gcc configurations again. Signed-off-by: Alexander Graf <agraf(a)suse.de> Index: config/scripts/switch-arch =================================================================== --- config/scripts/switch-arch (revision 644) +++ config/scripts/switch-arch (working copy) @@ -93,6 +93,9 @@ return fi done + if [ "$ARCH" = "$HOSTARCH" ]; then + return + fi echo "ERROR: no ${1} cross-compiler found !" 1>&2 exit 1 }

2 1