OpenBIOS February 2016

openbios@openbios.org

11 participants
39 discussions

[PATCH 0/5] Enable bus master support for rtl8139 network cards on Apple PPC machines
by Mark Cave-Ayland 07 Aug '16

07 Aug '16

This patchset is loosely based on earlier work by BALATON Zoltan <balaton(a)eik.bme.hu> and provides basic infrastructure to allow OpenBIOS to enable PCI device bus mastering. Following on from discussions on the QEMU mailing list, it seems that Apple's OF enables bus mastering for some PCI devices by default, and as a result some buggy drivers forget to explicitly enable it and hence these devices fail under QEMU's emulation. The first 3 patches add the basic support routines while the last 2 patches enable bus mastering for the rtl8139 card on Apple PPC machines which is required for OS X and MorphOS. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (5): pci: introduce ob_pci_enable_bus_master() function pci: introduce ob_pci_is_bus_master_capable() function pci: add PCI database entry for rtl8139 network card pci: add rtl8139_config_cb() to configure rtl8139 network cards ppc: mark PCI slots 0-2 for Apple PPC machies as bus master capable openbios-devel/arch/ppc/qemu/init.c | 9 ++++--- openbios-devel/drivers/pci.c | 44 +++++++++++++++++++++++++++++++++ openbios-devel/drivers/pci_database.c | 6 +++++ openbios-devel/drivers/pci_database.h | 4 +++ openbios-devel/include/drivers/pci.h | 2 ++ 5 files changed, 62 insertions(+), 3 deletions(-) -- 1.7.10.4

5 17

[PATCH] ppc: fix ESCC reg properties
by Hervé Poussineau 30 Mar '16

30 Mar '16

I/O offsets were wrong in legacy mode and some were missing in non-legacy mode. This fixes serial port detection in NetBSD, which was ignoring it. This also partly fixes MacOS 9.2, which relies on them to initialize OpenTransport. Signed-off-by: Hervé Poussineau <hpoussin(a)reactos.org> --- drivers/escc.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/escc.c b/drivers/escc.c index afb97fa..8f122d8 100644 --- a/drivers/escc.c +++ b/drivers/escc.c @@ -384,6 +384,8 @@ escc_add_channel(const char *path, const char *node, phys_addr_t addr, { char buf[64], tty[32]; phandle_t dnode, aliases; + int legacy_offsets[][3] = { { 0x4, 0x6, 0xa }, { 0x0, 0x2, 0x8 } }; + int offsets[][3] = { { 0x20, 0x30, 0x50 }, { 0x00, 0x10, 0x40 } }; cell props[10]; int offset; @@ -425,18 +427,18 @@ escc_add_channel(const char *path, const char *node, phys_addr_t addr, set_property(dnode, "compatible", buf, 9); if (legacy) { - props[0] = IO_ESCC_LEGACY_OFFSET + offset * 0x4; - props[1] = 0x00000001; - props[2] = IO_ESCC_LEGACY_OFFSET + offset * 0x4 + 2; - props[3] = 0x00000001; - props[4] = IO_ESCC_LEGACY_OFFSET + offset * 0x4 + 6; - props[5] = 0x00000001; - set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell)); + props[0] = IO_ESCC_LEGACY_OFFSET + legacy_offsets[offset][0]; + props[2] = IO_ESCC_LEGACY_OFFSET + legacy_offsets[offset][1]; + props[4] = IO_ESCC_LEGACY_OFFSET + legacy_offsets[offset][2]; } else { - props[0] = IO_ESCC_OFFSET + offset * 0x20; - props[1] = 0x00000020; - set_property(dnode, "reg", (char *)&props, 2 * sizeof(cell)); + props[0] = IO_ESCC_LEGACY_OFFSET + offsets[offset][0]; + props[2] = IO_ESCC_LEGACY_OFFSET + offsets[offset][1]; + props[4] = IO_ESCC_LEGACY_OFFSET + offsets[offset][2]; } + props[1] = 0x00000001; + props[3] = 0x00000001; + props[5] = 0x00000001; + set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell)); if (legacy) { props[0] = addr + IO_ESCC_LEGACY_OFFSET + offset * 0x4; -- 2.1.4

5 21

Google Summer of Code 2016
by Programmingkid 01 Mar '16

01 Mar '16

Hi Mark, I was wondering if you were willing to be a mentor again for another student for this year's Google Summer of Code. Last year Cormac O'Brien made a lot of progress that put us into view of making Mac OS 9 work in QEMU. This year we could bring on someone else who could eliminate all these extension problems. Your work with Cormac last year was very impressive. Would you be interested in mentoring this year? I am thing about making the title to this years Google Summer of Code entry as "Make Mac OS 8.0 and higher work in QEMU". Nothing set in stone yet.

2 1

Re: [OpenBIOS] QEMU + MacOS
by Programmingkid 26 Feb '16

26 Feb '16

On Feb 26, 2016, at 5:06 PM, Hervé Poussineau wrote: > Le 13/02/2016 13:40, Mark Cave-Ayland a écrit : >> On 13/02/16 12:08, Alyssa Milburn wrote: >> >>> On Sat, Feb 13, 2016 at 11:25:49AM +0000, Mark Cave-Ayland wrote: >>>> Hmmm interesting - I'll take a look a bit later. In the meantime, I've >>>> uploaded the CD image I'm loading to >>>> https://www.ilande.co.uk/tmp/openbios/MacOS921.iso.xz. This is basically >>>> stripped of all extensions minus MacsBug, OT and OT ASLM modules. >>>> >>>> I'm using an OpenBIOS binary built from the branch I pushed to github, >>>> current QEMU git master and the following command line: >>>> >>>> ./qemu-system-ppc -M mac99 -bios openbios-qemu.elf.nostrip -cdrom >>>> MacOS921.iso -cpu G3 -boot d >>>> >>>> Let me know if that helps you recreate a similar environment or not. >>> >>> I also still just get crashes, even with your image. :-( I've tried >>> several compilers for both the OpenBIOS side and qemu. >>> >>> I wonder if it might be some timing problem.. I have pretty slow computers >>> probably (mostly I use a 2.4GHz Core 2 Duo), are you using something >>> (dramatically) faster? >> >> I'm using a 1.8GHz Core 2 Duo laptop, so mine should be slower than >> that! My setup is plain Debian wheezy (gcc 4.7.2) but with a >> custom-built 4.1 kernel. Compilers for OpenBIOS I have built by hand and >> my current cross-gcc is gcc 5.1.0. >> >> I do have a couple of extra options in my build-ppc.sh script below - >> not sure if they make any difference though. >> >> build@kentang:~/src/qemu/git$ cat build-ppc.sh >> >> #!/bin/bash >> >> pushd qemu >> make distclean >> >> STRIP= './configure' '--target-list=ppc-softmmu' >> '--prefix=/home/build/rel-qemu-git' '--enable-gtk' '--disable-pie' >> >> make -j2 V=1 install >> popd >> >> I've also uploaded my OpenBIOS binary image which I've just confirmed >> with git master and my debugging enabled still gets stuck in the ESCC >> polling loop to http://www.ilande.co.uk/tmp/openbios/openbios-ppc-escc >> if that helps. >> >> >> HTH, >> >> Mark. >> >> > > Hi, > > I tried to use MacsBug to find some more details about current emulation problems. > I share with you some handful commands I found: > - sc/sc7 (Stack Crawl) to see the stack trace > - es (Exit Shell) to exit MacsBug and try to continue > - ip [addr] (68k code) or ipp [addr] (ppc code) to disassemble around some addresses > > Full MacsBug manual is available at > https://web.archive.org/web/20110605022118/http://developer.apple.com/tools… > > I've tried lastest OpenBIOS revision (with all ESCC fixes). Unfortunately, MacOS never tries to access unimplemented DBDMA channels and I was unable to find more hints about what's happens. > > However, with https://www.ilande.co.uk/tmp/openbios/MacOS921.iso.xz and exiting MacsBug with 'es' command, I'm able to browse cd contents :) > > Hervé Thank you for this information. Well it looks like we are stuck. For some reason Mac OS 9 will not successfully boot in QEMU with the OpenTransport extension. Are we even sure the ESCC is to blame? I do know a lot of applications depend on this extension. Internet Explorer and Netscape are two examples. So going without it is not going to be much fun. There must be some way to satisfy OpenTransport's needs. I think step one is actually finding out what those needs are. Also for some reason when I try to type something into Macsbug when using it under Mac OS 9.0.4, the character is repeated to the end of the field. Anyone else see this issue?

2 1

Re: [OpenBIOS] Has anyone figured out how to invoke Macsbug from the cocoa gui?
by Programmingkid 26 Feb '16

26 Feb '16

On Feb 26, 2016, at 1:19 PM, Alfonso Gamboa wrote: > Yes, it works for me. Shift to disable extensions. This is with the Cocoa gui on Mac OS X? > > On Feb 26, 2016 8:16 AM, "Programmingkid" <programmingkidx(a)gmail.com> wrote: > > On Feb 25, 2016, at 5:39 PM, Mark Cave-Ayland wrote: > > > On 25/02/16 19:15, Programmingkid wrote: > > > >> I want to bring up Macsbug while Mac OS 9 is booting. I tried command-powerkey (real left and right command keys) but that didn't work. Command-fn-f12 also didn't work for me. Anybody have any luck with this when using a Mac OS X host? > > > > Control works fine here with the GTK GUI (hold it down as soon as you > > see the happy Mac). Maybe try using vnc/sdl just for debugging? It seems > > that the keymaps for the cocoa GUI may need some work. > > When you hold down the shift key during startup, does Mac OS 9 say "Extensions Disabled"? > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you

1 0

Re: [OpenBIOS] Has anyone figured out how to invoke Macsbug from the cocoa gui?
by Programmingkid 26 Feb '16

26 Feb '16

On Feb 25, 2016, at 5:39 PM, Mark Cave-Ayland wrote: > On 25/02/16 19:15, Programmingkid wrote: > >> I want to bring up Macsbug while Mac OS 9 is booting. I tried command-powerkey (real left and right command keys) but that didn't work. Command-fn-f12 also didn't work for me. Anybody have any luck with this when using a Mac OS X host? > > Control works fine here with the GTK GUI (hold it down as soon as you > see the happy Mac). Maybe try using vnc/sdl just for debugging? It seems > that the keymaps for the cocoa GUI may need some work. When you hold down the shift key during startup, does Mac OS 9 say "Extensions Disabled"?

2 1

[commit] r1391 - trunk/openbios-devel/drivers
by repository service 25 Feb '16

25 Feb '16

Author: mcayland Date: Fri Feb 26 00:00:15 2016 New Revision: 1391 URL: http://tracker.coreboot.org/trac/openbios/changeset/1391 Log: escc.c: add DBDMA interrupt properties These are required for MacOS to locate the serial port. Also make sure we add the 2nd integer to each interrupt in order to indicate level/edge triggering. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/escc.c Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Fri Feb 26 00:00:11 2016 (r1390) +++ trunk/openbios-devel/drivers/escc.c Fri Feb 26 00:00:15 2016 (r1391) @@ -473,10 +473,13 @@ (char *)&props, 1 * sizeof(cell))); props[0] = (0x24) + index; - props[1] = 0x0; - props[2] = 0x0; + props[1] = 0x1; + props[2] = dbdma_offsets[index][0]; + props[3] = 0x0; + props[4] = dbdma_offsets[index][1]; + props[5] = 0x0; NEWWORLD(set_property(dnode, "interrupts", - (char *)&props, 3 * sizeof(cell))); + (char *)&props, 6 * sizeof(cell))); set_int_property(dnode, "slot-names", 0);

1 0

[commit] r1390 - trunk/openbios-devel/drivers
by repository service 25 Feb '16

25 Feb '16

Author: mcayland Date: Fri Feb 26 00:00:11 2016 New Revision: 1390 URL: http://tracker.coreboot.org/trac/openbios/changeset/1390 Log: escc.c: add DBDMA addresses to reg property These are required for MacOS to locate the serial port. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland> Modified: trunk/openbios-devel/drivers/escc.c Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Fri Feb 26 00:00:06 2016 (r1389) +++ trunk/openbios-devel/drivers/escc.c Fri Feb 26 00:00:11 2016 (r1390) @@ -389,6 +389,14 @@ ucell offset; int index; int legacy; + + int dbdma_offsets[2][2] = { + /* ch-b */ + { 0x6, 0x7 }, + /* ch-a */ + { 0x4, 0x5 } + }; + int reg_offsets[2][2][3] = { { /* ch-b */ @@ -450,7 +458,11 @@ props[3] = 0x1; props[4] = offset + reg_offsets[legacy][index][2]; props[5] = 0x1; - set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell)); + props[6] = 0x8000 + dbdma_offsets[index][0] * 0x100; + props[7] = 0x100; + props[8] = 0x8000 + dbdma_offsets[index][1] * 0x100; + props[9] = 0x100; + set_property(dnode, "reg", (char *)&props, 10 * sizeof(cell)); props[0] = addr + offset + reg_offsets[legacy][index][0]; OLDWORLD(set_property(dnode, "AAPL,address",

1 0

[commit] r1389 - trunk/openbios-devel/drivers
by repository service 25 Feb '16

25 Feb '16

Author: mcayland Date: Fri Feb 26 00:00:06 2016 New Revision: 1389 URL: http://tracker.coreboot.org/trac/openbios/changeset/1389 Log: escc.c: add empty slot-names property to serial ports This is required to enable the ports to be detected by OS X. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/escc.c Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Fri Feb 26 00:00:01 2016 (r1388) +++ trunk/openbios-devel/drivers/escc.c Fri Feb 26 00:00:06 2016 (r1389) @@ -466,6 +466,8 @@ NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 3 * sizeof(cell))); + set_int_property(dnode, "slot-names", 0); + device_end(); uart_init_line((unsigned char*)addr + offset + reg_offsets[legacy][index][0],

1 0

[commit] r1388 - trunk/openbios-devel/drivers
by repository service 25 Feb '16

25 Feb '16

Author: mcayland Date: Fri Feb 26 00:00:01 2016 New Revision: 1388 URL: http://tracker.coreboot.org/trac/openbios/changeset/1388 Log: escc.c: tidy-up legacy and non-legacy codepaths Now that the reg addresses are all table-driven, it is possible to simplify and almost remove the legacy and non-legacy codepaths. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/escc.c Modified: trunk/openbios-devel/drivers/escc.c ============================================================================== --- trunk/openbios-devel/drivers/escc.c Thu Feb 25 23:59:56 2016 (r1387) +++ trunk/openbios-devel/drivers/escc.c Fri Feb 26 00:00:01 2016 (r1388) @@ -386,6 +386,7 @@ phandle_t dnode, aliases; cell props[10]; + ucell offset; int index; int legacy; int reg_offsets[2][2][3] = { @@ -438,28 +439,20 @@ set_property(dnode, "compatible", buf, 9); if (legacy) { - props[0] = IO_ESCC_LEGACY_OFFSET + reg_offsets[legacy][index][0]; - props[1] = 0x1; - props[2] = IO_ESCC_LEGACY_OFFSET + reg_offsets[legacy][index][1]; - props[3] = 0x1; - props[4] = IO_ESCC_LEGACY_OFFSET + reg_offsets[legacy][index][2]; - props[5] = 0x1; - set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell)); + offset = IO_ESCC_LEGACY_OFFSET; } else { - props[0] = IO_ESCC_OFFSET + reg_offsets[legacy][index][0]; - props[1] = 0x1; - props[2] = IO_ESCC_OFFSET + reg_offsets[legacy][index][1]; - props[3] = 0x1; - props[4] = IO_ESCC_OFFSET + reg_offsets[legacy][index][2]; - props[5] = 0x1; - set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell)); + offset = IO_ESCC_OFFSET; } - if (legacy) { - props[0] = addr + IO_ESCC_LEGACY_OFFSET + index * 0x4; - } else { - props[0] = addr + IO_ESCC_OFFSET + index * 0x20; - } + props[0] = offset + reg_offsets[legacy][index][0]; + props[1] = 0x1; + props[2] = offset + reg_offsets[legacy][index][1]; + props[3] = 0x1; + props[4] = offset + reg_offsets[legacy][index][2]; + props[5] = 0x1; + set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell)); + + props[0] = addr + offset + reg_offsets[legacy][index][0]; OLDWORLD(set_property(dnode, "AAPL,address", (char *)&props, 1 * sizeof(cell))); @@ -475,15 +468,8 @@ device_end(); - if (legacy) { - uart_init_line( - (unsigned char*)addr + IO_ESCC_LEGACY_OFFSET + index * 0x4, - CONFIG_SERIAL_SPEED); - } else { - uart_init_line( - (unsigned char*)addr + IO_ESCC_OFFSET + index * 0x20, - CONFIG_SERIAL_SPEED); - } + uart_init_line((unsigned char*)addr + offset + reg_offsets[legacy][index][0], + CONFIG_SERIAL_SPEED); } void

1 0