- OpenBIOS - mail.coreboot.org

[PATCH] vga.fs: install MacOS VGA PPC driver from QEMU fw_cfg interface if available
by Mark Cave-Ayland 01 May '17

01 May '17

If the fw_cfg interface provides a MacOS VGA PPC NDRV binary driver then install it into the "driver,AAPL,MacOS,PowerPC" property of the QEMU VGA package. The installation of the binary is configured via the NVRAM configuration variable "vga-ndrv?" (which is set to true by default for PPC) and also the presence of the NDRV binary driver file within the QEMU fw_cfg interface itself. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- drivers/vga.fs | 14 ++++++++++++++ forth/admin/nvram.fs | 1 + 2 files changed, 15 insertions(+) diff --git a/drivers/vga.fs b/drivers/vga.fs index 29a043a..cbfa46c 100644 --- a/drivers/vga.fs +++ b/drivers/vga.fs @@ -34,6 +34,9 @@ fcode-version3 " fb8-fillrect" (find-xt) value fb8-fillrect-xt : fb8-fillrect fb8-fillrect-xt execute ; +" fw-cfg-read-file" (find-xt) value fw-cfg-read-file-xt +: fw-cfg-read-file fw-cfg-read-file-xt execute ; + \ \ IO port words \ @@ -197,6 +200,17 @@ headerless depth-bits encode-int " depth" property line-bytes encode-int " linebytes" property + \ Is the VGA NDRV driver enabled? (PPC only) + " /options" find-package drop s" vga-ndrv?" rot get-package-property not if + decode-string 2swap 2drop \ ( addr len ) + s" true" drop -rot comp 0= if + \ Embed NDRV driver via fw-cfg if it exists + " ndrv/qemu_vga.ndrv" fw-cfg-read-file if + encode-string " driver,AAPL,MacOS,PowerPC" property + then + then + then + ['] qemu-vga-driver-install is-install ; diff --git a/forth/admin/nvram.fs b/forth/admin/nvram.fs index 20f6462..3fbd935 100644 --- a/forth/admin/nvram.fs +++ b/forth/admin/nvram.fs @@ -336,6 +336,7 @@ s" -1" s" real-size" int-config s" 4000000" s" load-base" int-config s" -1" s" virt-base" int-config s" -1" s" virt-size" int-config +s" true" s" vga-ndrv?" bool-config [THEN] [IFDEF] CONFIG_X86 -- 1.7.10.4

1 0

[PATCH v2 0/2] Display color fixes
by Mark Cave-Ayland 21 Apr '17

21 Apr '17

Here are a couple of fixes that correct the display colors in the Solaris console login screen. It seems that the Solaris drivers assume the foreground and background colors are in different palette entries to those currently used by OpenBIOS causing the console to appear invisible as white text on a white background. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Reword commit message for first patch as suggested by Tarl Mark Cave-Ayland (2): display.fs: fix off-by-one errors in color palette initialisation display.fs: fix palette entries for foreground and background colors forth/device/display.fs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) -- 1.7.10.4

1 3

[PATCH] SPARC32: fix up obp_dumb_mmap() and obp_dumb_munmap()
by Mark Cave-Ayland 21 Apr '17

21 Apr '17

obp_dumb_mmap() needs to call ofmem_map() rather than the low-level ofmem_arch_map_pages() function otherwise the specified area is mapped directly on the CPU without being recorded in the relevant memory node properties. This fixes Solaris 2.6 which uses obp_dumb_mmap() to map the kernel msgbuf and would otherwise trap on boot as the mapping was lost once the kernel had taken over memory management from OpenBIOS. While we're here, add a missing DPRINTF() to obp_dumb_mmap() and provide the corresponding obp_dumb_munmap() implementation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- arch/sparc32/lib.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/arch/sparc32/lib.c b/arch/sparc32/lib.c index d27b604..a53a396 100644 --- a/arch/sparc32/lib.c +++ b/arch/sparc32/lib.c @@ -196,15 +196,25 @@ char *obp_dumb_mmap(char *va, int which_io, unsigned int pa, unsigned int size) { uint64_t mpa = ((uint64_t)which_io << 32) | (uint64_t)pa; + ucell virt; + + DPRINTF("obp_dumb_mmap: virta 0x%x, phys 0x%x, size %d\n", (unsigned int)va, pa, size); + + /* Claim virtual memory */ + virt = ofmem_claim_virt(pointer2cell(va), size, 0); - ofmem_arch_map_pages(mpa, (unsigned long)va, size, ofmem_arch_default_translation_mode(mpa)); - return va; + /* Map memory */ + ofmem_map(mpa, virt, size, ofmem_arch_default_translation_mode(mpa)); + + return cell2pointer(virt); } -void obp_dumb_munmap(__attribute__((unused)) char *va, - __attribute__((unused)) unsigned int size) +void obp_dumb_munmap(char *va, unsigned int size) { DPRINTF("obp_dumb_munmap: virta 0x%x, sz %d\n", (unsigned int)va, size); + + ofmem_unmap(pointer2cell(va), size); + ofmem_release_virt(pointer2cell(va), size); } char *obp_memalloc(char *va, unsigned int size, unsigned int align) -- 1.7.10.4

1 1

[PATCH] pci: don't add simple open/close words to all PCI devices
by Mark Cave-Ayland 21 Apr '17

21 Apr '17

Currently all PCI devices except display devices are initialised with simple open and close words that are effectively a no-op, but enable the device to be accessed. Unfortunately this means that if devices have custom open and close words then the existing ones are overwritten causing OpenBIOS to emit warnings such as "open isn't unique" on the console. Resolve this by defaulting all PCI devices to the empty PCI node template ob_pci_empty_node and then adding the simple open and close words after the device has been initialised if they do not already exist. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- drivers/pci.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/pci.c b/drivers/pci.c index d698364..c7b2bd2 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -49,7 +49,7 @@ /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_pci_bus_node, INSTALL_OPEN, 2*sizeof(int) ); -DECLARE_UNNAMED_NODE( ob_pci_simple_node, INSTALL_OPEN, 2*sizeof(int) ); +DECLARE_UNNAMED_NODE( ob_pci_simple_node, 0, 2*sizeof(int) ); DECLARE_UNNAMED_NODE( ob_pci_empty_node, 0, 2*sizeof(int) ); const pci_arch_t *arch; @@ -399,7 +399,6 @@ NODE_METHODS(ob_pci_bus_node) = { }; NODE_METHODS(ob_pci_simple_node) = { - { NULL, ob_pci_initialize }, { "open", ob_pci_open }, { "close", ob_pci_close }, }; @@ -1418,11 +1417,8 @@ static void ob_configure_pci_device(const char* parent_path, REGISTER_NAMED_NODE_PHANDLE(ob_pci_bus_node, config.path, phandle); } break; - case PCI_CLASS_DISPLAY: - REGISTER_NAMED_NODE_PHANDLE(ob_pci_empty_node, config.path, phandle); - break; default: - REGISTER_NAMED_NODE_PHANDLE(ob_pci_simple_node, config.path, phandle); + REGISTER_NAMED_NODE_PHANDLE(ob_pci_empty_node, config.path, phandle); break; } @@ -1460,6 +1456,11 @@ static void ob_configure_pci_device(const char* parent_path, pci_dev->config_cb(&config); } + /* if devices haven't supplied open/close words then supply them with simple defaults */ + if (!find_package_method("open", phandle) && !find_package_method("close", phandle)) { + REGISTER_NODE_METHODS(ob_pci_simple_node, config.path); + } + /* device is configured so we may move it out of scope */ device_end(); -- 1.7.10.4

1 1

[PATCH v2 0/3] fw_cfg: add support for files
by Mark Cave-Ayland 21 Apr '17

21 Apr '17

This patchset is part of the ongoing work to add virtio support to OpenBIOS, yet self-contained enough to be spun out as a separate patchset. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Add comment explaining BE access for file API - Add mising byte swap macros to fw_cfg_find_file() Mark Cave-Ayland (3): fw_cfg: split fw_cfg_read() into fw_cfg_read() and fw_cfg_read_bytes() fw_cfg: add fw_cfg_find_file() and fw_cfg_read_file() functions fw_cfg: implement fw-cfg-read-file Forth word drivers/fw_cfg.c | 89 +++++++++++++++++++++++++++++++++++++++--- include/arch/common/fw_cfg.h | 16 ++++++++ libopenbios/init.c | 7 +++- 3 files changed, 105 insertions(+), 7 deletions(-) -- 1.7.10.4

1 4

[PATCH 0/2] Display color fixes
by Mark Cave-Ayland 20 Apr '17

20 Apr '17

Here are a couple of fixes that correct the display colors in the Solaris console login screen. It seems that the Solaris drivers assume the foreground and background colors are in different palette entries to those currently used by OpenBIOS causing the console to appear invisible as white text on a white background. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (2): display.fs: fix off-by-one errors in color palette initialisation display.fs: fix palette entries for foreground and background colors forth/device/display.fs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) -- 1.7.10.4

2 4

[PATCH 0/3] fw_cfg: add support for files
by Mark Cave-Ayland 20 Mar '17

20 Mar '17

This patchset is part of the ongoing work to add virtio support to OpenBIOS, yet self-contained enough to be spun out as a separate patchset. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (3): fw_cfg: split fw_cfg_read() into fw_cfg_read() and fw_cfg_read_bytes() fw_cfg: add fw_cfg_find_file() and fw_cfg_read_file() functions fw_cfg: implement fw-cfg-read-file Forth word drivers/fw_cfg.c | 88 +++++++++++++++++++++++++++++++++++++++--- include/arch/common/fw_cfg.h | 16 ++++++++ libopenbios/init.c | 7 +++- 3 files changed, 104 insertions(+), 7 deletions(-) -- 1.7.10.4

2 7

[PATCH] pci: fix setup of 64-bit BARs
by Mark Cave-Ayland 14 Mar '17

14 Mar '17

The current PCI implementation is designed for a 32-bit PCI bus. When a 64-bit BAR is encountered during PCI bus enumeration, currently we treat the MSB BAR the same as a standard 32-bit BAR, attempting to guess its size by setting to 0xffffffff and reading back the response which returns back an invalid size of 0 and fails. This has the effect of setting the MSB BAR to 0xffffffff meaning that 64-bit BARs are mapped at the top of PCI memory in the wrong location. Handle this case by ignoring the MSB BAR when we detect a 64-bit BAR leaving it at its default value of zero. This solves the issue by ensuring that all 64-bit BARs are mapped within 32-bit PCI space which is fine for the PPC/SPARC64 machines we care about. Most noticeably this solves the issue of virtio modern devices (which use 64-bit BARs under QEMU) causing a kernel panic upon startup on qemu-system-sparc64 because they are mapped at the wrong address by OpenBIOS. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- drivers/pci.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/pci.c b/drivers/pci.c index c998280..2e09d0a 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -1202,9 +1202,9 @@ ob_pci_configure(pci_addr addr, pci_config_t *config, int num_regs, int rom_bar, unsigned long *mem_base, unsigned long *io_base) { - uint32_t omask; + uint32_t omask, mask; uint16_t cmd; - int reg; + int reg, flags, space_code; pci_addr config_addr; ob_pci_configure_irq(addr, config); @@ -1216,6 +1216,14 @@ ob_pci_configure(pci_addr addr, pci_config_t *config, int num_regs, int rom_bar, ob_pci_configure_bar(addr, config, reg, config_addr, &omask, mem_base, io_base); + + /* Ignore 64-bit BAR MSBs (always map in 32-bit space) */ + pci_decode_pci_addr(config->assigned[reg], + &flags, &space_code, &mask); + + if (space_code == MEMORY_SPACE_64) { + reg++; + } } if (rom_bar) { -- 1.7.10.4

1 1

The question ?
by Hacker 22 Feb '17

22 Feb '17

Where the tutorial to install openbios. Thanks

2 1

Detoke and the Openbios video console driver?
by Jd Lyons 19 Feb '17

19 Feb '17

I’ve been trying to add graphics acceleration to Qume-PPC and have a few questions about how Open Bios deals with FCode option roms. I noticed when I build Openbios, it creates a file called QEMU,VGA.bin. Is this file the video console driver for Openbios? I’d like to replace it with an FCode option rom from one of the proprietary Video cards supported by the Mac OS, is this feasible? What parts of Openbios would need to be changed to support proprietary FCode option roms from cards like the ATI,Rage 128 Pro? Would I need to rewrite some part of Openbios to support the VGA? The file QEMU,VGA doesn’t appear to be Tokenized, can Openbios deal with Tokenized option roms, or do I need to pass it a Detokenized Rom? I noticed Fcode-Utils has a detoke tool, I’d like to use it to detoke FCode roms, but I’m not sure of it’s usage, do I need to remove the PCI Header from the FCode rom? If so, how long is the header, is it a standard length, or does it vary from Rom to Rom? Thanks, JD

3 2

[PATCH 3/4 v3] arch/ppc/qemu: Add a node for the other (empty) PCI bus to the device tree
by BALATON Zoltan 15 Feb '17

15 Feb '17

QEMU emulates two of the three PCI buses found on real hardware because some clients seem to need both and fail with only one present, but OpenBIOS only handles a single PCI bus and initialises and puts in the device tree only one of these: the second one which is where devices are connected and also marks it bus 0. However, clients getting info from the device tree may not know about this and thinking there is only one PCI bus they erroneously use the address of the first bus to access PCI config registers for devices on the second bus which silently fails as these requests will go to the other empty bus emulated and return invalid values. Devices mapped via MMIO still appear to work but they may not be correctly initialised and some cards are not detected because of this. Until support for multiple PCI buses is implemented add an empty node in the device tree for the uninitialised bus to let clients know about it. This is still not entirely correct as bus-range property does not match real hardware but this fixes detecting PCI devices (such as USB) under MorphOS and may also fix enabling the bus master bit needed with some network cards and allow the workaround for this to be reverted. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- arch/ppc/qemu/init.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) v3: Move device tree patching in its own function and call it from init (otherwise same as v2, take which you like) v2: Move to init.c from tree.fs and only add it for mac99 Patches 1 and 2 from original series https://www.coreboot.org/pipermail/openbios/2016-November/009825.html https://www.coreboot.org/pipermail/openbios/2016-November/009824.html are still valid and needed, patch 4 was already applied so only this one (3/4) is resent but 1 and 2 should be applied as well with this. diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index ffbf08d..46a56a0 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -668,6 +668,48 @@ static void kvm_of_init(void) fword("finish-device"); } +static void empty_pci_bus_init(void) +{ + if (machine_id == ARCH_MAC99) { + /* Add empty node for first pci bus */ + /* Remove this when pci driver is fixed to handle multiple buses */ + activate_device("/"); + fword("new-device"); + push_str("pci"); + fword("device-name"); + push_str("pci"); + fword("device-type"); + PUSH(0xf0000000); + fword("encode-int"); + PUSH(0x02000000); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + PUSH(3); + fword("encode-int"); + push_str("#address-cells"); + fword("property"); + PUSH(2); + fword("encode-int"); + push_str("#size-cells"); + fword("property"); + PUSH(1); + fword("encode-int"); + push_str("#interrupt-cells"); + fword("property"); + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + push_str("bus-range"); + fword("property"); + fword("finish-device"); + device_end(); + } +} + /* * filll ( addr bytes quad -- ) */ @@ -755,6 +797,7 @@ arch_of_init(void) openbios_init(); modules_init(); setup_timers(); + empty_pci_bus_init(); #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif -- 2.7.4

2 3

[PATCH] mac-parts.c: restrict checking of partition status flags to CHRP partitions only
by Mark Cave-Ayland 13 Feb '17

13 Feb '17

Early versions of MacOS X don't correctly set the partition status flags when creating the OS partition. Relax the status flag checks so they are only applied to CHRP partitions which allows us to both meet the intention of the CHRP specification and also enable OpenBIOS to boot OS partitions from OSs such as MacOS X DPs. With thanks to Steven Troughton-Smith <steve(a)highcaffeinecontent.com> for the in-depth investigation. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- packages/mac-parts.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/packages/mac-parts.c b/packages/mac-parts.c index 16c87ca..d4faf71 100644 --- a/packages/mac-parts.c +++ b/packages/mac-parts.c @@ -158,32 +158,31 @@ macparts_open( macparts_info_t *di ) DPRINTF("found partition %d type: %s with status %x\n", i, par.pmPartType, __be32_to_cpu(par.pmPartStatus)); + /* Unfortunately Apple's OF implementation doesn't follow the OF PowerPC CHRP bindings + * and instead will brute-force boot the first valid partition it finds with a + * type of either "Apple_Boot", "Apple_HFS" or "DOS_FAT_". Here we store the id + * of the first partition that matches these criteria to use as a fallback later + * if required. */ + if (apple_parnum == -1 && + (strcmp(par.pmPartType, "Apple_Boot") == 0 || + strcmp(par.pmPartType, "Apple_Bootstrap") == 0 || + strcmp(par.pmPartType, "Apple_HFS") == 0 || + strcmp(par.pmPartType, "DOS_FAT_") == 0)) { + apple_parnum = i; + + DPRINTF("Located Apple OF fallback partition %d\n", apple_parnum); + } + /* If we have a valid, allocated and readable partition... */ if( (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && - (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { - - /* Unfortunately Apple's OF implementation doesn't follow the OF PowerPC CHRP bindings - * and instead will brute-force boot the first valid partition it finds with a - * type of either "Apple_Boot", "Apple_HFS" or "DOS_FAT_". Here we store the id - * of the first partition that matches these criteria to use as a fallback later - * if required. */ - - if (apple_parnum == -1 && - (strcmp(par.pmPartType, "Apple_Boot") == 0 || - strcmp(par.pmPartType, "Apple_Bootstrap") == 0 || - strcmp(par.pmPartType, "Apple_HFS") == 0 || - strcmp(par.pmPartType, "DOS_FAT_") == 0)) { - apple_parnum = i; - - DPRINTF("Located Apple OF fallback partition %d\n", apple_parnum); - } + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && + (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable) ) { /* If the partition is also bootable and the pmProcessor field matches "PowerPC" (insensitive * match), then according to the CHRP bindings this is our chosen partition */ for (j = 0; j < strlen(par.pmProcessor); j++) { par.pmProcessor[j] = tolower(par.pmProcessor[j]); - } + } if ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsBootValid) && strcmp(par.pmProcessor, "powerpc") == 0) { @@ -225,8 +224,7 @@ macparts_open( macparts_info_t *di ) if(! ((__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsValid) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsAllocated) && (__be32_to_cpu(par.pmPartStatus) & kPartitionAUXIsReadable)) ) { - DPRINTF("Partition %d is not valid, allocated and readable\n", parnum); - goto out; + DPRINTF("WARNING: Partition %d is not valid, allocated and readable\n", parnum); } ret = -1; @@ -235,7 +233,6 @@ macparts_open( macparts_info_t *di ) size = (long long)__be32_to_cpu(par.pmPartBlkCnt) * bs; if (want_bootcode) { - /* If size == 0 then fail because we requested bootcode but it doesn't exist */ size = (long long)__be32_to_cpu(par.pmBootSize); if (!size) { -- 1.7.10.4

1 1

Re: [OpenBIOS] Beginners How-To for DTS and OpenFirmware?
by Michael 13 Feb '17

13 Feb '17

Hello Zoltan, hey list, On Mon, Nov 21, 2016 at 07:15:21PM +0100, BALATON Zoltan wrote: > ... > For forth commands I've found this page useful (not sure if this is linked > from somewhere): > http://www.firmworks.com/QuickRef.html Thank you, I found this (and more) last week. The OLPC sites are the best for me: 1: http://wiki.laptop.org/go/Open_Firmware 2: http://wiki.laptop.org/go/Forth_Lessons 3: http://wiki.laptop.org/go/Cross_Compiling_Open_Firmware > ... > This is a bit confusing. There are multiple implementations of the IEEE > standard (commonly referred to as Open Firmware) and one of these is also > called Open Firmware. These are listed under Implementations on the left of > the page at www.openfirmware.info. Another implementation used by QEMU for Yes and I looked at them. But they are either very old or not usable for ppc (too much work to implement a new arch). > ... > talking about Open Firmware: the standard or the implementation with the > same name. One thing is left which confuses me: In wikipedia and you say, that you use the name "Open Firmware" (also, besides as name for a standard) for an implementation. OK. But the website gives the impression (and G 3 says), that the implementation has the name "OpenBIOS"... So I have two statements which don't fit well. Please remember that I am new to this and did not live through the history. > ... > Actually running OpenBIOS on real hardware is not something that is well > tested (I'm not sure if it was ever tried but I think it wasn't done > recently) so if you try to do that be prepared for likely needing some The OLPC project did it, e.g. > fixing. This is true for any implementation that does not support the > hardware you want to run it on, then you likely need to port it. That there will be the need for porting was clear. > ... > it's enough to have the basics in there. Not sure how much up to date is > this but this is discussed in the kernel documentation here: > https://www.kernel.org/doc/Documentation/devicetree/booting-without-of.txt > Thank you, I missed this source. > As for giving the device tree to OpenBIOS I think it should just know it or > construct it from discovering the hardware as the point of the device tree > is to describe the hardware for the operating system so the firmware should > know the hardware and provide the device tree. It does not get it from The "firmware" is our handmade init-assemblercode. It has to enable the machine (beginning from Adam...) to run C-code in its RAM. If there is no software-interface, then we provide the device-tree maybe in forth or in a blob. Just thinking loudly. > ... > In fact OpenBIOS does not have that many drivers but maybe the basics are > there, only the platform specific init code might need to be adapted for a That would be very nice. We give it a try. Maybe with help from you / the list. > new board. For ppc these would be in arch/ppc. Running on QEMU is quite a > bit simpler as we can skip a lot of init code (such as memory controller or > other hardware) so maybe these are not well implemented or buggy as they > were not tested with real hardware for a while. > ... Did you use OpenBIOS in a recent qemu and have you been able to remote-debug it there? I was able to load and run the old OpenBIOS code (from svn repo) on "qemu-system-ppc". Thank you for your time and suggestions, greetings, Michael

7 10

[PATCH 3/4 v2] arch/ppc/qemu: Add a node for the other (empty) PCI bus to the device tree
by BALATON Zoltan 27 Jan '17

27 Jan '17

QEMU emulates two of the three PCI buses found on real hardware because some clients seem to need both and fail with only one present, but OpenBIOS only handles a single PCI bus and initialises and puts in the device tree only one of these: the second one which is where devices are connected and also marks it bus 0. However, clients getting info from the device tree may not know about this and thinking there is only one PCI bus they erroneously use the address of the first bus to access PCI config registers for devices on the second bus which silently fails as these requests will go to the other empty bus emulated and return invalid values. Devices mapped via MMIO still appear to work but they may not be correctly initialised and some cards are not detected because of this. Until support for multiple PCI buses is implemented add an empty node in the device tree for the uninitialised bus to let clients know about it. This is still not entirely correct as bus-range property does not match real hardware but this fixes detecting PCI devices (such as USB) under MorphOS and may also fix enabling the bus master bit needed with some network cards and allow the workaround for this to be reverted. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- arch/ppc/qemu/init.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) v2: Move to init.c from tree.fs and only add it for mac99 Patches 1 and 2 from original series https://www.coreboot.org/pipermail/openbios/2016-November/009825.html https://www.coreboot.org/pipermail/openbios/2016-November/009824.html are still valid and needed, patch 4 was already applied so only this one (3/4) is resent but 1 and 2 should be applied as well with this. diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index ffbf08d..629d71b 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -755,6 +755,44 @@ arch_of_init(void) openbios_init(); modules_init(); setup_timers(); + if (machine_id == ARCH_MAC99) { + /* Add empty node for first pci bus */ + /* Remove this when pci driver is fixed to handle multiple buses */ + activate_device("/"); + fword("new-device"); + push_str("pci"); + fword("device-name"); + push_str("pci"); + fword("device-type"); + PUSH(0xf0000000); + fword("encode-int"); + PUSH(0x02000000); + fword("encode-int"); + fword("encode+"); + push_str("reg"); + fword("property"); + PUSH(3); + fword("encode-int"); + push_str("#address-cells"); + fword("property"); + PUSH(2); + fword("encode-int"); + push_str("#size-cells"); + fword("property"); + PUSH(1); + fword("encode-int"); + push_str("#interrupt-cells"); + fword("property"); + PUSH(0); + fword("encode-int"); + PUSH(0); + fword("encode-int"); + fword("encode+"); + push_str("bus-range"); + fword("property"); + fword("finish-device"); + device_end(); + } #ifdef CONFIG_DRIVER_PCI ob_pci_init(); #endif -- 2.7.4

2 2

SPARC32 : SMP
by Olivier Danet 27 Jan '17

27 Jan '17

I splitted the patch. It was tested with an old Linux distro (RH 4.2) and with NetBSD. The SMP kernel must be selected during install. Here is, for example, a NetBSD/sparc32 image with SMP enabled : temlib.org/pub/net702.qcow.bz2 qemu-system-sparc net702.qcow -M SS-20 -vga cg3 -smp 2 This SMP mode used to work a while ago, but it has so far no practical purpose as enabling it slows down QEMU considerably.

2 1

ping: vga patch
by G 3 13 Jan '17

13 Jan '17

Hi, I was wondering if you could manage to look at my vga patch.

1 0

[PATCH 2/2] SPARC32 : Fix SMP boot
by Olivier Danet 09 Jan '17

09 Jan '17

Only the first CPU shall clear the RAM. Signed-off-by: Olivier Danet <odanet(a)caramail.com> --- arch/sparc32/entry.S | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/arch/sparc32/entry.S b/arch/sparc32/entry.S index 7dc9fc8..74841c5 100644 --- a/arch/sparc32/entry.S +++ b/arch/sparc32/entry.S @@ -126,6 +126,17 @@ entry: or %g3, %g4, %g1 ! %g1 contains end of memory + ! Get CPU number + ! XXX: not all CPUs should have MXCC + set 0x1c00f00, %g2 + ldda [%g2] ASI_CONTROL, %g2 + srl %g3, 24, %g7 + subcc %g7, 8, %g7 + + ! Only the first CPU clears memory + bnz clear_done + nop + ! Get kernel address from configuration device ! NB: little endian format mov FW_CFG_KERNEL_ADDR, %g2 @@ -168,23 +179,6 @@ clear_done: set 0x2000, %g3 sub %g1, %g3, %g6 - ! Check if this is the boot CPU and skip SMP table check if yes - ! XXX: not all CPUs should have MXCC - set 0x1c00f00, %g2 - ldda [%g2] ASI_CONTROL, %g2 - srl %g3, 24, %g7 - sub %g7, 8, %g7 - tst %g7 - bz skip_table - nop - - ! Calculate SMP table location - set 0x1f0c, %g2 - add %g6, %g2, %g2 ! valid? - lda [%g2] ASI_M_BYPASS, %g7 - sta %g0, [%g2] ASI_M_BYPASS - -skip_table: ! Get machine ID from configuration device mov FW_CFG_MACHINE_ID, %g2 sub %g5, 2, %g5 @@ -217,14 +211,13 @@ ss10: ! Clear softints used for SMP CPU startup set PHYS_SS10_INTR0 + 0x04, %g1 - sll %g2, 12, %g2 + sll %g7, 12, %g2 add %g1, %g2, %g2 set 0xffffffff, %g1 sta %g1, [%g2] ASI_M_CTL ! clear softints add %g2, 4, %g2 sta %g0, [%g2] ASI_M_CTL ! clear softints -load_ctx: ! SMP init, jump to user specified address set 0x1f04, %g5 add %g6, %g5, %g5 ! ctxtbl -- 2.7.4

1 0

[PATCH 1/2] SPARC32: Remove SMP detection for SS-5
by Olivier Danet 09 Jan '17

09 Jan '17

SparcStation 5 can only use one CPU. Signed-off-by: Olivier Danet <odanet(a)caramail.com> --- arch/sparc32/entry.S | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/arch/sparc32/entry.S b/arch/sparc32/entry.S index 82aa88e..7dc9fc8 100644 --- a/arch/sparc32/entry.S +++ b/arch/sparc32/entry.S @@ -179,7 +179,7 @@ clear_done: nop ! Calculate SMP table location - set 0x1f0c, %g2 + set 0x1f0c, %g2 add %g6, %g2, %g2 ! valid? lda [%g2] ASI_M_BYPASS, %g7 sta %g0, [%g2] ASI_M_BYPASS @@ -205,36 +205,40 @@ skip_table: blu ss2 nop - ! Ok, this is SS-5 + ! Ok, this is SS-5, uniprocessor + ba first_cpu + nop +ss10: + ! Ok, this is SS-10/20 or SS-600MP tst %g7 bz first_cpu nop ! Clear softints used for SMP CPU startup - set PHYS_JJ_INTR0 + 0x04, %g1 + set PHYS_SS10_INTR0 + 0x04, %g1 sll %g2, 12, %g2 add %g1, %g2, %g2 set 0xffffffff, %g1 - sta %g1, [%g2] ASI_M_BYPASS ! clear softints + sta %g1, [%g2] ASI_M_CTL ! clear softints add %g2, 4, %g2 - sta %g0, [%g2] ASI_M_BYPASS ! clear softints + sta %g0, [%g2] ASI_M_CTL ! clear softints load_ctx: ! SMP init, jump to user specified address - set 0x1f04, %g5 + set 0x1f04, %g5 add %g6, %g5, %g5 ! ctxtbl lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CTPR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - set 0x1f00, %g5 + set 0x1f00, %g5 add %g6, %g5, %g5 ! ctx lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CXR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set context - set 0x1f08, %g5 + set 0x1f08, %g5 add %g6, %g5, %g5 ! entry lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS @@ -242,22 +246,6 @@ load_ctx: jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu -ss10: - ! Ok, this is SS-10 or SS-600MP - tst %g7 - bz first_cpu - nop - - ! Clear softints used for SMP CPU startup - set PHYS_SS10_INTR0 + 0x04, %g1 - sll %g2, 12, %g2 - add %g1, %g2, %g2 - set 0xffffffff, %g1 - sta %g1, [%g2] ASI_M_CTL ! clear softints - add %g2, 4, %g2 - b load_ctx - sta %g0, [%g2] ASI_M_CTL ! clear softints - ss2: ! Ok, this is SS-2 set ss2_error, %o2 -- 2.7.4

1 0

[PATCH 3/4] arch/ppc/qemu: Add a node for the other (empty) PCI bus to the device tree
by BALATON Zoltan 02 Jan '17

02 Jan '17

QEMU emulates two of the three PCI buses found on real hardware because some clients seem to need both and fail with only one present, but OpenBIOS only handles a single PCI bus and initialises and puts in the device tree only one of these: the second one which is where devices are connected and also marks it bus 0. However, clients getting info from the device tree may not know about this and thinking there is only one PCI bus they erroneously use the address of the first bus to access PCI config registers for devices on the second bus which silently fails as these requests will go to the other empty bus emulated and return invalid values. Devices mapped via MMIO still appear to work but they may not be correctly initialised and some cards are not detected because of this. Until support for multiple PCI buses is implemented add an empty node in the device tree for the uninitialised bus to let clients know about it. This is still not entirely correct as bus-range property does not match real hardware but this fixes detecting PCI devices (such as USB) under MorphOS and may also fix enabling the bus master bit needed with some network cards and allow the workarund for this to be reverted. Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- arch/ppc/qemu/tree.fs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/ppc/qemu/tree.fs b/arch/ppc/qemu/tree.fs index 5b6bbc6..e1708de 100644 --- a/arch/ppc/qemu/tree.fs +++ b/arch/ppc/qemu/tree.fs @@ -50,6 +50,18 @@ new-device h# ff800000 encode-int encode+ " ranges" property finish-device +\ Add empty node for first pci bus +\ Remove this when pci driver is fixed to handle multiple buses +new-device + " pci" device-name + " pci" device-type + h# f0000000 encode-int 02000000 encode-int encode+ " reg" property + 3 encode-int " #address-cells" property + 2 encode-int " #size-cells" property + 1 encode-int " #interrupt-cells" property + 0 encode-int 0 encode-int encode+ " bus-range" property +finish-device + \ ------------------------------------------------------------- \ /packages \ ------------------------------------------------------------- -- 2.7.4

2 4

The tilda character in OpenBIOS
by Programmingkid 02 Jan '17

02 Jan '17

When I push the tilda/grave-accent button, the character that shows up on OpenBIOS is the < or > character. Would you accept a patch that fixes this issue?

3 2

Trying to build /arm/mmp2 on Fedora 23 64 bit and getting just errors.
by madscientist 31 Dec '16

31 Dec '16

I am trying to build openfirmware for an Allwinner A13 board so it can have a means to call an OS. I had follow the instructions on the Wiki on my Fedora 23 x64 KDE machine, while i think i have the gnu toolchain properly installed, i just get a massive ammount of errors. That's what i get after make -i... [madscientist@localhost arm]$ cd mmp2 [madscientist@localhost mmp2]$ ls addrs.fth config.fth fw.bth make-sdkit.sh physaddr.fth sdkit.fth timer.fth apbc.fth ddr_elpida_512m.fth galcore.fth mdma.fth pmua.fth sdkit.sh twsi.fth boardgpio.fth devices.fth gpio.fth mfpr.fth probemem.fth sdregs.fth twsi-node.fth boardtwsi.fth dma.fth hash.fth mmp2.bth random.fth showirqs.fth twsi-package.fth boot.fth draminit.fth hwaddrs.fth mmuon.fth rawboot.fth soc-config.fth uart.fth build dramrecal.fth initmmu.fth ntim_mmp2_nand_cforth_ddr_elpida_512m.fth rootnode.fth socregs.fth ulpiphy.fth cforth.bth dsi.fth irq.fth ntim_mmp2_nand_ofw_ddr_elpida_512m.fth rtc.fth sp.bth virtaddr.fth clocks-complex.fth fast-scroll.patch keypad.fth ntim_mmp2_nand_ofwonly_ddr_elpida_512m.fth sdhcimmp2.fth spimaster.fth wakeups.fth clockset.fth fuse.fth lcdcfg.fth ntim_mmp2_nand_uboot_ddr_elpida_512m.fth sdkit-arm sspspi.fth watchdog.fth clocks.fth fusepgm.fth lcd.fth ofw.bth sdkit-arm.tgz thermal.fth [madscientist@localhost mmp2]$ cd build [madscientist@localhost build]$ make make[1]: Entering directory '/home/madscientist/Desktop/openfirmware/cpu/x86/Linux' cc -c -O -g -m32 -DTARGET_X86 ../../../forth/wrapper/wrapper.c -o wrapper.o In file included from /usr/include/features.h:389:0, from /usr/include/stdio.h:27, from ../../../forth/wrapper/wrapper.c:55: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:56: recipe for target 'wrapper.o' failed make[1]: *** [wrapper.o] Error 1 make[1]: Leaving directory '/home/madscientist/Desktop/openfirmware/cpu/x86/Linux' Makefile:25: recipe for target '../../../x86/Linux/forth' failed make: *** [../../../x86/Linux/forth] Error 2 [madscientist@localhost build]$ make -i make[1]: Entering directory '/home/madscientist/Desktop/openfirmware/cpu/x86/Linux' cc -c -O -g -m32 -DTARGET_X86 ../../../forth/wrapper/wrapper.c -o wrapper.o In file included from /usr/include/features.h:389:0, from /usr/include/stdio.h:27, from ../../../forth/wrapper/wrapper.c:55: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:56: recipe for target 'wrapper.o' failed make[1]: [wrapper.o] Error 1 (ignored) cc -c -O -g -m32 -DTARGET_X86 ../../../forth/wrapper/logger.c -o logger.o In file included from /usr/include/features.h:389:0, from /usr/include/stdio.h:27, from ../../../forth/wrapper/logger.c:16: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:56: recipe for target 'logger.o' failed make[1]: [logger.o] Error 1 (ignored) cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/adler32.c -o adler32.o In file included from /usr/include/features.h:389:0, from /usr/include/sys/types.h:25, from ../../../forth/wrapper/zip/zconf.h:364, from ../../../forth/wrapper/zip/zlib.h:34, from ../../../forth/wrapper/zip/zutil.h:22, from ../../../forth/wrapper/zip/adler32.c:8: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:59: recipe for target 'adler32.o' failed make[1]: [adler32.o] Error 1 (ignored) cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/compress.c -o compress.o In file included from /usr/include/features.h:389:0, from /usr/include/sys/types.h:25, from ../../../forth/wrapper/zip/zconf.h:364, from ../../../forth/wrapper/zip/zlib.h:34, from ../../../forth/wrapper/zip/compress.c:9: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:59: recipe for target 'compress.o' failed make[1]: [compress.o] Error 1 (ignored) cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/crc32.c -o crc32.o In file included from /usr/include/features.h:389:0, from /usr/include/sys/types.h:25, from ../../../forth/wrapper/zip/zconf.h:364, from ../../../forth/wrapper/zip/zlib.h:34, from ../../../forth/wrapper/zip/zutil.h:22, from ../../../forth/wrapper/zip/crc32.c:29: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:59: recipe for target 'crc32.o' failed make[1]: [crc32.o] Error 1 (ignored) cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/deflate.c -o deflate.o In file included from /usr/include/features.h:389:0, from /usr/include/sys/types.h:25, from ../../../forth/wrapper/zip/zconf.h:364, from ../../../forth/wrapper/zip/zlib.h:34, from ../../../forth/wrapper/zip/zutil.h:22, from ../../../forth/wrapper/zip/deflate.h:16, from ../../../forth/wrapper/zip/deflate.c:52: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:59: recipe for target 'deflate.o' failed make[1]: [deflate.o] Error 1 (ignored) cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/trees.c -o trees.o In file included from /usr/include/features.h:389:0, from /usr/include/sys/types.h:25, from ../../../forth/wrapper/zip/zconf.h:364, from ../../../forth/wrapper/zip/zlib.h:34, from ../../../forth/wrapper/zip/zutil.h:22, from ../../../forth/wrapper/zip/deflate.h:16, from ../../../forth/wrapper/zip/trees.c:37: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:59: recipe for target 'trees.o' failed make[1]: [trees.o] Error 1 (ignored) cc -c -O -g -m32 -DTARGET_X86 -I../../../forth/wrapper/zip ../../../forth/wrapper/zip/zutil.c -o zutil.o In file included from /usr/include/features.h:389:0, from /usr/include/sys/types.h:25, from ../../../forth/wrapper/zip/zconf.h:364, from ../../../forth/wrapper/zip/zlib.h:34, from ../../../forth/wrapper/zip/zutil.h:22, from ../../../forth/wrapper/zip/zutil.c:8: /usr/include/gnu/stubs.h:7:27: fatal error: gnu/stubs-32.h: No such file or directory compilation terminated. Makefile:59: recipe for target 'zutil.o' failed make[1]: [zutil.o] Error 1 (ignored) cc -m32 -o forth wrapper.o logger.o adler32.o compress.o crc32.o deflate.o inflate.o trees.o zutil.o cc: error: wrapper.o: No such file or directory cc: error: logger.o: No such file or directory cc: error: adler32.o: No such file or directory cc: error: compress.o: No such file or directory cc: error: crc32.o: No such file or directory cc: error: deflate.o: No such file or directory cc: error: trees.o: No such file or directory cc: error: zutil.o: No such file or directory Makefile:43: recipe for target 'forth' failed make[1]: [forth] Error 1 (ignored) make[1]: Leaving directory '/home/madscientist/Desktop/openfirmware/cpu/x86/Linux' ./build ofw.rom ./build: line 85: /home/madscientist/Desktop/openfirmware/cpu/x86/Linux/forth: No such file or directory Makefile:22: recipe for target 'ofw.rom' failed make: [ofw.rom] Error 127 (ignored) sed: can't read ../../build/*.tag: No such file or directory sed: can't read *.tag: No such file or directory [madscientist@localhost build]$https://www.openfirmware.info/Building_OFW_for_ARM Is something else i can do on my system looking towards building the binary? Do i have to install x86 32bit libraries or something else? Respect the Allwinner A13, is is the best choice for using this firmware or should i try something else?

2 1

SPARC32 : Fix SMP Boot
by Olivier Danet 31 Dec '16

31 Dec '16

Only the first CPU should clear the RAM Signed-off-by: Olivier Danet <odanet(a)caramail.com> -------------------- diff --git a/arch/sparc32/entry.S b/arch/sparc32/entry.S index 82aa88e..0374f0c 100644 --- a/arch/sparc32/entry.S +++ b/arch/sparc32/entry.S @@ -125,6 +125,17 @@ entry: sll %g3, 24, %g3 or %g3, %g4, %g1 ! %g1 contains end of memory + + ! Get CPU number + ! XXX: not all CPUs should have MXCC + set 0x1c00f00, %g2 + ldda [%g2] ASI_CONTROL, %g2 + srl %g3, 24, %g7 + subcc %g7, 8, %g7 + + ! Only the first CPU clears memory + bnz clear_done + nop ! Get kernel address from configuration device ! NB: little endian format @@ -146,6 +157,9 @@ entry: sll %g3, 24, %g3 or %g3, %g4, %g4 + mov 0,%l0 + mov 0,%l1 + ! If kernel address is set, don't clear from base of RAM in order to ! leave the kernel image intact mov 0, %g6 @@ -157,8 +171,8 @@ entry: set 0x1000000, %g6 clear_mem: - sta %g0, [%g6] ASI_M_BYPASS - add %g6, 0x4, %g6 + stda %l0, [%g6] ASI_M_BYPASS + add %g6, 0x8, %g6 cmp %g6, %g1 bl clear_mem nop @@ -168,23 +182,6 @@ clear_done: set 0x2000, %g3 sub %g1, %g3, %g6 - ! Check if this is the boot CPU and skip SMP table check if yes - ! XXX: not all CPUs should have MXCC - set 0x1c00f00, %g2 - ldda [%g2] ASI_CONTROL, %g2 - srl %g3, 24, %g7 - sub %g7, 8, %g7 - tst %g7 - bz skip_table - nop - - ! Calculate SMP table location - set 0x1f0c, %g2 - add %g6, %g2, %g2 ! valid? - lda [%g2] ASI_M_BYPASS, %g7 - sta %g0, [%g2] ASI_M_BYPASS - -skip_table: ! Get machine ID from configuration device mov FW_CFG_MACHINE_ID, %g2 sub %g5, 2, %g5 @@ -205,36 +202,39 @@ skip_table: blu ss2 nop - ! Ok, this is SS-5 + ! Ok, this is SS-5, uniprocessor + ba first_cpu + nop +ss10: + ! Ok, this is SS-10/20 or SS-600MP tst %g7 bz first_cpu nop - ! Clear softints used for SMP CPU startup - set PHYS_JJ_INTR0 + 0x04, %g1 - sll %g2, 12, %g2 + ! SMP init, clear softints, which are used for starting non-boot CPUs + set PHYS_SS10_INTR0 + 0x04, %g1 + sll %g7, 12, %g2 add %g1, %g2, %g2 set 0xffffffff, %g1 - sta %g1, [%g2] ASI_M_BYPASS ! clear softints + sta %g1, [%g2] ASI_M_CTL ! clear softints add %g2, 4, %g2 - sta %g0, [%g2] ASI_M_BYPASS ! clear softints + sta %g0, [%g2] ASI_M_CTL ! clear softints -load_ctx: ! SMP init, jump to user specified address - set 0x1f04, %g5 + set 0x1f04, %g5 add %g6, %g5, %g5 ! ctxtbl lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CTPR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set ctx table ptr - set 0x1f00, %g5 + set 0x1f00, %g5 add %g6, %g5, %g5 ! ctx lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS set AC_M_CXR, %g1 sta %g2, [%g1] ASI_M_MMUREGS ! set context - set 0x1f08, %g5 + set 0x1f08, %g5 add %g6, %g5, %g5 ! entry lda [%g5] ASI_M_BYPASS, %g2 sta %g0, [%g5] ASI_M_BYPASS @@ -242,22 +242,6 @@ load_ctx: jmp %g2 ! jump to kernel sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu -ss10: - ! Ok, this is SS-10 or SS-600MP - tst %g7 - bz first_cpu - nop - - ! Clear softints used for SMP CPU startup - set PHYS_SS10_INTR0 + 0x04, %g1 - sll %g2, 12, %g2 - add %g1, %g2, %g2 - set 0xffffffff, %g1 - sta %g1, [%g2] ASI_M_CTL ! clear softints - add %g2, 4, %g2 - b load_ctx - sta %g0, [%g2] ASI_M_CTL ! clear softints - ss2: ! Ok, this is SS-2 set ss2_error, %o2

2 1

[PATCH 4/4] ppc: Fix PCI interrupt routing to match what qemu does
by BALATON Zoltan 24 Nov '16

24 Nov '16

From: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> --- drivers/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) This should be commited after this change in QEMU: http://lists.nongnu.org/archive/html/qemu-devel/2016-11/msg03740.html diff --git a/drivers/pci.c b/drivers/pci.c index 7ad5202..c998280 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -1565,7 +1565,7 @@ static void ob_pci_host_set_interrupt_map(phandle_t host) ncells += pci_encode_phys_addr(props + ncells, 0, 0, addr, 0, 0); props[ncells++] = intno; props[ncells++] = dnode; - props[ncells++] = arch->irqs[intno - 1]; + props[ncells++] = arch->irqs[((intno - 1) + (addr >> 11)) & 3]; props[ncells++] = 1; #else /* Keep compiler quiet */ -- 2.7.4

2 3

Re: [OpenBIOS] Beginners How-To for DTS and OpenFirmware?
by Tarl Neustaedter 23 Nov '16

23 Nov '16

On 2016-Nov-22 09:22 , Artyom Tarasenko wrote: > That's a very interesting point. Does EFI actually have any advantages > over IEEE 1275? * It's supported by Intel and many hardware vendors (drivers for their chips) * It has huge libraries to do many interesting things (from IPv6 to debuggers), so system builders have many options that don't require writing things from scratch. * It's written in C. At one point, I was informed that the biggest advantage was that it didn't require Forth programmers. From a management viewpoint, that is significant, finding good Forth programmers is a pain in the tush. Growing your own forth programmers isn't easy, it takes a long time for someone to learn how to write clean and maintainable Forth. And with today's larger PROMs, Forth's compactness is no longer as important. > For instance, Apple moved to EFI, but was their real motivation? > Did they just wanted to ditch Forth? I have no actual visibility into Apple's motivations, but my assumption would be that with the move to x86, the change to EFI made sense to them.

1 0

Re: [OpenBIOS] [Qemu-ppc] Debug logs for USB on MorphOS
by BALATON Zoltan 22 Nov '16

22 Nov '16

On Fri, 11 Nov 2016, BALATON Zoltan wrote: > For those interested in more details it seems that the pciusb.device driver > finds the OHCI chip in QEMU but does not like it and does not claim or try to > initialise it for some reason. It wasn't too easy to find it but it turned out to be caused by a mismatch between what's emulated in QEMU and what OpenBIOS put in the device tree so when trying to access the config registers of PCI bus 1 MorphOS ended up using PCI bus 0 which of course returned an error. After this was fixed the USB controller is found but patches from BenH to fix the interrupt was also needed for it to work. Patches submitted to OpenBIOS and QEMU. > The usefulness of this activity may not be direct as MorphOS may not ever run [...] > on) but the bugs found and fixed during this do help making the device models > in QEMU more accurate and help running other OSes. I think some of the bugs > fixed this way in OpenBIOS and QEMU also helped to get MacOS running so I > like to believe there are at least some indirect usefulness of this. MorphOS now has input but still lacks some way to output video (this still needs some work). But if other OSes had the same problem fixed here then this may fix the enabling of the bus master bit for some network cards so the patch added for that in OpenBIOS may not be needed now and fixing the interrupt may improve mouse or sound behaviour on MacOS. I haven't tested these, just verified that MacOS 9 and Linux still boots with these patches. Regards, BALATON Zoltan

2 1

Beginners How-To for DTS and OpenFirmware?
by Michael 22 Nov '16

22 Nov '16

Dear list, thank you for the help with cross-compiling for ppc64 so far! It is important but I overjumped enthusiastically the OF basics :-) I read many webpages, hints and maybe old sites etc and solved many things. But is there a "beginners how-to" somewhere? What I would find most usefull: 1) Best source-code to use? There is a version-1.1.zip, a svn repo and a git repo. 2) The names are also a bit confusing when you see it first. I know about the IEEE standard and a few things about the history (from wikipedia), but if you for example visit the website and click on the "openfirmware" link, the you see a page with "OpenBIOS" heading. So even if one knows about history, there is confusion about actual used names. 3) How is the device-tree given to OF? And how does OF handle it over to a linux kernel? 4) Minimal prerequisites on a new hardware, so that OF is able to run? E.g. which type of RAM does it need? Does it need a stack or .text segment or other things to run (like c-code)? ... If these points would be clarified, the it would be much easier for new people to help with e.g. additional targets or maybe new architectures. Thanks for your time! Greetings, Michael

4 4

Error when crosscompiling for qemu-ppc64
by Michael 21 Nov '16

21 Nov '16

Hello list! A few days ago I found this openfirmware and the forth in it and wanted to try it out in a project for powerpc (64 bit). My openbios version is latest from git (master), last patch from 2016-10-09 (1dc4f162efc0f00a36126cab8e7b906335f6b706). I used this because the version 1.1 has two bugs I stumbled upon. I am cross-compiling on amd64 (host with debian) for ppc64 target and therefore call the script "switch-arch qemu-ppc64". The settings in the generated files under obj-ppc64 look OK to me. But (there is allways this "but") I have a compile error: moew@debhost:~/OpenFirmware/openbios# make GEN bootstrap.dict panic: segmentation violation at 0xdf1ec62c dict=0x7f0edf1ec010 here=0x7f0edf1ec638(dict+0x628) pc=0x0(dict+0x20e13ff0) dstackcnt=0 rstackcnt=0 instruction=deadbeef dstack: 0x0 rstack: 0x0 Writing dictionary core file rules.mak:68: recipe for target 'bootstrap.dict' failed make: *** [bootstrap.dict] Error 1 It seems that the generating of the forth dictionary fails? Where can I get more information? The logs contain not much more info. When I compile the same sources for target amd64, then it builds and works. Thank you for reading (and maybe for helping)! Michael

4 14

[PATCH 2/4] pci: Do not use hard coded name for pci bus, get it from phandle instead
by BALATON Zoltan 20 Nov '16

20 Nov '16

Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- drivers/pci.c | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/drivers/pci.c b/drivers/pci.c index b75ca0f..7ad5202 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -1481,27 +1481,35 @@ static void ob_pci_host_set_interrupt_map(phandle_t host) #if defined(CONFIG_PPC) phandle_t target_node; + char *path, buf[256]; /* Oldworld macs do interrupt maps differently */ if (!is_newworld()) return; + PCI_DPRINTF("setting up interrupt map for host %x\n", host); dnode = dt_iterate_type(0, "open-pic"); - if (dnode) { + path = get_path_from_ph(host); + if (dnode && path) { /* patch in openpic interrupt-parent properties */ - target_node = find_dev("/pci/mac-io"); + snprintf(buf, sizeof(buf), "%s/mac-io", path); + target_node = find_dev(buf); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/escc/ch-a"); + snprintf(buf, sizeof(buf), "%s/mac-io/escc/ch-a", path); + target_node = find_dev(buf); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/escc/ch-b"); + snprintf(buf, sizeof(buf), "%s/mac-io/escc/ch-b", path); + target_node = find_dev(buf); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/escc-legacy/ch-a"); + snprintf(buf, sizeof(buf), "%s/mac-io/escc-legacy/ch-a", path); + target_node = find_dev(buf); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/escc-legacy/ch-b"); + snprintf(buf, sizeof(buf), "%s/mac-io/escc-legacy/ch-b", path); + target_node = find_dev(buf); set_int_property(target_node, "interrupt-parent", dnode); /* QEMU only emulates 2 of the 3 ata buses currently */ @@ -1510,16 +1518,19 @@ static void ob_pci_host_set_interrupt_map(phandle_t host) * On g3beige they all called just ide. * We take 2 x ata-3 buses which seems to work for * at least the clients we care about */ - target_node = find_dev("/pci/mac-io/ata-3@20000"); + snprintf(buf, sizeof(buf), "%s/mac-io/ata-3@20000", path); + target_node = find_dev(buf); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/ata-3@21000"); + snprintf(buf, sizeof(buf), "%s/mac-io/ata-3@21000", path); + target_node = find_dev(buf); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/via-cuda"); + snprintf(buf, sizeof(buf), "%s/mac-io/via-cuda", path); + target_node = find_dev(buf); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci"); + target_node = find_dev(path); set_int_property(target_node, "interrupt-parent", dnode); } #else -- 2.7.4

1 0

[PATCH 1/4] pci: Use get_path_from_ph() function from libopenbios
by BALATON Zoltan 20 Nov '16

20 Nov '16

Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- drivers/pci.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/pci.c b/drivers/pci.c index 92a02d4..b75ca0f 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -671,10 +671,7 @@ static void ob_pci_reload_device_path(phandle_t phandle, pci_config_t *config) { /* since "name" and "reg" are now assigned we need to reload current node name */ - - PUSH(phandle); - fword("get-package-path"); - char *new_path = pop_fstr_copy(); + char *new_path = get_path_from_ph(phandle); if (new_path) { if (0 != strcmp(config->path, new_path)) { PCI_DPRINTF("\n=== CHANGED === package path old=%s new=%s\n", -- 2.7.4

1 0

[PATCH 1/6] Fix encoding of PCI and IDE "interrupts" properties
by Benjamin Herrenschmidt 07 Nov '16

07 Nov '16

The main IDE interrupt and the PCI LSIs are level sensitive which is represented by a "1" in the device-tree. Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> --- drivers/ide.c | 2 +- drivers/pci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ide.c b/drivers/ide.c index 1da60c8..53a0b80 100644 --- a/drivers/ide.c +++ b/drivers/ide.c @@ -1630,7 +1630,7 @@ int macio_ide_init(const char *path, uint32_t addr, int nb_channels) props[2] = 0x00000000; break; } - props[1] = 0x00000000; /* XXX level triggered on real hw */ + props[1] = 0x00000001; props[3] = 0x00000000; NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 4*sizeof(props[0]))); diff --git a/drivers/pci.c b/drivers/pci.c index 5062f30..2cffa2f 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -1510,7 +1510,7 @@ static void ob_pci_host_set_interrupt_map(phandle_t host) props[ncells++] = intno; props[ncells++] = dnode; props[ncells++] = arch->irqs[intno - 1]; - props[ncells++] = 3; + props[ncells++] = 1; #else /* Keep compiler quiet */ dnode = dnode; -- 2.7.4

8 32

[PATCH 0/9] Milax (OpenSolaris) bringup patchset
by Mark Cave-Ayland 28 Oct '16

28 Oct '16

Following on from the previous work, this patchset gets tantalisingly close to bringing up a 64-bit Milax (OpenSolaris) kernel under qemu-system-sparc64: $ ./qemu-system-sparc64 -bios openbios-builtin.elf.nostrip -cdrom milax032sparc.iso -nographic -boot d -m 256 OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.1 built on Oct 23 2016 13:36 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 7084 bytes entry point is 0x4000 Evaluating FCode... Evaluating FCode... Ignoring failed claim for va 1000000 memsz bf34e! Ignoring failed claim for va 1402000 memsz 303b3! Ignoring failed claim for va 1800000 memsz 60a30! SunOS Release 5.11 Version MilaX_0.3.2 64-bit Copyright 1983-2008 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. could not find debugger-vocabulary-hook>threads:interpret: exception -13 caught interpret \ ident "%Z%%M% %I% %E% SMI" \ Copyright 2005 Sun Microsystems, Inc. All rights reserved. \ Use is subject to license terms. \ \ CDDL HEADER START \ \ The contents of this file are subject to the terms of the \ Common Development and Distribution License, Version 1.0 only \ (the "License"). You may not use this file except in compliance \ with the License. \ \ You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE \ or http://www.opensolaris.org/os/licensing. \ See the License for unix-tte:interpret: exception -13 caught interpret ' unix-tte is va>tte-data failed with error ffffffffffffffed WARNING: consconfig: cannot find driver for screen device /pci@1fe,0/QEMU,VGA@2 Remounting root read/write Probing for device nodes ... WARNING: pcipsy0: unable to map reg entry 1 Preparing live image for use WARNING: pcipsy0: unable to map reg entry 1 WARNING: pcipsy0: unable to map reg entry 1 Hostname: milax Requesting System Maintenance Mode (See /lib/svc/share/README for more information.) Console login service(s) cannot run Root password for system maintenance (control-d to bypass): Sadly at this point the console (and eventually QEMU) lock up hard which suggests an emulation bug hiding away somewhere, and I do occasionally see intermittent kernel panics on boot. Having said that, this is still a significant milestone :) Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (9): SPARC64: add %tba to saved state context SPARC64: make sure globals are stored in the CPU context during I/D MMU traps SPARC64: comment out the context switch debug message SPARC64: increase Forth machine memory to 192K SPARC64: add support for kmdb kernel debugger SPARC64: add spacec@, spacew@, spacel@ and spacex@ Forth words SPARC64: set up small iomem region for memory-mapped devices SPARC64: memory map mk48t59 RTC and store its address in the device tree SPARC64: ensure the E (effect) bit is set for PROM TTE entries arch/sparc64/boot.h | 1 + arch/sparc64/call-client.S | 12 --- arch/sparc64/context.c | 2 +- arch/sparc64/context.h | 4 +- arch/sparc64/cpu.fs | 11 ++- arch/sparc64/cpustate.h | 13 ++- arch/sparc64/entry.S | 9 +- arch/sparc64/ldscript | 2 +- arch/sparc64/lib.c | 7 ++ arch/sparc64/ofmem_sparc64.c | 8 +- arch/sparc64/openbios.c | 144 ++++++++++++++++++++++++++++++- arch/sparc64/spitfire.h | 1 + arch/sparc64/vectors.S | 196 +++++++++++++++++++++++++++++++++++++++++- drivers/pci.c | 14 +++ 14 files changed, 387 insertions(+), 37 deletions(-) -- 1.7.10.4

2 12

[PATCH 0/3] Limit upper virtual memory range to ofmem_arch_get_virt_top()
by Mark Cave-Ayland 23 Oct '16

23 Oct '16

Some further work on trying to boot Solaris under qemu-system-sparc64 shows that allowing the full virtual memory range in the available property causes the memory list calculations to overflow. The first couple of patches fix up SPARC32/SPARC64 to set the appropriate upper virtual memory limits (PPC is already correct), whilst the last patch enables the upper limit in the OFMEM virtual memory allocator. With this patchset applied, 64-bit Solaris 9 gets beyond the "VAC too big!" panic upon boot and fails further down the line trying to setup the kernel memory regions. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (3): SPARC32: fixup available memory list and modify ofmem_arch_get_virt_top() SPARC64: set upper bound for virtual memory allocations libopenbios: limit upper virtual memory range to ofmem_arch_get_virt_top() arch/sparc32/boot.c | 2 +- arch/sparc64/ofmem_sparc64.c | 2 +- include/arch/sparc32/ofmem_sparc32.h | 2 +- include/arch/sparc64/ofmem_sparc64.h | 2 ++ libopenbios/ofmem_common.c | 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) -- 1.7.10.4

1 4

[PATCH] ppc: don't use virtual image stack for startup context
by Mark Cave-Ayland 23 Oct '16

23 Oct '16

Part of commit 070ea60 created a new stack within the virtual image for use by the startup context. Unfortunately the current implementations of virt_to_phys() as used by some drivers are incorrect which causes issues with some parts of OpenBIOS, notably the USB stack. Revert back to using the initial stack in start.S which ensures a 1:1 mapping between virtual and physical addresses to avoid such problems. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- arch/ppc/qemu/context.c | 1 - arch/ppc/qemu/ldscript | 6 +----- arch/ppc/qemu/start.S | 6 ++++++ include/arch/ppc/io.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/ppc/qemu/context.c b/arch/ppc/qemu/context.c index 18459b8..65cd4e4 100644 --- a/arch/ppc/qemu/context.c +++ b/arch/ppc/qemu/context.c @@ -41,7 +41,6 @@ void of_client_callback(void); * to start us up. */ static struct context main_ctx = { - .sp = (unsigned long) &_estack - SAVE_SPACE, .pc = (unsigned long) start_main, .return_addr = (unsigned long) __exit_context, }; diff --git a/arch/ppc/qemu/ldscript b/arch/ppc/qemu/ldscript index 11ebf4b..8027b39 100644 --- a/arch/ppc/qemu/ldscript +++ b/arch/ppc/qemu/ldscript @@ -51,11 +51,7 @@ SECTIONS *(.bss) *(.bss.*) *(COMMON) - - _stack = .; - . += CSTACK_SIZE; - . = ALIGN(16); - _estack = .; + _ebss = .; } . = HRESET_ADDR; diff --git a/arch/ppc/qemu/start.S b/arch/ppc/qemu/start.S index 33ca1e0..fed1b55 100644 --- a/arch/ppc/qemu/start.S +++ b/arch/ppc/qemu/start.S @@ -482,6 +482,12 @@ real_entry: #endif bl BRANCH_LABEL(setup_mmu) + + /* load stack pointer into context */ + LOAD_REG_IMMEDIATE(r4, __context) + PPC_LL r4, 0(r4) + PPC_STL r1, (2 * ULONG_SIZE)(r4) + bl BRANCH_LABEL(__switch_context_nosave) 1: nop b 1b diff --git a/include/arch/ppc/io.h b/include/arch/ppc/io.h index 39c60d7..3449c5b 100644 --- a/include/arch/ppc/io.h +++ b/include/arch/ppc/io.h @@ -6,7 +6,7 @@ #define NO_QEMU_PROTOS #include "arch/common/fw_cfg.h" -extern char _start, _end, _estack; +extern char _start, _end; extern unsigned long virt_offset; #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) -- 1.7.10.4

1 1

[PATCH] drivers/usb: Fix compiling with USB debugging enabled
by BALATON Zoltan 22 Oct '16

22 Oct '16

Signed-off-by: BALATON Zoltan <balaton(a)eik.bme.hu> --- drivers/usb.c | 2 +- drivers/usbhid.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb.c b/drivers/usb.c index c6e3717..88b7580 100644 --- a/drivers/usb.c +++ b/drivers/usb.c @@ -555,7 +555,7 @@ usb_detach_device(hci_t *controller, int devno) int usb_attach_device(hci_t *controller, int hubaddress, int port, int speed) { -#ifdef CONFIG_USB_DEBUG +#ifdef CONFIG_DEBUG_USB static const char* speeds[] = { "full", "low", "high" }; usb_debug ("%sspeed device\n", (speed <= 2) ? speeds[speed] : "invalid value - no"); #endif diff --git a/drivers/usbhid.c b/drivers/usbhid.c index a423278..dcd4ce6 100644 --- a/drivers/usbhid.c +++ b/drivers/usbhid.c @@ -60,7 +60,7 @@ NODE_METHODS( usb_kbd ) = { { "read", keyboard_read }, }; -#ifdef CONFIG_USB_DEBUG +#ifdef CONFIG_DEBUG_USB static const char *boot_protos[3] = { "(none)", "keyboard", "mouse" }; #endif typedef enum { hid_proto_boot = 0, hid_proto_report = 1 } hid_proto; -- 2.7.4

2 1

Re: [OpenBIOS] OpenBIOS documentation
by Programmingkid 21 Oct '16

21 Oct '16

On Oct 17, 2016, at 3:05 AM, Mark Cave-Ayland wrote: > On 17/10/16 02:37, Programmingkid wrote: > >> I did your suggestion and OpenBIOS compiled without errors or warnings. >> I tried testing the change with a USB keyboard. No characters displayed. >> I then removed the changes and tried the USB keyboard again. No characters >> displayed. It looks like USB keyboards do not work in OpenBIOS. >> >> Here is the command-line I used: >> qemu-system-ppc -M mac99 -device usb-kbd -bios openbios-qemu.elf.nostrip > > Regression in QEMU? I can't say for sure. This is my first time using the USB keyboard in OpenBIOS. > Do USB keyboards work with your new OpenBIOS used > with a vanilla 2.7 release? It does not. Did USB keyboard ever work with OpenBIOS? The OpenBIOS binary that comes with QEMU doesn't even work. My test was with this command-line: qemu-system-ppc -usb -device usb-kbd

3 4

Re: [OpenBIOS] OpenBIOS documentation
by Programmingkid 17 Oct '16

17 Oct '16

Here is the better version of the patch I sent you earlier. The first patch will make OpenBIOS compile without warnings or errors, but doesn't make USB work. This patch is an attempt to make USB work. It looks like changes were made to the original code to make it compile in OpenBIOS. These changes may have disabled the OHCI code. https://chromium.googlesource.com/chromiumos/third_party/coreboot/+/ecec80e… This page has very similar code to usbohci.c has. Using this page I filled in what I thought were the missing function calls. My changes no longer allow OpenBIOS to boot, so consider this a work in progress for now. --- drivers/usbohci.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/usbohci.c b/drivers/usbohci.c index 774164b..222ab37 100644 --- a/drivers/usbohci.c +++ b/drivers/usbohci.c @@ -227,14 +227,14 @@ ohci_init (void *bar) OHCI_INST (controller)->opreg->HcCommandStatus = __cpu_to_le32(HostControllerReset); udelay (10); /* at most 10us for reset to complete. State must be set to Operational within 2ms (5.1.1.4) */ OHCI_INST (controller)->opreg->HcFmInterval = interval; - ofmem_posix_memalign((void **)&(OHCI_INST (controller)->hcca), 256, 256); + ofmem_posix_memalign((void *)(OHCI_INST (controller)->hcca), 256, 256); memset((void*)OHCI_INST (controller)->hcca, 0, 256); usb_debug("HCCA addr %p\n", OHCI_INST(controller)->hcca); /* Initialize interrupt table. */ u32 *const intr_table = OHCI_INST(controller)->hcca->HccaInterruptTable; - ed_t *const periodic_ed; - ofmem_posix_memalign((void **)&periodic_ed, sizeof(ed_t), sizeof(ed_t)); + ed_t *const periodic_ed = (ed_t *)malloc(sizeof(ed_t)); + ofmem_posix_memalign((void *)periodic_ed, sizeof(ed_t), sizeof(ed_t)); memset((void *)periodic_ed, 0, sizeof(*periodic_ed)); for (i = 0; i < 32; ++i) intr_table[i] = __cpu_to_le32(virt_to_phys(periodic_ed)); @@ -378,8 +378,8 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen int pages = (dalen==0)?0:(last_page - first_page + 1); /* First TD. */ - td_t *const first_td; - ofmem_posix_memalign((void **)&first_td, sizeof(td_t), sizeof(td_t)); + td_t *const first_td = (td_t *)malloc(sizeof(td_t)); + ofmem_posix_memalign((void *)first_td, sizeof(td_t), sizeof(td_t)); memset((void *)first_td, 0, sizeof(*first_td)); cur = first_td; @@ -393,8 +393,8 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen while (pages > 0) { /* One more TD. */ - td_t *const next; - ofmem_posix_memalign((void **)&next, sizeof(td_t), sizeof(td_t)); + td_t *const next = (td_t *)malloc(sizeof(td_t)); + ofmem_posix_memalign((void *)next, sizeof(td_t), sizeof(td_t)); memset((void *)next, 0, sizeof(*next)); /* Linked to the previous. */ cur->next_td = __cpu_to_le32(virt_to_phys(next)); @@ -428,8 +428,8 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen } /* One more TD. */ - td_t *const next_td; - ofmem_posix_memalign((void **)&next_td, sizeof(td_t), sizeof(td_t)); + td_t *const next_td = (td_t *)malloc(sizeof(td_t)); + ofmem_posix_memalign((void *)next_td, sizeof(td_t), sizeof(td_t)); memset((void *)next_td, 0, sizeof(*next_td)); /* Linked to the previous. */ cur->next_td = __cpu_to_le32(virt_to_phys(next_td)); @@ -444,15 +444,15 @@ ohci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen cur->buffer_end = 0; /* Final dummy TD. */ - td_t *const final_td; - ofmem_posix_memalign((void **)&final_td, sizeof(td_t), sizeof(td_t)); + td_t *const final_td = (td_t *)malloc(sizeof(td_t)); + ofmem_posix_memalign((void *)final_td, sizeof(td_t), sizeof(td_t)); memset((void *)final_td, 0, sizeof(*final_td)); /* Linked to the previous. */ cur->next_td = __cpu_to_le32(virt_to_phys(final_td)); /* Data structures */ - ed_t *head; - ofmem_posix_memalign((void **)&head, sizeof(ed_t), sizeof(ed_t)); + ed_t *head = (ed_t *)malloc(sizeof(ed_t)); + ofmem_posix_memalign((void *)head, sizeof(ed_t), sizeof(ed_t)); memset((void*)head, 0, sizeof(*head)); head->config = __cpu_to_le32((dev->address << ED_FUNC_SHIFT) | (0 << ED_EP_SHIFT) | @@ -507,8 +507,8 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *data, int finalize) } /* First TD. */ - td_t *const first_td; - ofmem_posix_memalign((void **)&first_td, sizeof(td_t), sizeof(td_t)); + td_t *const first_td = (td_t *)malloc(sizeof(td_t)); + ofmem_posix_memalign((void *)first_td, sizeof(td_t), sizeof(td_t)); memset((void *)first_td, 0, sizeof(*first_td)); cur = next = first_td; @@ -546,7 +546,7 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *data, int finalize) data += second_page_size; } /* One more TD. */ - ofmem_posix_memalign((void **)&next, sizeof(td_t), sizeof(td_t)); + ofmem_posix_memalign((void *)next, sizeof(td_t), sizeof(td_t)); memset((void *)next, 0, sizeof(*next)); /* Linked to the previous. */ cur->next_td = __cpu_to_le32(virt_to_phys(next)); @@ -558,8 +558,8 @@ ohci_bulk (endpoint_t *ep, int dalen, u8 *data, int finalize) cur = next; /* Data structures */ - ed_t *head; - ofmem_posix_memalign((void **)&head, sizeof(ed_t), sizeof(ed_t)); + ed_t *head = (ed_t *)malloc(sizeof(ed_t)); + ofmem_posix_memalign((void *)head, sizeof(ed_t), sizeof(ed_t)); memset((void*)head, 0, sizeof(*head)); head->config = __cpu_to_le32((ep->dev->address << ED_FUNC_SHIFT) | ((ep->endpoint & 0xf) << ED_EP_SHIFT) | @@ -652,8 +652,8 @@ ohci_create_intr_queue(endpoint_t *const ep, const int reqsize, if (reqsize > 4096) return NULL; - intr_queue_t *const intrq; - ofmem_posix_memalign((void **)&intrq, sizeof(intrq->ed), sizeof(*intrq)); + intr_queue_t *const intrq = (intr_queue_t *)malloc(sizeof(*intrq)); + ofmem_posix_memalign((void *)intrq, sizeof(intrq->ed), sizeof(*intrq)); memset(intrq, 0, sizeof(*intrq)); intrq->data = (u8 *)malloc(reqcount * reqsize); intrq->reqsize = reqsize; @@ -662,8 +662,8 @@ ohci_create_intr_queue(endpoint_t *const ep, const int reqsize, /* Create #reqcount TDs. */ u8 *cur_data = intrq->data; for (i = 0; i < reqcount; ++i) { - intrq_td_t *const td; - ofmem_posix_memalign((void **)&td, sizeof(td->td), sizeof(*td)); + intrq_td_t *const td = (intrq_td_t *)malloc(sizeof(*td)); + ofmem_posix_memalign((void *)td, sizeof(td->td), sizeof(*td)); ++intrq->remaining_tds; ohci_fill_intrq_td(td, intrq, cur_data); cur_data += reqsize; @@ -675,8 +675,8 @@ ohci_create_intr_queue(endpoint_t *const ep, const int reqsize, } /* Create last, dummy TD. */ - intrq_td_t *dummy_td; - ofmem_posix_memalign((void **)&dummy_td, sizeof(dummy_td->td), sizeof(*dummy_td)); + intrq_td_t *dummy_td = malloc(sizeof(*dummy_td)); + ofmem_posix_memalign((void *)dummy_td, sizeof(dummy_td->td), sizeof(*dummy_td)); memset(dummy_td, 0, sizeof(*dummy_td)); dummy_td->intrq = intrq; if (last_td) -- 2.7.2

2 3

[PATCH 0/6] Allow read-only access to CPU context in Forth
by Mark Cave-Ayland 16 Oct '16

16 Oct '16

The motivation behind the previous context work was to enable access to the saved context in Forth, e.g. some SPARC64 bootloaders will attempt to read the saved register values. This patch enables read-only access to the CPU registers in Forth for PPC, SPARC32 and SPARC64 whilst also implementing the IEEE-1275 .registers word. NOTE: the primary reason this is read-only is because currently there exists no Forth CFA that can evaluate an xt and use the result as part of a "<value> to %g1" construction. Mark Cave-Ayland (6): Make current CPU context available in Forth libopenbios: don't display output on execution of "go" word ppc: fix off-by-one error for register r4 in context switch ppc: add basic read-only Forth register support SPARC32: add basic read-only Forth register support SPARC64: add basic read-only Forth register support arch/ppc/ppc.fs | 127 +++++++++++++++++++++++------------- arch/ppc/qemu/switch.S | 2 +- arch/sparc32/build.xml | 1 + arch/sparc32/cpu.fs | 100 +++++++++++++++++++++++++++++ arch/sparc64/build.xml | 1 + arch/sparc64/cpu.fs | 156 +++++++++++++++++++++++++++++++++++++++++++++ forth/debugging/client.fs | 6 ++ libopenbios/init.c | 4 ++ libopenbios/initprogram.c | 16 +---- 9 files changed, 354 insertions(+), 59 deletions(-) create mode 100644 arch/sparc32/cpu.fs create mode 100644 arch/sparc64/cpu.fs -- 1.7.10.4

1 7

[PATCH] unix: fix openbios-unix build
by Mark Cave-Ayland 16 Oct '16

16 Oct '16

The previous context patch series accidentally omitted adding __context to openbios-unix causing a link failure. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- arch/unix/boot.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/unix/boot.c b/arch/unix/boot.c index ce84bb7..7862810 100644 --- a/arch/unix/boot.c +++ b/arch/unix/boot.c @@ -90,6 +90,8 @@ start_elf(void) return 0; } +struct context * volatile __context; + int arch_init_program(void) { -- 1.7.10.4

1 1

[PATCH v2] Add user resolutions to QEMU, VGA node's fb-modes property.
by Programmingkid 10 Oct '16

10 Oct '16

Implement the add-resolutions word. It will copy the user resolutions in the options node's resolutions property to the QEMU,VGA node's fb-modes property. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- This patch depends on the vga resolutions patch. Moved the code to the vga.fs file. Replaced local variables with values. arch/ppc/qemu/init.c | 2 +- drivers/vga.fs | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..df873ce 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -631,7 +631,7 @@ go(void) if (find_dev("/rom/macos")) { fword("insert-copyright-property"); } - + feval("add-resolutions"); feval("saved-program-state >sps.entry @"); addr = POP(); diff --git a/drivers/vga.fs b/drivers/vga.fs index 0411462..fb3749f 100644 --- a/drivers/vga.fs +++ b/drivers/vga.fs @@ -225,4 +225,80 @@ headerless qemu-vga-driver-init + +\ Adds user's resolutions from /Options node's resolutions property to +\ /pci/QEMU,VGA node's fb-modes property. +\ Turns a string of "widthxheight,..." into an array of ints. + +0 value fb-mode-addr +0 value fb-mode-len +0 value res-value +0 value res-addr +0 value res-len + +: add-resolutions ( -- ) + decimal + " /options" " find-device" evaluate ( -- ) + " resolutions" " active-package" evaluate + " get-package-property" evaluate ( -- res-addr res-len false ) + abort" " \ Fail quietly because user resolutions are optional + to res-len + to res-addr + + \ Add the first resolution value to the array + 0 0 res-addr res-len + " >number" evaluate + to res-len to res-addr + drop encode-int + to fb-mode-len to fb-mode-addr + res-addr res-len 1 " /string" evaluate + to res-len to res-addr + + begin + res-len 0 = not + while + 0 0 + res-addr res-len + " >number" evaluate ( ud1 c-addr1 u1 -- ud2 0 c-addr2 u2 ) + to res-len + to res-addr + drop + to res-value + + \ go to the next number after 'x' or ',' + res-addr res-len 1 " /string" evaluate + to res-len + to res-addr + + \ Encode and add res-value to array + fb-mode-addr fb-mode-len res-value ( -- fb-mode-addr fb-mode-len res-value ) + encode-int ( -- new-fb-mode-addr new-fb-mode-len ) + encode+ ( -- new-fb-mode-addr new-fb-mode-len ) + to fb-mode-len + to fb-mode-addr + repeat + + \ Get the original resolutions + " /pci/QEMU,VGA" " find-device" evaluate ( -- ) + " fb-modes" " active-package" evaluate + get-package-property ( -- prop-addr prop-len false ) + abort" Could not find fb-modes property in QEMU,VGA node!" ( -- prop-addr prop-len ) + + \ Needed to fix a limit of encode+ + encode-bytes ( -- new-prop-addr new-prop-len ) + + fb-mode-addr fb-mode-len ( -- new-prop-addr new-prop-len fb-mode-addr fb-mode-len ) + 2swap ( -- fb-mode-addr fb-mode-len new-prop-addr new-prop-len ) + + \ Add user resolutions first then add built-in resolutions if space permits + encode+ ( -- new-addr new-len ) + to fb-mode-len + to fb-mode-addr + + \ Update fb-modes property + " /pci/QEMU,VGA" " find-device" evaluate + fb-mode-addr fb-mode-len + " fb-modes" property +; + end0 -- 2.7.2

1 0

Help with patch
by Programmingkid 10 Oct '16

10 Oct '16

I want to place vga related code in the vga.fs file, but it just doesn't compile. Here are some of the errors I see: Error: File /Users/john/Desktop/openbios/drivers/vga.fs, Line 234. (Output Position = 1166). Word find-device is not in dictionary. Error: File /Users/john/Desktop/openbios/drivers/vga.fs, Line 235. (Output Position = 1179). Word active-package is not in dictionary. Is there a way to fix this error?

3 3

[PATCH] Add user resolutions to QEMU, VGA node's fb-modes property.
by Programmingkid 09 Oct '16

09 Oct '16

Implement the add-resolutions word. It will copy the user resolutions in the options node's resolutions property to the QEMU,VGA node's fb-modes property. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/qemu/init.c | 2 +- arch/ppc/qemu/qemu.fs | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..df873ce 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -631,7 +631,7 @@ go(void) if (find_dev("/rom/macos")) { fword("insert-copyright-property"); } - + feval("add-resolutions"); feval("saved-program-state >sps.entry @"); addr = POP(); diff --git a/arch/ppc/qemu/qemu.fs b/arch/ppc/qemu/qemu.fs index 3d99a34..10df618 100644 --- a/arch/ppc/qemu/qemu.fs +++ b/arch/ppc/qemu/qemu.fs @@ -138,3 +138,71 @@ variable keyboard-phandle 0 keyboard-phandle ! 3drop 0 then ; + +\ Adds user's resolutions from /Options node's resolutions property to +\ /pci/QEMU,VGA node's fb-modes property. +\ Turns a string of "widthxheight,..." into an array of ints. + +: add-resolutions { ; fb-mode-addr fb-mode-len value res-addr res-len } ( -- ) + decimal + + " /options" find-device ( -- ) + " resolutions" active-package get-package-property ( -- res-addr res-len false ) + abort" " \ Fail quietly because user resolutions are optional + -> res-len + -> res-addr + + \ Add the first value to the array + 0 0 res-addr res-len + >number + -> res-len -> res-addr + drop encode-int + -> fb-mode-len -> fb-mode-addr + res-addr res-len 1 /string + -> res-len -> res-addr + + begin + res-len 0 = not + while + 0 0 + res-addr res-len + >number ( ud1 c-addr1 u1 -- ud2 0 c-addr2 u2 ) + -> res-len + -> res-addr + drop + -> value + + \ go to the next number after 'x' or ',' + res-addr res-len 1 /string + -> res-len + -> res-addr + + \ Encode and add value to array + fb-mode-addr fb-mode-len value ( -- fb-mode-addr fb-mode-len value ) + encode-int ( -- new-fb-mode-addr new-fb-mode-len ) + encode+ ( -- new-fb-mode-addr new-fb-mode-len ) + -> fb-mode-len + -> fb-mode-addr + repeat + + \ Get the original resolutions + " /pci/QEMU,VGA" find-device ( -- ) + " fb-modes" active-package get-package-property ( -- prop-addr prop-len false ) + abort" Could not find fb-modes property in QEMU,VGA node!" ( -- prop-addr prop-len ) + + \ Needed to fix a limit of encode+ + encode-bytes ( -- new-prop-addr new-prop-len ) + + fb-mode-addr fb-mode-len ( -- new-prop-addr new-prop-len fb-mode-addr fb-mode-len ) + 2swap ( -- fb-mode-addr fb-mode-len new-prop-addr new-prop-len ) + + \ Add user resolutions first then add built-in resolutions if space permits + encode+ ( -- new-addr new-len ) + -> fb-mode-len + -> fb-mode-addr + + \ Update fb-modes property + " /pci/QEMU,VGA" find-device + fb-mode-addr fb-mode-len + " fb-modes" property +; -- 2.7.2

3 2

[PATCH] Implement print-resolutions word
by Programmingkid 07 Oct '16

07 Oct '16

The print-resolutions word prints all the resolutions in the QEMU,VGA node's fb-modes property. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- This patch may depend on the add-resolutions patch. arch/ppc/qemu/qemu.fs | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/arch/ppc/qemu/qemu.fs b/arch/ppc/qemu/qemu.fs index 10df618..745f8c8 100644 --- a/arch/ppc/qemu/qemu.fs +++ b/arch/ppc/qemu/qemu.fs @@ -206,3 +206,22 @@ variable keyboard-phandle 0 keyboard-phandle ! fb-mode-addr fb-mode-len " fb-modes" property ; + +\ print all of the resolutions in the QEMU,VGA node +: print-resolutions { ; fb-mode-addr fb-mode-len } + decimal + " /pci/QEMU,VGA" find-device ( -- ) + " fb-modes" active-package get-package-property + abort" Could not find fb-modes property" + -> fb-mode-len + -> fb-mode-addr + + fb-mode-addr fb-mode-len + 4 - \ limit + fb-mode-addr \ initial value + cr ." Resolutions:" cr + do + I aligned @ . \ print width + ." x " \ print x + I 1+ aligned @ . cr \ print height + 8 +loop +; -- 2.7.2

1 0

[PATCH 2/2] implement convert_to_ints()
by Programmingkid 02 Oct '16

02 Oct '16

convert_to_ints() converts all the string resolutions in the resolutions property of the QEMU,VGA node and converts them to an int array. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/qemu/init.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..b6c7db0 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -619,6 +619,83 @@ id_cpu(void) } } + +/* convert ASCII string to number */ +static int atoi(const char *str) +{ + int result = 0; + while (*str) { + result = result * 10 + *str - '0'; + str++; + } + return result; +} + +void convert_to_ints(void); + +/* Converts the QEMU,VGA node's resolutions property to int's*/ +void convert_to_ints(void) +{ + const int max_buffer_size = 200; + char *orig_property; + char buffer[max_buffer_size]; + int index, count, value, addr, len; + char c; + + count = 0; + index = 0; + push_str("/pci/QEMU,VGA"); + fword("find-package"); + if (POP() == 0) { + fword("cr"); + push_str("convert-to-ints(): could not find package /pci/QEMU,VGA!"); + fword("type"); + fword("cr"); + return; + } + fword("active-package!"); + push_str("resolutions"); + fword("active-package"); + fword("get-package-property"); + if (POP() == -1) { + fword("cr"); + push_str("convert-to-ints(): could not find resolutions property!"); + fword("type"); + fword("cr"); + return; + } + len = POP(); + addr = POP(); + orig_property = (char *) malloc(len); + strncpy(orig_property, (char *)addr, len); + c = orig_property[0]; + while(c != '\0') { + if (c == 'x' || c == ',') { + buffer[index] = '\0'; + value = atoi(buffer); + count++; + if (count == 3) { + count = 1; + fword("encode+"); + continue; + } + PUSH(value); + fword("encode-int"); + index = -1; + } + else { + buffer[index] = c; + } + index++; + c = *(++orig_property); + } + fword("encode+"); + push_str("resolutions"); + fword("property"); + free(orig_property); +} + + static void go(void); unsigned int start_elf(unsigned long entry_point, unsigned long param); @@ -632,6 +709,10 @@ go(void) fword("insert-copyright-property"); } + /* Used to support user specified resolutions */ + fword("copy-resolutions-property"); + convert_to_ints(); + feval("saved-program-state >sps.entry @"); addr = POP(); @@ -1078,3 +1159,4 @@ arch_of_init(void) bind_func("platform-boot", boot); bind_func("(go)", go); } + -- 2.7.2

6 29

[PATCH] vga resolutions
by Programmingkid 01 Oct '16

01 Oct '16

Add resolutions for the VGA driver to use in a property called fb-modes. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- drivers/vga.fs | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/vga.fs b/drivers/vga.fs index 29a043a..0411462 100644 --- a/drivers/vga.fs +++ b/drivers/vga.fs @@ -197,6 +197,29 @@ headerless depth-bits encode-int " depth" property line-bytes encode-int " linebytes" property + \ resolutions for the VGA driver + 512 encode-int 342 encode-int encode+ + 640 encode-int encode+ 400 encode-int encode+ + 640 encode-int encode+ 480 encode-int encode+ + 800 encode-int encode+ 600 encode-int encode+ + 1024 encode-int encode+ 640 encode-int encode+ + 1024 encode-int encode+ 768 encode-int encode+ + 1152 encode-int encode+ 864 encode-int encode+ + 1200 encode-int encode+ 700 encode-int encode+ + 1280 encode-int encode+ 720 encode-int encode+ + 1280 encode-int encode+ 768 encode-int encode+ + 1280 encode-int encode+ 800 encode-int encode+ + 1440 encode-int encode+ 900 encode-int encode+ + 1920 encode-int encode+ 1200 encode-int encode+ + 2304 encode-int encode+ 1440 encode-int encode+ + 2560 encode-int encode+ 1600 encode-int encode+ + 2880 encode-int encode+ 1800 encode-int encode+ + 4096 encode-int encode+ 2304 encode-int encode+ + 5120 encode-int encode+ 2880 encode-int encode+ + 8192 encode-int encode+ 4608 encode-int encode+ + + " fb-modes" property + ['] qemu-vga-driver-install is-install ; -- 2.7.2

1 0

[PATCH v2] implement convert_to_ints()
by Programmingkid 30 Sep '16

30 Sep '16

convert_to_ints() converts all the string resolutions in the resolutions property of the QEMU,VGA node and converts them to an int array. Needed to support the VGA driver. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- v2 changes: Added function resolutions_property_available() - used to determine if there is a resolutions property. Removed convert_to_ints() prototype. arch/ppc/qemu/init.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 6f21814..b950a61 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -619,6 +619,106 @@ id_cpu(void) } } + +/* convert ASCII string to number */ +static int atoi(const char *str) +{ + int result = 0; + while (*str) { + result = result * 10 + *str - '0'; + str++; + } + return result; +} + + +/* Converts the QEMU,VGA node's resolutions property to int's*/ +static void convert_to_ints(void) +{ + const int max_buffer_size = 200; + char *orig_property; + char buffer[max_buffer_size]; + int index, count, value, addr, len; + char c; + + count = 0; + index = 0; + push_str("/pci/QEMU,VGA"); + fword("find-package"); + if (POP() == 0) { + fword("cr"); + push_str("convert-to-ints(): could not find package /pci/QEMU,VGA!"); + fword("type"); + fword("cr"); + return; + } + fword("active-package!"); + push_str("resolutions"); + fword("active-package"); + fword("get-package-property"); + if (POP() == -1) { + fword("cr"); + push_str("convert-to-ints(): could not find resolutions property!"); + fword("type"); + fword("cr"); + return; + } + len = POP(); + addr = POP(); + orig_property = (char *) malloc(len); + strncpy(orig_property, (char *)addr, len); + c = orig_property[0]; + while(c != '\0') { + if (c == 'x' || c == ',') { + buffer[index] = '\0'; + value = atoi(buffer); + count++; + if (count == 3) { + count = 1; + fword("encode+"); + continue; + } + PUSH(value); + fword("encode-int"); + index = -1; + } + else { + buffer[index] = c; + } + index++; + c = *(++orig_property); + } + fword("encode+"); + push_str("resolutions"); + fword("property"); + free(orig_property); +} + + +/* Determines if there is a resolutions property in the options node*/ +static bool resolutions_property_available(void) +{ + push_str("/options"); + fword("find-package"); + if (POP() != -1) { + return false; + } + fword("active-package!"); + push_str("resolutions"); + fword("active-package"); + fword("get-package-property"); + if (POP() == -1) { + return false; + } + + /* Remove str-addr and str-len */ + POP(); + POP(); + + return true; +} + + static void go(void); unsigned int start_elf(unsigned long entry_point, unsigned long param); @@ -631,7 +731,13 @@ go(void) if (find_dev("/rom/macos")) { fword("insert-copyright-property"); } - + + /* Used to support user specified resolutions */ + if (resolutions_property_available()) { + fword("copy-resolutions-property"); + convert_to_ints(); + } + feval("saved-program-state >sps.entry @"); addr = POP(); @@ -1078,3 +1184,4 @@ arch_of_init(void) bind_func("platform-boot", boot); bind_func("(go)", go); } + -- 2.7.2

1 0

[PATCH 1/2] Implement copy-resolutions-property
by Programmingkid 25 Sep '16

25 Sep '16

The copy-resolutions-property copies all the resolutions from the resolutions property of the options node to the resolutions property of the QEMU,VGA node. This is used to support specifying resolutions via the command-line. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> --- arch/ppc/qemu/qemu.fs | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/ppc/qemu/qemu.fs b/arch/ppc/qemu/qemu.fs index 3d99a34..2a83fe7 100644 --- a/arch/ppc/qemu/qemu.fs +++ b/arch/ppc/qemu/qemu.fs @@ -138,3 +138,27 @@ variable keyboard-phandle 0 keyboard-phandle ! 3drop 0 then ; + +\ Copies the resolutions property from the /options node to QEMU,VGA node + +: copy-resolutions-property ( -- ) + " /options" find-package + if + active-package! + " resolutions" active-package get-package-property false = + if + " /pci/QEMU,VGA" find-package + if + active-package! + " resolutions" + property + else + cr ." copy-resolutions-property: Failed to find QEMU,VGA package!" cr + then + else + cr ." copy-resolutions-property: Failed to find resolutions property!" cr + then + else + cr ." copy-resolutions-property: Failed to find options node!" cr + then +; -- 2.7.2

2 3

Re: [OpenBIOS] [PATCH] Add resolutions via the command-line
by G 3 23 Sep '16

23 Sep '16

On Sep 20, 2016, at 8:41 PM, Benjamin Herrenschmidt wrote: > On Tue, 2016-09-20 at 20:35 -0400, G 3 wrote: >> >> When I use the -prom-env option I can easily add properties to the >> options node. >> Can something like this be done with the chosen node? > > We can make it so. That or we can add code to OpenBIOS to copy the > list > of resolutions into the device-node of the VGA device. The latter is > probably the best, that way we can also have all the default ones in > OpenBIOS and remove the hard coded list completely. You really want to remove the included list of resolutions? I was thinking about adding a lot more built-in resolutions in another patch. A built-in list is very convenient. As for the options node problem. We need a way to add resolutions from the command-line for a Mac OS X guest. Using "-prom-env" isn't an option because of some unknown bug. I suppose it is possible to fix this bug - if it is a bug. Another idea I have is to add a completely different command-line option to QEMU just for resolutions. The user could specify resolutions like this: -video- resolutions 640x480,1024x768,1280x700.... This feature could place the list of resolutions inside a property of the VGA device node. I am betting the VGA driver could access this node and parse the list of resolutions. So this: qemu -video-resolutions ---> OpenBIOS VGA device node ---> VGA driver Would anyone have another idea they would like to share?

4 7

QEMU 2.8 development tree open
by Mark Cave-Ayland 09 Sep '16

09 Sep '16

Hi all, Now that QEMU 2.7 is out of the door, I've just pushed my next branch of trivial patches to master which is mostly PPC fix-ups from Ben. Following on from this, my priority is to get the outstanding context patches for SPARC32/SPARC64 pushed reasonably quickly, along with the corresponding follow-up patches to fix up load/init-program as per spec since they touch a large chunk of critical code which will benefit from a thorough testing from users. ATB, Mark.

2 3

[PATCH] pci: only try and detect Mac driver in PCI ROM for PPC machines
by Mark Cave-Ayland 09 Sep '16

09 Sep '16

It seems that the VGA option ROM isn't mapped on SPARC64 which causes a fault upon access. Temporarily handle this by surrounding the code in #ifdef CONFIG_PPC guards until the proper solution can be implemented. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- drivers/pci.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/pci.c b/drivers/pci.c index eec6a20..4e4e9ae 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -773,13 +773,15 @@ int macio_keylargo_config_cb (const pci_config_t *config) int vga_config_cb (const pci_config_t *config) { +#ifdef CONFIG_PPC unsigned long rom; uint32_t rom_size, size, bar; phandle_t ph; - +#endif if (config->assigned[0] != 0x00000000) { setup_video(); +#ifdef CONFIG_PPC if (config->assigned[6]) { rom = pci_bus_addr_to_host_addr(MEMORY_SPACE_32, config->assigned[6] & ~0x0000000F); @@ -805,6 +807,8 @@ int vga_config_cb (const pci_config_t *config) } } } +#endif + /* Currently we don't read FCode from the hardware but execute * it directly */ feval("['] vga-driver-fcode 2 cells + 1 byte-load"); -- 1.7.10.4

1 0

[PATCH 00/24] Implement load/init-program as per IEEE-1275 specification
by Mark Cave-Ayland 09 Sep '16

09 Sep '16

The current implementation of load/init-program has some fairly big hacks in order to work around the fact that we don't have per-architecture CPU contexts. An example of this is chained bootloaders used for SPARC64 which use Forth to alter the saved CPU context so that control is returned to a different address by directly executing init-program before return. With all architectures now able to save/restore CPU contexts, these hacks can now be removed and init-program changed to be a single per-architecture implementation along with some associated tidy-ups. I've given this a fairly thorough testing across all my OpenBIOS test images and as far as I can tell doesn't cause any regressions. Requires the previously posted SPARC32 and SPARC64 context patches to be applied first. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (24): libopenbios: rename saved-program-state to load-state libopenbios: introduce arch_init_program() in preparation for per-arch implementations all: create client program context once at startup client.fs: add load-state param variable amd64: introduce arch_init_program() implementation ppc: introduce arch_init_program() implementation SPARC32: introduce arch_init_program() implementation SPARC64: introduce arch_init_program() implementation x86: introduce arch_init_program() implementation libopenbios: add context wrappers for Fcode/Forth payloads SPARC32: move Forth/FCode over to use new context wrappers SPARC64: move Forth/FCode over to use new context wrappers x86: move Forth/FCode over to use new context wrappers elf: set boot notes in elf_load() if supplied SPARC64: remove start_client_image() libopenbios: move prototypes for start_elf() and __context into libopenbios libopenbios: move go() function into libopenbios aout: implement load/init-program as per IEEE-1275 specification bootcode: implement load/init-program as per IEEE-1275 specification elf: implement load/init-program as per IEEE-1275 specification fcode: implement load/init-program as per IEEE-1275 specification forth: implement load/init-program as per IEEE-1275 specification libopenbios: remove conditional logic from go() libopenbios: remove address parameter from start_elf() arch/amd64/context.c | 51 ++++++++++++++++++++----- arch/ppc/qemu/context.c | 67 ++++++++++++++++++++++----------- arch/ppc/qemu/init.c | 14 ++----- arch/sparc32/boot.c | 71 ++++------------------------------- arch/sparc32/boot.h | 6 +-- arch/sparc32/context.c | 39 +++++++++++++++---- arch/sparc32/openbios.c | 2 +- arch/sparc64/boot.c | 54 +------------------------- arch/sparc64/boot.h | 6 --- arch/sparc64/context.c | 68 ++++++++++++++++++++------------- arch/sparc64/openbios.c | 1 - arch/unix/boot.c | 13 +++++++ arch/x86/boot.c | 53 +------------------------- arch/x86/boot.h | 6 +-- arch/x86/context.c | 52 ++++++++++++++++++++----- arch/x86/openbios.c | 1 - forth/debugging/client.fs | 30 ++++++++------- include/libopenbios/bootcode_load.h | 2 + include/libopenbios/initprogram.h | 9 +++++ libopenbios/aout_load.c | 48 +++++++++++------------ libopenbios/bootcode_load.c | 33 +++++++++++++--- libopenbios/elf_load.c | 28 +++++++------- libopenbios/fcode_load.c | 32 ++++++---------- libopenbios/forth_load.c | 30 +++++++-------- libopenbios/init.c | 3 ++ libopenbios/initprogram.c | 45 ++++++++++++++++++++++ libopenbios/load.c | 47 ++++++++--------------- libopenbios/xcoff_load.c | 8 ++-- 28 files changed, 417 insertions(+), 402 deletions(-) -- 1.7.10.4

3 33

[PATCHv2 00/25] Implement load/init-program as per IEEE-1275 specification
by Mark Cave-Ayland 08 Sep '16

08 Sep '16

The current implementation of load/init-program has some fairly big hacks in order to work around the fact that we don't have per-architecture CPU contexts. An example of this is chained bootloaders used for SPARC64 which use Forth to alter the saved CPU context so that control is returned to a different address by directly executing init-program before return. With all architectures now able to save/restore CPU contexts, these hacks can now be removed and init-program changed to be a single per-architecture implementation along with some associated tidy-ups. I've given this a fairly thorough testing across all my OpenBIOS test images and as far as I can tell doesn't cause any regressions. Requires the previously posted SPARC32 and SPARC64 context patches to be applied first. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Fix missing patch for XCOFF loader conversion - Switch aout_init_program() to use memmove() - Fix minor typo in aout_init_program() comment Mark Cave-Ayland (25): libopenbios: rename saved-program-state to load-state libopenbios: introduce arch_init_program() in preparation for per-arch implementations all: create client program context once at startup client.fs: add load-state param variable amd64: introduce arch_init_program() implementation ppc: introduce arch_init_program() implementation SPARC32: introduce arch_init_program() implementation SPARC64: introduce arch_init_program() implementation x86: introduce arch_init_program() implementation libopenbios: add context wrappers for Fcode/Forth payloads SPARC32: move Forth/FCode over to use new context wrappers SPARC64: move Forth/FCode over to use new context wrappers x86: move Forth/FCode over to use new context wrappers elf: set boot notes in elf_load() if supplied SPARC64: remove start_client_image() libopenbios: move prototypes for start_elf() and __context into libopenbios libopenbios: move go() function into libopenbios aout: implement load/init-program as per IEEE-1275 specification bootcode: implement load/init-program as per IEEE-1275 specification elf: implement load/init-program as per IEEE-1275 specification fcode: implement load/init-program as per IEEE-1275 specification forth: implement load/init-program as per IEEE-1275 specification xcoff: implement load/init-program as per IEEE-1275 specification libopenbios: remove conditional logic from go() libopenbios: remove address parameter from start_elf() arch/amd64/context.c | 51 ++++++++++++---- arch/ppc/qemu/context.c | 67 ++++++++++++++------- arch/ppc/qemu/init.c | 14 +---- arch/sparc32/boot.c | 71 +++------------------- arch/sparc32/boot.h | 6 +- arch/sparc32/context.c | 39 +++++++++--- arch/sparc32/openbios.c | 2 +- arch/sparc64/boot.c | 54 +---------------- arch/sparc64/boot.h | 6 -- arch/sparc64/context.c | 68 ++++++++++++--------- arch/sparc64/openbios.c | 1 - arch/unix/boot.c | 13 ++++ arch/x86/boot.c | 53 +---------------- arch/x86/boot.h | 6 +- arch/x86/context.c | 52 ++++++++++++---- arch/x86/openbios.c | 1 - forth/debugging/client.fs | 30 +++++----- include/libopenbios/bootcode_load.h | 2 + include/libopenbios/initprogram.h | 9 +++ include/libopenbios/xcoff_load.h | 2 +- libopenbios/aout_load.c | 48 +++++++-------- libopenbios/bootcode_load.c | 33 +++++++++-- libopenbios/elf_load.c | 28 ++++----- libopenbios/fcode_load.c | 32 ++++------ libopenbios/forth_load.c | 30 +++++----- libopenbios/init.c | 3 + libopenbios/initprogram.c | 45 ++++++++++++++ libopenbios/load.c | 58 +++++++++--------- libopenbios/xcoff_load.c | 111 +++++++++++++++++++++++++++++++---- 29 files changed, 526 insertions(+), 409 deletions(-) -- 1.7.10.4

1 25

[PATCHv2 00/11] SPARC64 context improvements
by Mark Cave-Ayland 28 Aug '16

28 Aug '16

This patchset improves the context handling in 2 ways: firstly it unifies the context structures between switch_to() and CIF entry, and secondly fixes up the context switch code enough so that we can switch and return from an arbitrary PC address in testing. This is a precursor to fixing up the load/init-program logic so that clients are able to access and alter their own context from Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Make sure trap level is preserved after SAVE_CPU_TRAP_STATE - Add separate RESET_CPU_WINDOW_STATE macro - Ensure that __context points to the saved entry state during CIF calls Mark Cave-Ayland (11): SPARC64: add parameter to indicate %cwp save/restore direction SPARC64: allocate space in context to save global registers SPARC64: save/restore global registers to context when entering CIF SPARC64: save CIF entry globals under the client stack SPARC64: introduce %pc into context and use it when exiting CIF SPARC64: make sure that %tl is restored after SAVE_CPU_TRAP_STATE SPARC64: save/restore entire CPU state when entering/leaving CIF SPARC64: split off CPU window reset logic into RESET_CPU_WINDOW_STATE macro SPARC64: split off general CPU registers into *_GENERAL_STATE macros SPARC64: point __context to saved context during CIF calls SPARC64: switch entry.S over to use existing context macros arch/sparc64/call-client.S | 94 ++++++++++++++++++++++---------- arch/sparc64/context.c | 6 +-- arch/sparc64/context.h | 7 +-- arch/sparc64/cpustate.h | 115 ++++++++++++++++++++++++--------------- arch/sparc64/entry.S | 17 +++++- arch/sparc64/switch.S | 129 ++++++++++++++++---------------------------- arch/sparc64/vectors.S | 8 ++- 7 files changed, 213 insertions(+), 163 deletions(-) -- 1.7.10.4

1 11

[PATCH 0/7] SPARC64 context improvements
by Mark Cave-Ayland 28 Aug '16

28 Aug '16

This patchset improves the context handling in 2 ways: firstly it unifies the context structures between switch_to() and CIF entry, and secondly fixes up the context switch code enough so that we can switch and return from an arbitrary PC address in testing. This is a precursor to fixing up the load/init-program logic so that clients are able access and alter their own context from Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (7): SPARC64: add parameter to indicate %cwp save/restore direction SPARC64: allocate space in context to save global registers SPARC64: save/restore global registers to context when entering CIF SPARC64: save CIF entry globals under the client stack SPARC64: introduce %pc into context and use it when exiting CIF SPARC64: split off general CPU registers into *_GENERAL_STATE macros SPARC64: switch entry.S over to use existing context macros arch/sparc64/call-client.S | 71 +++++++++++++++--------- arch/sparc64/context.c | 6 +-- arch/sparc64/context.h | 7 +-- arch/sparc64/cpustate.h | 98 ++++++++++++++++++++------------- arch/sparc64/entry.S | 17 +++++- arch/sparc64/switch.S | 129 ++++++++++++++++---------------------------- 6 files changed, 175 insertions(+), 153 deletions(-) -- 1.7.10.4

1 8

[PATCH] hfsplus: don't force OS 9 startup folder selection
by Mark Cave-Ayland 26 Aug '16

26 Aug '16

For some reason the HFS+ code will ignore the startup folder chosen by the user and force the OS 9 startup folder if it exists. This can break OS X installations with Classic, making it impossible to boot back into the OS. Removing the code to force the use of the OS 9 startup folder allows switching the startup disk between OS 9/OS X using the Disk Startup Utility in each OS as expected. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- fs/hfsplus/hfsp_fs.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/hfsplus/hfsp_fs.c b/fs/hfsplus/hfsp_fs.c index df234bb..4d52478 100644 --- a/fs/hfsplus/hfsp_fs.c +++ b/fs/hfsplus/hfsp_fs.c @@ -233,8 +233,6 @@ hfsp_files_open( hfsp_info_t *mi ) int *p = (int*)&(mi->vol)->vol.finder_info[0]; int cnid = p[0]; /* printk(" p[0] = %x, p[3] = %x, p[5] = %x\n", p[0], p[3], p[5] ); */ - if( p[0] == p[5] && p[3] ) - cnid = p[3]; if( record_init_cnid(&(mi->hfspfile->rec), &(mi->vol)->catalog, cnid) ) RET ( 0 ); path += 2; -- 1.7.10.4

1 0

[PATCH] Fix build on ppc64le host
by Benjamin Herrenschmidt 26 Aug '16

26 Aug '16

Switch arch didn't get the right long size Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index ab3b4ce..12a01f1 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -38,7 +38,7 @@ longbits() if test "$cpu" = "sparc64" -o "$cpu" = "ia64" \ -o "$cpu" = "amd64" -o "$cpu" = "x86_64" \ -o "$cpu" = "powerpc64" -o "$cpu" = "ppc64" \ - -o "$cpu" = "alpha"; then + -o "$cpu" = "alpha" -o "$cpu" = "ppc64le" ; then echo 64 else echo 32

2 1

[PATCH] SPARC32: implement full context switch
by Mark Cave-Ayland 21 Aug '16

21 Aug '16

The existing SPARC32 context switch logic was only partially complete in that it wouldn't save/restore all the register windows. This patch updates the context switch code to save the full CPU state and is enough to allow a switch and return to an arbitrary PC address in testing. This is a precursor to fixing up the load/init-program logic so that clients are able access and alter their own context from Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (1): SPARC32: implement full context switch logic in switch_to() arch/sparc32/boot.h | 2 +- arch/sparc32/context.c | 8 +- arch/sparc32/context.h | 6 +- arch/sparc32/cpustate.h | 160 ++++++++++++++++++++++++++++++++++++++++ arch/sparc32/entry.S | 26 ++++++- arch/sparc32/switch.S | 187 +++++++++++++++-------------------------------- 6 files changed, 249 insertions(+), 140 deletions(-) create mode 100644 arch/sparc32/cpustate.h -- 1.7.10.4

1 1

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

11 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 2 patches add the basic support routines while the last patch enables bus mastering for the rtl8139 card on Apple PPC machines which is required for some OS 9, OS X and MorphOS drivers. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (3): pci: introduce ob_pci_enable_bus_master() function pci: add PCI database entry for rtl8139 network card pci: add rtl8139_config_cb() to configure rtl8139 network cards drivers/pci.c | 27 +++++++++++++++++++++++++++ drivers/pci_database.c | 6 ++++++ drivers/pci_database.h | 3 +++ include/drivers/pci.h | 1 + 4 files changed, 37 insertions(+) -- 1.7.10.4

2 8

[PATCH 1/2] bootstrap.fs: add 4+ word to bootstrap dictionary
by Mark Cave-Ayland 11 Aug '16

11 Aug '16

Old OS X bootloaders need this in order to execute their bootloader. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- forth/bootstrap/bootstrap.fs | 1 + 1 file changed, 1 insertion(+) diff --git a/forth/bootstrap/bootstrap.fs b/forth/bootstrap/bootstrap.fs index 0668cf7..7b66f5c 100644 --- a/forth/bootstrap/bootstrap.fs +++ b/forth/bootstrap/bootstrap.fs @@ -428,6 +428,7 @@ variable leaves 0 leaves ! : 1- 1 - ; : 2+ 2 + ; : 2- 2 - ; +: 4+ 4 + ; : even 1+ -2 and ; : bounds over + swap ; -- 1.7.10.4

2 3

Re: [OpenBIOS] QEMU old Mac work
by Howard Spoelstra 10 Aug '16

10 Aug '16

> On 09 Aug 2016, at 13:55, Benjamin Herrenschmidt <benh(a)kernel.crashing.org> wrote: > > On Tue, 2016-08-09 at 09:15 +0200, Howard Spoelstra wrote: >> >> Hi, I tested both OpenBIOS and Qemu from your branches in OSX, using mac model mac99p. Terminal says: >> >> MACIO: Creating PMU >> qemu-system-ppc-wip: Unknown device 'via-pmu' for default sysbus > > Check you updated the qemu config. I added a new device, you need CONFIG_MAC_PMU, > the qemu build system won't pick that up automatically. > > I don't remember how I did it, I think make defconfig or something like that.. > > Cheers, > Ben. > Great to see Leopard running. Nice work! I fixed the error by adding CONFIG_MAC_PMU=y to the default config for ppc-softmmu.mak Builds from your source fix the USB problem in OpenBIOS mainline needing the -device ich9-usb-uhci1,id=newusb -device usb-mouse,bus=newusb.0 to get mouse/kb going in 10.5. Leopard now has mouse/keyboard working without any specific USB parameters. I notice the problem in Puma (10.1) It seems there is some timer error?, as e.g., the time remaining for installation fluctuates like crazy (1600 hrs to go), and the beachball spins like mad. At boot there is a too rapid succession of “still waiting for boot device” . Just guessing, but might a timing issue also explain the slowness of Leopard? Best, Howard

3 5

[Report] Rhapsody DR2
by Natalia Portillo 07 Aug '16

07 Aug '16

Hi all, I've been asked by Mark to report my testings here. Tested with qemu-for-ppc-2.8 commit 8b0262d0bcb7c697f2db8d6cd731cb478937902a. Command line: qemu-system-ppc -M mac99 -m 256 -prom-env 'boot-args=-v' -bios foo/openbios-qemu-vga.elf -boot d -prom-env 'auto-boot?=false' -hda foo.qc2 -cdrom RhapsodyDR2.iso -nographic Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:%BOOT >> Not a bootable ELF image >> switching to new context: 4+:interpret: exception -13 caught >> interpret : update-key-map " get-key-map" " kbd" open-dev $call-method drop gKeyMap 4 0 do swap dup @ >r 4+ swap dup dup @ r> or swap ! 4+ loop ; update-key-map gKeyMap 1+ c@ not h# 40 and if 0 stdout ! then failed with error ffffffed Rhapsody Kernel Loader <16:33:44 980413> interpret: exception ffffffdf caught >> interpret to DIH value &CL DIH to my-self 1 encode-int " AAPL,boot-display" property &CL 0 100 " set-colors" DIH $CM " width" GMP ?dup 0= if 280 then " height" GMP ?dup 0= if 1E0 then 2dup to Dheight to Dwidth " linebytes" GMP ?dup 0= if Dwidth then " depth" GMP ?dup 0= if 8 then over value rowbytes active-package DIH ihandle>phandle to active-package : rect-setup >r >r rowbytes * + frame-buffer-adr + r> -rot r> ; : DRAW-RECTANGLE rect-setup 0 ?do 2dup 4 pick move 2 pick rowbytes d+ loop 3drop ; : FILL-RECTANGLE rect-setup 0 ?do dup 3 pick 3 pick fill rowbytes + loop 3drop ; : READ-RECTANGLE rect-setup >r swap r> 0 ?do 2dup 4 pick move rowbytes 3 pick d+ loop 3drop ; to active-package failed with error 00000100 call-method fill-rectangle: exception ffffffdf >> call-method fill-rectangle failed with error ffffffdf interpret: exception ffffffdf � caught >> interpret drawImage failed with error 00000108 interpret: exception ffffffde caught >> interpret dev /packages/obp-tftp failed with error 00000003 load isn't unique. ?no dev call-method fill-rectangle: exception ffffffdf >> call-method fill-rectangle failed with error ffffffdf call-method draw-rectangle: exception ffffffdf >> call-method draw-rectangle failed with error ffffffdf EXIT 0 >

3 13

[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 RFC] hw/misc/macio/cuda.c: erratic mouse fix
by Programmingkid 07 Aug '16

07 Aug '16

For everyone who is having a problem with the mouse pointer acting erratically, this patch should offer some relief. By decreasing the polling rate of the ADB mouse, the mouse pointer becomes more manageable. I was always able to reproduce the erratic mouse issue by playing an mp3 in QuickTime Player on a Mac OS 9.2 guest. With this patch the problem was almost unnoticeable. Please let me know how well this works for you. Note: I only have test this patch on a Mac OS X host running a Mac OS 9.2 guest. Hopefully it will fix the problem on Windows and Linux as well. --- hw/misc/macio/cuda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/misc/macio/cuda.c b/hw/misc/macio/cuda.c index 05c02fb..0e97d0a 100644 --- a/hw/misc/macio/cuda.c +++ b/hw/misc/macio/cuda.c @@ -911,7 +911,7 @@ static void cuda_realizefn(DeviceState *dev, Error **errp) s->tick_offset = (uint32_t)mktimegm(&tm) + RTC_OFFSET; s->adb_poll_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, cuda_adb_poll, s); - s->autopoll_rate_ms = 20; + s->autopoll_rate_ms = 35; s->adb_poll_mask = 0xffff; } -- 2.7.2

1 0

Re: [OpenBIOS] [PATCH 0/5] Enable bus master support for rtl8139 network cards on Apple PPC machines
by Howard Spoelstra 06 Aug '16

06 Aug '16

> On 06 Aug 2016, at 02:19, Alfonso Gamboa <gtxent(a)gmail.com> wrote: > > Are you able to post your compiled openbios? I am currently unable to compile it for ppc on my osx workstation. Thanks! > > > On Aug 5, 2016 3:11 PM, "Howard Spoelstra" <hsp.cat7(a)gmail.com <mailto:hsp.cat7@gmail.com>> wrote: > > > On 05 Aug 2016, at 22:32, Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk <mailto:mark.cave-ayland@ilande.co.uk>> wrote: > > > > On 05/08/16 21:11, Howard Spoelstra wrote: > > > >>> On 05 Aug 2016, at 17:59, Mark Cave-Ayland > >>> <mark.cave-ayland(a)ilande.co.uk <mailto:mark.cave-ayland@ilande.co.uk> <mailto:mark.cave-ayland@ilande.co.uk <mailto:mark.cave-ayland@ilande.co.uk>>> > >>> wrote: > >>> > >>> On 30/12/15 16:44, Mark Cave-Ayland wrote: > >>> > >>>> This patchset is loosely based on earlier work by BALATON Zoltan > >>>> <balaton(a)eik.bme.hu <mailto:balaton@eik.bme.hu> <mailto:balaton@eik.bme.hu <mailto:balaton@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 <mailto:mark.cave-ayland@ilande.co.uk> > >>>> <mailto:mark.cave-ayland@ilande.co.uk <mailto:mark.cave-ayland@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(-) > >>> > >>> Following up from this, I found out today that the reason OS 9 rtl8139 > >>> drivers don't work in QEMU is due to the same issue, i.e. by default > >>> Apple OF appears to enable bus mastering upon boot (OpenBIOS currently > >>> doesn't) and so many driver authors forget to explicitly enable this. > >>> > >>> So taking this patch and making a few minor tweaks I was able to get the > >>> rtl8139 working in OS 9.2 and surf the web in Classilla :) I'm not sure > >>> whether it solves similar issues people were having in 10.4.11 but I'd > >>> invite people to test and report back. > >>> > >>> I'm also of the mind that for OpenBIOS I think this patch is a bit of > >>> overkill - if BM is to be enabled, then it would be configured by the > >>> on-board FCode ROM regardless of bus/slot id so I'm going to remove this > >>> part of the patch for the respin. > >>> > >>> > >>> ATB, > >>> > >>> Mark. > >>> > >> Hi, testing with the resulting OpenBIOS from these patches revealed that > >> 9.0, 9.1, 9.2, 10.0 and 10.1 now all support networking with the realtek > >> driver. 10.0 and 10.1 boot rather slow. 10.2, 10.4 and 10.5 do not boot > >> anymore, neither from cd/dvd nor hard disk image. Strangely enough a > >> 10.3 hd still works. 10.5 now reports “EXIT” at the openbios prompt. The > >> others just display Trying hd:,\\;tbxi <smb://;tbxi> > > > > Hi Howard, > > > > Thanks for testing! The patches are based on top of my next branch, and > > I don't see any problems booting 10.2 from CD to the installer? > > > > I've pushed my branch to > > https://github.com/mcayland/openbios/commits/ppc-busmaster <https://github.com/mcayland/openbios/commits/ppc-busmaster> for > > comparision - does that match what you see? I'm also using QEMU git > > master rather than the ppc-for-2.8 branch if you could also check that? > > > > > > Many thanks, > > > > Mark. > > > > I repeated all tests with Qemu master and your busmaster OpenBIOS. All previously tested CD/HDs do boot. Networking is functional for 9.0 through 10.4.11(!), with the exception of 10.2, which needs the realtek driver. 10.2 gets an IP address from slirp, but has no internet connection. > > Best, > Howard > -- > OpenBIOS http://openbios.org/ <http://openbios.org/> > Mailinglist: http://lists.openbios.org/mailman/listinfo <http://lists.openbios.org/mailman/listinfo> > Free your System - May the Forth be with you There you go: http://www.open.ou.nl/hsp/downloads3/openbios-qemu-busmaster.elf.zip <http://www.open.ou.nl/hsp/downloads3/openbios-qemu-busmaster.elf.zip> Best, Howard

1 0

[Report] Mac OS X Developer Preview
by Natalia Portillo 05 Aug '16

05 Aug '16

Hi all, I've been asked by Mark to report my testings here. Tested with qemu-for-ppc-2.8 commit 8b0262d0bcb7c697f2db8d6cd731cb478937902a. Command line: qemu-system-ppc -M mac99 -m 256 -prom-env 'boot-args=-v' -bios foo/openbios-qemu-vga.elf -boot d -prom-env 'auto-boot?=false' -hda foo.qc2 -cdrom DP.iso -nographic -cpu G3 Developer Preview 1: Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:9,\\:tbxi this image is not for this platformNo valid state has been set by load or init-program ok 0 > Developer Preview 2: Kernel panic, see attachment. Developer Preview 3: Boots, installer doesn't allow to choose destination drive, doesn't matter if it's empty or not. Developer Preview 4 and Public Beta: Still waiting for root device

3 8

[Report] AmigaOS 4.0 for Mac Mini
by Natalia Portillo 05 Aug '16

05 Aug '16

Hi all, I've been asked by Mark to report my testings here. Tested with qemu-for-ppc-2.8 commit 8b0262d0bcb7c697f2db8d6cd731cb478937902a. Command line: qemu-system-ppc -M mac99 -m 256 -prom-env 'boot-args=-v' -bios foo/openbios-qemu-vga.elf -boot d -prom-env 'auto-boot?=false' -hda foo.qc2 -cdrom AmigaOS\ 4.0\ $Hacked\ for\ Mac\ Mini$.iso -nographic Output: Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:,\slb_v2 >> switching to new context: MM/OF Second-level booter V2. Idea, design and main code: Andrea Vallinotto. SFS and ISO9660 reading routines: Joerg Strohmayer. No config files found in any supported media/device! Goodbye EXIT 0 >

3 5

[Report] MkLinux
by Natalia Portillo 04 Aug '16

04 Aug '16

Hi all, I've been asked by Mark to report my testings here. Tested with qemu-for-ppc-2.8 commit 8b0262d0bcb7c697f2db8d6cd731cb478937902a. Using Mac OS 9.0.4 to load MkLinux Loader. Command line: qemu-system-ppc -M mac99 -m 256 -prom-env 'boot-args=-v' -bios foo/openbios-qemu-vga.elf -boot c -hda mklinux -cdrom maindisk.img -cpu G3 -monitor stdio Shows some kernel messages and hangs there, see attachment.

2 3

[PATCH] mac: Don't set APPL, address properties on NewWorld
by Benjamin Herrenschmidt 04 Aug '16

04 Aug '16

They are created by the MacOS ROM and in some cases MacOS X to contain the *virtual* addresses of the BARs as mapped by the kernel. Having these already there with the wrong values causes the hangs with MacOS X 10.5 and the video driver. The reason is that the IONDRVFramebuffer code in OS X 10.5 won't replace those properties if they already exist, so the driver ends up accessing the addresses put in there by OpenBIOS which aren't valid mapped virtual addresses under OS X. Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> --- drivers/pci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/pci.c b/drivers/pci.c index 0cdf0bf..9813086 100644 --- a/drivers/pci.c +++ b/drivers/pci.c @@ -1029,10 +1029,9 @@ static void ob_pci_add_properties(phandle_t phandle, } pci_set_assigned_addresses(phandle, config, num_bars); - - if (is_apple()) { + + if (is_apple() && is_oldworld()) pci_set_AAPL_address(config); - } PCI_DPRINTF("\n"); }

3 2

[Report] Mac OS X 10.5
by Natalia Portillo 04 Aug '16

04 Aug '16

Hi all, I've been asked by Mark to report my testings here. Tested with qemu-for-ppc-2.8 commit 8b0262d0bcb7c697f2db8d6cd731cb478937902a. Command line: qemu-system-ppc -M mac99 -m 256 -prom-env 'boot-args=-v' -bios foo/openbios-qemu-vga.elf -boot d -prom-env 'auto-boot?=false' -hda foo.qc2 -cdrom MacOS105.iso Still waiting for root device. Btw for those that say "10.5 removed ADB drivers", that's false. You can see on https://opensource.apple.com/release/mac-os-x-105/ drivers are still there. Also PowerBook G4 Titanium, uses ADB keyboard and trackpad. I checked it on my tibook with Linux. ADB was removed in 10.6.

2 1

[Report] Rhapsody DR1
by Natalia Portillo 04 Aug '16

04 Aug '16

Hi all, I've been asked by Mark to report my testings here. Tested with qemu-for-ppc-2.8 commit 8b0262d0bcb7c697f2db8d6cd731cb478937902a. Command line: qemu-system-ppc -M mac99 -m 256 -prom-env 'boot-args=-v' -bios foo/openbios-qemu-vga.elf -boot d -prom-env 'auto-boot?=false' -hda foo.qc2 -cdrom RhapsodyDR1.iso -nographic Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:%BOOT >> Not a bootable ELF image >> switching to new context: 4+:interpret: exception -13 caught >> interpret : update-key-map " get-key-map" " kbd" open-dev $call-method drop gKeyMap 4 0 do swap dup @ >r 4+ swap dup dup @ r> or swap ! 4+ loop ; update-key-map gKeyMap 1+ c@ not h# 40 and if 0 stdout ! then failed with error ffffffed Rhapsody Kernel Loader <12:53:39 970908> interpret: exception ffffffdf caught >> interpret to DIH value &CL DIH to my-self &CL 0 100 " set-colors" ^dpy " width" GMP ?dup 0= if 280 then " height" GMP ?dup 0= if 1E0 then 2dup to Dheight to Dwidth " linebytes" GMP ?dup 0= if Dwidth then " depth" GMP ?dup 0= if 8 then over value rowbytes active-package DIH ihandle>phandle to active-package : rect-setup >r >r rowbytes * + frame-buffer-adr + r> -rot r> ; : DRAW-RECTANGLE rect-setup 0 ?do 2dup 4 pick move 2 pick rowbytes d+ loop 3drop ; : FILL-RECTANGLE rect-setup 0 ?do dup 3 pick 3 pick fill rowbytes + loop 3drop ; : READ-RECTANGLE rect-setup >r swap r> 0 ?do 2dup 4 pick move rowbytes 3 pick d+ loop 3drop ; to active-package failed with error 00000100 interpret: exception ffffffdf caught >> interpret drawImage failed with error 0000003b interpret: exception ffffffdf caught >> interpret drawImage failed with error 00000005 interpret: exception ffffffdf caught >> interpret drawImage failed with error 0000000e interpret: exception ffffffde caught >> interpret dev /packages/obp-tftp failed with error 00000003 load isn't unique. Searching exhaustively for boot device... interpret: exception ffffffdf � caught >> interpret 2ldr-spin 2 pick 200 erase 200 * swap 200 um* " seek" ^bIH " read" ^bIH 10 ms failed with error 00512100 interpret: exception ffffffdf � caught >> interpret 2ldr-spin 2 pick 200 erase 200 * swap 200 um* " seek" ^bIH " read" ^bIH 10 ms failed with error 00512200 interpret: exception ffffffdf � caught >> interpret 2ldr-spin 2 pick 200 erase 200 * swap 200 um* " seek" ^bIH " read" ^bIH 10 ms failed with error 00512000 interpret: exception ffffffdf � caught >> interpret 2ldr-spin 2 pick 200 erase 200 * swap 200 um* " seek" ^bIH " read" ^bIH 10 ms failed with error 00512100 interpret: exception ffffffdf � caught >> interpret 2ldr-spin 2 pick 200 erase 200 * swap 200 um* " seek" ^bIH " read" ^bIH 10 ms failed with error 00512200 interpret: exception ffffffdf � caught >> interpret 2ldr-spin 2 pick 200 erase 200 * swap 200 um* " seek" ^bIH " read" ^bIH 10 ms failed with error 00512000 interpret: exception ffffffdf � caught >> interpret 2ldr-spin 2 pick 200 erase 200 * swap 200 um* " seek" ^bIH " read" ^bIH 10 ms failed with error 00512100 interpret: exception ffffffdf � caught >> interpret 2ldr-spin 2 pick 200 erase 200 * swap 200 um* " seek" ^bIH " read" ^bIH 10 ms failed with error 00512200 ?no dev call-method fill-rectangle: exception ffffffdf >> call-method fill-rectangle failed with error ffffffdf call-method draw-rectangle: exception ffffffdf >> call-method draw-rectangle failed with error ffffffdf EXIT 0 >

1 0

[Report] MorphOS
by Natalia Portillo 04 Aug '16

04 Aug '16

Hi all, I've been asked by Mark to report my testings here. Tested with qemu-for-ppc-2.8 commit 8b0262d0bcb7c697f2db8d6cd731cb478937902a. Command line: qemu-system-ppc -M mac99 -m 256 -prom-env 'boot-args=-v' -bios foo/openbios-qemu-vga.elf -boot d -prom-env 'auto-boot?=false' -hda foo.qc2 -cdrom MorphOS.iso -nographic MorphOS 1.4.0, 1.4.5, 2.0, 2.1, 2.2, 2.3: Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > dir cd:,\ Unable to locate device cd:, ok 0 > It is not working with partition-less disks or ISO9660 filesystems. MorphOS 2.4 and 2.5: Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:,\\:tbxi >> switching to new context: Quark/OpenFirmware Trying to write invalid spr 569 (0x239) at 004002e4 Trying to write invalid spr 568 (0x238) at 004002e8 Hangs there. MorphOS 2.6, 2.7, 3.0, 3.1: Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:,\\:tbxi >> switching to new context: Quark/OpenFirmware console failed System: <PowerMac3,1> Rev <> CPU0: <PPC7400> Version 0xc Revision 0x209 CPU0: CPUClock 266000000 BUSClock 100000000 Hangs there. MorphOS 3.3, 3.4, 3.5 and 3.6 show same output but need to be booted with "boot cd:,\mac_ppc32\boot.img" MorphOS 3.7: Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:,\mac_ppc32\boot.img >> switching to new context:

1 0

[Report] Mac OS X 1.0 Server, Mac OS X 1.1 Server, Mac OS X 1.2 Server
by Natalia Portillo 04 Aug '16

04 Aug '16

Hi all, I've been asked by Mark to report my testings here. Tested with qemu-for-ppc-2.8 commit 8b0262d0bcb7c697f2db8d6cd731cb478937902a. Command line: qemu-system-ppc -M mac99 -m 256 -prom-env 'boot-args=-v' -bios foo/openbios-qemu-vga.elf -boot d -prom-env 'auto-boot?=false' -hda foo.qc2 -cdrom MacOSX.iso -nographic Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:%BOOT >> Not a bootable ELF image >> switching to new context: 4+:interpret: exception -13 caught >> interpret : update-key-map " get-key-map" " kbd" open-dev $call-method drop gKeyMap 4 0 do swap dup @ >r 4+ swap dup dup @ r> or swap ! 4+ loop ; update-key-map gKeyMap 1+ c@ not h# 40 and if 0 stdout ! then failed with error ffffffed Rhapsody Kernel Loader <02:12:14 990220> sl-debug:interpret: exception ffffffed caught >> interpret sl-debug failed with error 00000003 Debug Flag = 00000000 interpret: exception ffffffdf caught >> interpret to DIH value &CL DIH to my-self 1 encode-int " AAPL,boot-display" property &CL 0 100 " set-colors" DIH $CM " width" GMP ?dup 0= if 280 then " height" GMP ?dup 0= if 1E0 then 2dup to Dheight to Dwidth " linebytes" GMP ?dup 0= if Dwidth then " depth" GMP ?dup 0= if 8 then over value rowbytes active-package DIH ihandle>phandle to active-package : rect-setup >r >r rowbytes * + frame-buffer-adr + r> -rot r> ; : DRAW-RECTANGLE rect-setup 0 ?do 2dup 4 pick move 2 pick rowbytes d+ loop 3drop ; : FILL-RECTANGLE rect-setup 0 ?do dup 3 pick 3 pick fill rowbytes + loop 3drop ; : READ-RECTANGLE rect-setup >r swap r> 0 ?do 2dup 4 pick move rowbytes 3 pick d+ loop 3drop ; to active-package failed with error 00000100 call-method fill-rectangle: exception ffffffdf >> call-method fill-rectangle failed with error ffffffdf interpret: exception ffffffdf caught >> interpret drawImage failed with error 00000108 interpret: exception ffffffde caught >> interpret dev /packages/obp-tftp failed with error 00000003 load isn't unique. ?no dev call-method fill-rectangle: exception ffffffdf >> call-method fill-rectangle failed with error ffffffdf call-method draw-rectangle: exception ffffffdf >> call-method draw-rectangle failed with error ffffffdf EXIT 0 > OS X Server 1.2=== Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:,%BOOT >> Not a bootable ELF image >> switching to new context: or === Welcome to OpenBIOS v1.1 built on Jul 31 2016 05:52 0 > boot cd:9,\\:tbxi >> switching to new context:

1 0

Re: [OpenBIOS] [PATCH] mac: Don't set APPL, address properties on NewWorld
by Benjamin Herrenschmidt 04 Aug '16

04 Aug '16

On Thu, 2016-08-04 at 13:56 +0200, Howard Spoelstra wrote: > Great, that fixes the "regression". One thing I noticed while booting > with only the Leopard iso is that Qemu/OpenBios make the Leopard > system profiler show two ATA devices, both containing a QemuDVD > drive. Perhaps that is the reason a hard disk is not recognised? Right, I'll look into that later. I have a mostly working PMU now, which speeds up 10.5 boot significantly. Getting that to work with OS 9 required some fiddling .. Last remaining problem with the video ndrv is that MacsBug doesn't work with it and I can't seem to figure out why so far. I've added pages support etc... to no avail. There is *something* we do that upsets it, everything else works (and MacsBug works fine without the driver, on just a dumb fb). Cheers, Ben. > On Thu, Aug 4, 2016 at 3:16 AM, Benjamin Herrenschmidt > <benh(a)kernel.crashing.org> wrote: > > They are created by the MacOS ROM and in some cases MacOS X to > > contain > > the *virtual* addresses of the BARs as mapped by the kernel. > > > > Having these already there with the wrong values causes the hangs > > with MacOS X 10.5 and the video driver. > > > > The reason is that the IONDRVFramebuffer code in OS X 10.5 won't > > replace > > those properties if they already exist, so the driver ends up > > accessing > > the addresses put in there by OpenBIOS which aren't valid mapped > > virtual > > addresses under OS X. > > > > Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> > > --- > > drivers/pci.c | 5 ++--- > > 1 file changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/drivers/pci.c b/drivers/pci.c > > index 0cdf0bf..9813086 100644 > > --- a/drivers/pci.c > > +++ b/drivers/pci.c > > @@ -1029,10 +1029,9 @@ static void ob_pci_add_properties(phandle_t > > phandle, > > } > > > > pci_set_assigned_addresses(phandle, config, num_bars); > > - > > - if (is_apple()) { > > + > > + if (is_apple() && is_oldworld()) > > pci_set_AAPL_address(config); > > - } > > > > PCI_DPRINTF("\n"); > > } > > > > > > -- > > OpenBIOS http://openbios.org/ > > Mailinglist: http://lists.openbios.org/mailman/listinfo > > Free your System - May the Forth be with you > > >

1 0

[Qemu-ppc] [PATCH] ppc: Add MacOS VGA driver ROM
by Programmingkid 02 Aug '16

02 Aug '16

On Jul 27, 2016, at 6:10 AM, qemu-ppc-request(a)nongnu.org wrote: > Message: 1 > Date: Wed, 27 Jul 2016 18:27:33 +1000 > From: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> > To: qemu-ppc(a)nongnu.org, David Gibson <david(a)gibson.dropbear.id.au> > Cc: qemu-devel(a)nongnu.org, Mark Cave-Ayland > <mark.cave-ayland(a)ilande.co.uk>, Alexander Graf <agraf(a)suse.de> > Subject: [Qemu-ppc] [PATCH] ppc: Add MacOS VGA driver ROM > Message-ID: <1469608053.5978.132.camel(a)kernel.crashing.org> > Content-Type: text/plain; charset="UTF-8" > > The project is at https://github.com/ozbenh/QemuMacDrivers > > This adds a native MacOS driver in ROM (which can be picked up > by MacOS once OpenBIOS has been updated if Mark accepts > the patches I sent him) which allows MacOS classic > (tested 9.2.1) and MacOS X (tested 10.1.4 and 10.4) > to properly use QEMU std VGA (10.1.x doesn't work at all > without it, the others get the ability to change resolution > and color depth). > > Building the ROM is tricky and requires CodeWarrior for MacOS > so I include a pre-built binary. > > Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> > --- > hw/ppc/mac_newworld.c | 8 ++++++++ > pc-bios/qemu_vga.ndrv | Bin 0 -> 12808 bytes > 2 files changed, 8 insertions(+) > create mode 100644 pc-bios/qemu_vga.ndrv > > diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c > index 7d25106..5029345 100644 > --- a/hw/ppc/mac_newworld.c > +++ b/hw/ppc/mac_newworld.c > @@ -511,6 +511,13 @@ static int core99_kvm_type(const char *arg) > return 2; > } > > +#define MAC_CORE99_COMPAT \ > + { \ > + .driver = "pci-vga", \ > + .property = "romfile", \ > + .value = "qemu_vga.ndrv", \ > + }, > + > static void core99_machine_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -520,6 +527,7 @@ static void core99_machine_class_init(ObjectClass *oc, void *data) > mc->max_cpus = MAX_CPUS; > mc->default_boot_order = "cd"; > mc->kvm_type = core99_kvm_type; > + SET_MACHINE_COMPAT(mc, MAC_CORE99_COMPAT); > } > > static const TypeInfo core99_machine_info = { > diff --git a/pc-bios/qemu_vga.ndrv b/pc-bios/qemu_vga.ndrv > new file mode 100644 > index 0000000000000000000000000000000000000000..0b1549d1c5978f87aed2b6e496a23fbaf18dbea4 > GIT binary patch > literal 12808 > zcmcIq4RBl4mA;amWZ5{0p=Q^?KY3{!Mof&y6hj}_b>&0>89PD20;gS=wQRj4+L0xV > zBqz%95<NR9O=j7tGYM^grZ^3-VJ6FXrqIG9-~>W<nW0&j9d^hpKcNAdodrr4*ph_g > z?RW0GlAmOWm~N}lnRo8F=bn4+x#ym9-+lMC_~yk4b=|tero=E~%=Yhxe^QO-%+JB> > zR50)}iOt&?%Yh@oB*{`&<z_4g9%i#y>vAIPp8(S(v=cuYx=rNd=boq|hHn5+&(H?K > znEe$|<~jk-{m^gzcSRm!%n3YK_e~4k0eqe)UsFV{p)xwS8E^~WZvYX%7QlAELx4ko > z!+?JSd;mCSXSVr(s{uCxdI2GT2H4F<0K<^n+pbuCtM0hPrvJoSrT@{pP+#C(=1WF4 > zs>yyexiK=Vrurg7Y;|Zvy+d6eNu`sUsT^3*Lyx;6VKr{$TM>#4tI=R&L`||lJRa?i > zM&rYwG}@-X8cVbO&9UJP$#^XC_iE4WtmpO>@sW{GEZma<l8CBlmED=3=Bzs$_KhY( > z=}0^ljCT*E;?Yr5_N(chSXxacM-%CpUVLgu^uuyWu8cv`9^Z<1VskOg7fB`JDYcl~ > z6N{wtv_LYRP?PD+x2h#+{ZOB+jD;hiSpTL_;<_7`qwUH}V%7TOig;{YWc?j#C_E5P > zh6{)T$w*q|)VuoogckYH2rDvFtyVXcBKzXAsKE`YIafY4HJpqj$XdR*NrHK~$4Z#( > z+UHKOs@E>qnC%Jpt<G%lg6DuG;1F*6<I`itClfa2-m}=4(zN=F_Om6KiTy00y>)#? > zGdeQLkew;x_RIXt_B~G{tLh%JNubpYOxE124YO7);&^<uF3H(#r!)E(OMq{U7Ov0u > z89SwisBC{<lwYN?qBG`ajw=Q2$V@x?DnUCqLv!sEv^}OQSEDFzC!Xx_Pczx~&u8>w > z)Q`g^>NaFw1pPhG_Y+-m3VL968|SE~YcEmv15sCJ_U+8|?N)T-#K5VFd%feVr3E&| > zvs%G=!kFu*Z*6-;yPqw&T<>PJ+F(VyCOI<Nwj~+e#?~r}SwM3;9zP7buhyA7F~%BT > zZ+YSvYo2(Qd3M=Y%dW+&ZC5vIr+Pj|`;E`?bA<Wn_-*Bsm=|BKVH`Wy#Msm##z=>W > zMa;8z5o-ptc1$xVd*Ht@7xL?*i?Ws3vybxfTU2gA<mnz~Zs>i4+M<mDXn~Bjj(0E? > zw8ebYWMBF;qa3C2HSM3sVoc%s%{1nYN#g|CCZNk&{dvZq%MEBJi*|LEb`i8|C~Bvm > z-F;@eix*5i7rm@)soxBpYEkz~(zVyP_%8aW_Orj<i8}JfHw67<YExiS*r}w=(2o4t > zVz*BqcW2ISI_#o1F&A`{Fm^Y}RVdF#xf<mf>W6#{ZAQ!WxBFe=%lsT=xt>@z4jbAm > z&YnI`cC=v}jmjVrj>QkQp<PaA(f%mLNNsC-jSKJl*}?~uA<XwMlQ56h@_966_~A=l > z@}*q+>0`zhc^%%qKC|ru)*xhgAnQSl_bLx#3%keIE6R|gGsp_purg@;9y&fHo`*<p > zKdX5Tv`G_}BEa{Uxa$evJ50QS=$gQZKVjmP`+$c{TzVS#S|K}N(rPe1<}>lCn}91O > zUQIGuOx*oCa9QA=1Ftpl%ZSHK@^XGmxYf3YVULowd45@D+xvOjJlbn~xkcD!8RA<F > zZ1YsHZOlIBUxz+FGjZoU;Ac#{VlnVHO?)2lyejA+;KxneeHQpLChjDkJ_LO~#`95= > zHoph>UK6jn9QgevK5rFpUGO{xJZ<9D#J|DBYt{h2+r%#?I|}<cNiShvXE$(RU#_pP > zZ^dswmnm)`c9XuszEvlIlYKw7*!Sad_AT^XDcozEzef1_EI%#cP4^n-E})+ikbNoM > zaqzxYj@P;dXV$v33vKr4S?2K|-tkyHXuOB9)wMeegW@G<h=Er^?p)WVGzpnK%6R3J > z9%dfJ!E6%}<Rh(`vT8pnH+HLz8jlmwlghaCEcE$^V(bLsCvQ8=8ankvN|8nr8g`C| > ziHE#8^LFZym?EXu37QUCU8f#a6=`Ey(C&t;9i4hKp-7vOg0=y)bf>-%e94rcHKXld > zr=HrZNU>o-qg>EOI^gM7#%;QealuAZRyy@HD-~(goucf4e#43skwv*qw5t(M?mJe0 > z$;G-k<-DSO$w9=w;Fbj!<wgV=W~<S%EOW4dxw7xrkt?JVup#;Db(F_xk3su_?5{t~ > z4E&R;3-tX~J-$}%y_6nXg&r64dLXwLPY6A1lmoLLoX_d8u#_G=$A^p$#k!c(?nS;j > zvMfV;u;4{k7sdY_4yJfm-hU}hXLJYig64*ARAWsLEv(lwR>T*`K60A&W1ZTOF9HKc > zUEihrs^804aI#L(hV4(H&aE9-meC&;wCxznc4qgpZ#>&!V4t|?jMqD69Or&%V;hin > z2KgQaI_KkSk^X$XG|X3nWxnb$U(-1|Ip-laj%6=Wj)88|p9BW<uch10j<=y((^u=3 > zvz-jvX@iLE%=o?LsLSN^o{2@|L(XR8NvvIi;@nrnBF@_d-ecu>XRq^Fb4alt`I*bQ > z2eL-R{*4Jc=l6=abwhqK2f5@2%|dPxavKjWVlK=0Phk9t)eo)m3-%CO>-nB(2lj=Y > zLf^~j{X^u==XPNKiGAa>#d=%w?;P~D+T&r!Rbda?6m&0^`!)5o%AJDTc^J>Nd!ci& > z+&@9zoSly&-#snnkMAK76KBb{>Rse_zeD>`TEmz2JC_r@J#*xRKcB~*v$Q|YVNS@G > zT1;PZ^-}JI?O2QO1wUKRh<fCV1*?i}X&q}RpAs^$PdK-w$iHa5>OgDJ7;6u*lUu+3 > zT+y0xZGr5?x%FS<zdzlPWj5LmV9qKK58c{eeI_Wmx`M1CYwi*F`&=4)EU3G>v_Ym| > z+;;G`BX8D{4S?4HZ-BmSD3ct@lg+S&Lp*JGHlU1Hig%hpE|X&Q36$$}yDh3AhEx9& > zL$>Hw*>DbXMRwaG?20|l*`+jB9vqipJcxU&0&5iSa4ZTM?St;7{>7LS%a{nKG5Js@ > z0q-Qg7H!*r+XUVW+%E7si~QX9kpIi?r)H0b&)H+W#up=H=ByoiIEFcMc*l6YBOA)x > zhM0!D4WTR6p7ba5J>6^k@ed{X=Ke_i@HIUL`GsrSbrNzP%*mC}-kOJs*L!f#)djmR > zfZc2Gq}*Oh;{<*=Xm!A0U#3(3!gEYK$LT5Bj-gEhc&QET4{1+FzULOa3&c~VC*ONm > z-y22D7k*^)8vpxNiS?=Ii<mFya3Kd8YpCBT#8b?VpYMg6n4NqEG#B`4Cz|LzqR<zt > zv9^4Cs91{r?<vuLGv3!+7$2>{oWIq~rLWR{SK;k7KL0#7M;^#EV*r0Y^I$Ah$U{7y > z@6E#Jv&;e7Ao&^22xg6KZn3Z8`{;A5#MoLe4zFq33!mp~`)9Ie41H4mv*vU1Z<^0s > zpJTZ`F`s>Z=K0*&Ykc;PCHnW_%!Ssrts8z1T>=yrE$f_OO$Gd@rgISQI*#Ee_bJAH > zj3=#!f-{vl`qlyHVk^>x@?B>M-|~RQ%sKgTUoh<IBHQ>`<?D0txoPY99nPZ6cT<XY > z6~F2=J}u6Fq(gMFk-5kZE&jb$-@@!2FB%5wa=Kj3by>vvv?kaKah~Q;lXy;PFyHAb > zuM_X@v`$F2xlS5q`|aV<=Vz02?nXLqdl8Pp_p22rdX4{ismONZM+aM)jEl5(I*#&O > zQ_}*wq3quF4(rn&VF8>$+7z6b^7*B6K4x5)Xf)$B+HZia<O9{3L$=O;fX1SXF|V?p > z`TWd1&oU;;18qtZ-oYV9w=plCZajT>(z$FWo|ON_ry9*1jJlb3m~vyLIQa9*sg6_m > zF@M-={Nc47jm2xn_DX^8HWvG??T|8T7&E$8tSQvpc0Y8p!H=sZoA8dyW9qq^f-2to > zF#nM4n!rAVo>LCQQ}an@lvJKCo;CCY-xZxY^K*O~`z!IhO4MDA^LbiluBmM}--Im% > zUQM{7vWnpFnTy)?h5sSwQj3%4oCZ8856PI9H-J-ag733efXkrkz>h-zoGwkuBtJuS > zO&vgv((%#3?DL!ad4M(36S`iFcK2iL+9$TM`QYPYfNo8KpV~TdZGk%lZf)OJsy%q+ > zGBQlNZ7a~h-Eqn|L1$;>{34&v;SahK=h%Z+)$ZNKyna@7C!NQl-K=*-Yo6ifM3UL= > zA5Qajjnq!`dCB)Yh5CJrH3SFUo!R&8we&3kvF8}cn94e_r>p#p(Bsmw#vyCFDN766 > zYbS?!`%!97=TVR~b}8MaE${jrKX<!%JR9Wa{|{(bH<*(u><e}V@70@>A-8|vxYRYE > zs&o$X(ZGw+jh*mk51Tp)-@)09dkFN`MQnNo@vBa&=ds_d)jKk~v)F$Q;v=SE+!VZ5 > z>Z17uer-_WxC8j&;8x&6?sPW%pPB3r@LdS!K9D)K`yJ*3c;Sz*5%xOuh$-k(+hVW9 > z*@>hz@HkngJjQInNu0UtW33*E;+64+`9$0pa{mZzZy*`LNvR7t-w)`++N{7c0DUO; > z%)}FMCNh^ZF5y>`N{9sz(;{Sd;C}e;xA5&MfbUwt939`F{OG4|B82#c*akkYK5pY< > zQ(nOLfnPIxb8?ReKgjEo+v8dNk<S-m4)*TN$YX8v9)!8z?_3^c<{ZeXBw4WU_b3i= > z-ZI}UX2~9M{{ro7Xh(f0z^~K>>0R#a@1ooaXhDA-Wtz2NzT2oz%uAhu?=Lu`98$JN > zWk0KUmikAIX%#xrT)coYBl_-84g3`FeZu~i^m{($p~@PxiHPwikn@0L{P@P?dYaDx > z^ugS=eU<E7Ou*P46nwK{K#qs@mE0B%*0RHqACDVnGZ#w54$*E(v}1b<+tupBtex_S > zpE*Ag^PL}msrjaNTkVl0SeK4}rFUGM3E-^8@$w}0w3>8F!aO73WxFWP6ZMi=rt|s2 > zJyyXU*Sf!<zV`9H{>AL;9L~rbFXLVOqu^HLG!uU}n9bv_4;=NjW{)~D$j@xx6!23V > zw+9D(tpR$s5c>nzDnHKLUPbw>+fDwjyUe^xdk1>ICOgm?hM(002XW3>!CG-f&pb{} > ztL3!yW*nFRjmDR=oi)DE-bec>#xsOChk3;LYCvm5+z|c1hYk%)!gWvMTllcO7JDRo > zAFo_O-=F!}?|rB7-SGV9kS}3f;~VL@rNA8n+a=7yxrM-O1MhJhHfMH<m7v>zJ5Bzx > z)YfJ4oc%B06(-Nww}9hYG|4<m-!3Wz{t|HND+KzpyAQLz-47!Mn)8>B3x};|w?${% > zG=JLj%lJ25YKJl6`+=S3o0+`}rw5Q{@$x{pov&Bq5No?O{#_m4adYSK;Cq66wn&b< > zI2Y#5=;{45w~j=d!aB8Y5q>{w%}sY3X9WKQ&0X*zoZTG8S^AsTXF5(n*YV14V-Jb< > zJ);u2%A%`{zVmyrPHQ!X<HwNU<=?T#D{rGcC*sCQ$fIx5Z^93KLH5b>;PHvva-_kD > zc0WUIZema33~3sCkM0O#p1tUw-etzw9(*gRrZE6-&?Q#mVH`(Xs~muh{~4f@Y<!C$ > z{~|i>FR%vy8^qX&_7KWrfS{+|jMXG-0=TDvm*pMs^Pr>Rd5SscJD~A%w70wVqCSXw > z8`%r2742&&@1Z}h*`ML1JvPR<i^h%TPBAALocAaAc|UARYh*6D&5{!)`FAcIJ_);{ > z-;*?V+Hl1Uuo0b2G*3c@K_|0Mp`Q9wzzh1zg0CGq=KVGocgB!ECLl+zhSB<v%PY-$ > zD4@$_=xt@_QW<(n8G1t*x>APTS%%(ThVCvyXJzQ#GW6y$^qMmC+A?&18G2nAx~~kq > zx)dEt;4k#6oPzu7j7gJ#U4U^w8W3j8@f6@uKqtThs0G*<qx*pNHvqo`+y__-@B!)o > zmjR%w^eo^>Z2vw4oB;d^Z~(9q5CeQ4-~}vY%w+&h0;U0v0icI#3jjK}dI8M<C$0wm > z4saX*ot+N@eh5ec?g4ZGz~{srK?(XvkSC$v$|Zmr#@wd>F93dl@n-P+5x@<=SlvSa > zETzha013bV;5NXwF%U$e+^_x&VIyhv@90^*MjaWwYki1c@gqXf&jw53H-BF1B^Zm^ > zl_=U`;pE1Rk#L+u29u#-^=5f#s)|`}vQe|WfI|R`--Z>>jsV^Oj=5uffI+}^Ktf!A > z!-c*`D2l6kD@MX>C>~0NZ&{9Og-JD)l9#qA(Y3N5t_md*YM3tdne-}?8+Qpyu!B0A > ze`PE*6jgC6a+Nv~Pj2o{U=VUrO^+sHYFJ(x#$foJN;v|hP>~vqrZLDo{SGw|MH5og > zWV{88dEHG?|0u2`rqr++o?*jn!*ntpB?A9R@C6BeD#?HrfCBIV0)V>#8vx}08ej+D > zcoFO=D(C7aL5J-*|1(0LbSOQVGP~wJ+zkIjpHB4YM4wLd=|rDS^yx&OP91<go#?{} > zc}~d7w|fR<^yPfjq&eRNeg^Ov%1rQKTsi*#*R$Hxzc&(%;sR>k<aB3qro=C6&J<Tf > zab<L-czZ&PQOWA9e1dOPQ|VAN?Z=(gDDJ>o>TgYk5*s4JxagWxagCKOs7BNjvyy$0 > zq&l1~Q;DmnrP|yY!Ufu%*t&QhF6S0VyF;ZOHmaN>Nd8$+4SBq#keCc@4usYhazY_! > zxw(*0O%q?C{v@)P5nh{!C(|iEmfxmOQe82cOvRH0vLOE}YJJJjrmv_*pM|x=-w)TE > zHHQ4{*@Di|zH|k&qRYy~%(H0V3&c0!y7a6*A-YTrwMnY$aE}>_nO_(dSDlM{n;X~i > zP)Ze%s#pM|$KX@A7hGJkDjqI05!A)xBymf-R29*1<2n*sUmyr0nZ@0|DUu%EFpCWN > ztJO>zSHbBncL|MnstJUWp^+4pJhSVF?Wd5UWZ-KNdqAUfg;dFLmlw||<X9a~#2o%a > z+5Gu>`U5?G+vEGr(zf=DeAlX#tG=@|EUy}>Vt2+;rcWX=_xR++RZI+9PO0fM21tQ9 > z!~a!mbv!Mvi;u>_h}?1%OH5uYkEXyRht+i<MDf-tCK8~$@w(QwHpu7IX}SY1r{i)e > zGBO&4JIZ%0?*sGdxNKIX%<J{C=k|Vit^D0<T8Kf8p}!=*Xs^OIz)yjPx-(-|Yb!{w > zxlGoz>KRI<BI}WBt__(94lA>}JJ8o6ifnoJ9ms9p%J2?y%ry3V#YhAq(2=#7oDlcm > S3pms9xI7eDPqe?>@BaW(s=rMD > > literal 0 > HcmV?d00001 Your patch does successfully work with Mac OS 10.4.0, Mac OS 9.2.1, and Mac OS 9.0.4. Great job :) Reviewed-by: John Arbuckle <programmingkidx(a)gmail.com>

5 8

Re: [OpenBIOS] [PATCH 0/2] Add legacy virtio-blk driver to OpenBIOS
by Mark Cave-Ayland 01 Aug '16

01 Aug '16

On 01/08/16 16:06, Artyom Tarasenko wrote: > Good job, Mark! > So, now it's possible to boot the PPC and SPARC64 systems from virtio > drives, right? > > Artyom That's correct, with one caveat - it seems that the drivers in some of the test Debian 9.0 images don't like QEMU advertising both modern and legacy modes: ./qemu-system-sparc64 -drive file=/home/build/src/qemu/image/sparc64/debian-9.0-sparc64-NETINST-1.iso,if=virtio,media=cdrom,index=0 -nographic -bios /home/build/src/openbios/openbios.git/openbios/obj-sparc64/openbios-builtin.elf.nostrip -m 256 OpenBIOS for Sparc64 open isn't unique. close isn't unique. Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.1 built on Aug 1 2016 18:06 Type 'help' for detailed information Trying disk:a... No valid state has been set by load or init-program 0 > boot virtio0:d (cut) [ 22.223263] ffe2f1d0: ttyS0 at MMIO 0x1fe020043f8 (irq = 5, base_baud = 115387) is a 16550A [ 22.223905] Console: ttyS0 (SU) [ 22.277730] console [ttyS0] enabled [ 22.297898] mousedev: PS/2 mouse device common for all mice [ 22.321023] rtc-m48t59 rtc-m48t59.0: rtc core: registered m48t59 as rtc0 [ 22.323433] ledtrig-cpu: registered to indicate activity on CPUs [ 22.332493] NET: Registered protocol family 10 [ 22.356833] mip6: Mobile IPv6 [ 22.357582] NET: Registered protocol family 17 [ 22.358693] mpls_gso: MPLS GSO support [ 22.364318] registered taskstats version 1 [ 22.367031] zswap: loaded using pool lzo/zbud [ 22.378680] rtc-m48t59 rtc-m48t59.0: setting system clock to 2016-08-01 20:14:14 UTC (1470082454) [ 23.527600] random: systemd-udevd urandom read with 0 bits of entropy available [ 26.788885] ne2k-pci.c:v1.03 9/22/2003 D. Becker/P. Gortmaker [ 26.901425] ne2k-pci 0000:00:04.0 eth0: RealTek RTL-8029 found at 0x1fe02008000, IRQ 6, 52:54:00:12:34:56. [ 48.346114] NMI watchdog: BUG: soft lockup - CPU#0 stuck for 23s! [systemd-udevd:57] [ 48.347490] Modules linked in: virtio_pci(+) virtio_ring ne2k_pci(+) virtio 8390 [ 48.349833] CPU: 0 PID: 57 Comm: systemd-udevd Not tainted 4.3.0-1-sparc64 #1 Debian 4.3.3-2 [ 48.351288] task: fffff8000f4275e0 ti: fffff8000f55c000 task.ti: fffff8000f55c000 [ 48.352552] TSTATE: 0000009911001600 TPC: 0000000010024274 TNPC: 0000000010024278 Y: 00000000 Not tainted [ 48.355228] TPC: <vp_reset+0x14/0x40 [virtio_pci]> [ 48.356043] g0: 0000000000b04400 g1: 000001ff04800014 g2: fffffffffffb0000 g3: 0000000000000000 [ 48.357446] g4: fffff8000f4275e0 g5: 0000000000332ed0 g6: fffff8000f55c000 g7: 0000000000000001 [ 48.358836] o0: 0000000000000000 o1: 000000001000ad08 o2: fffff8000f55f380 o3: fffff8000f41a880 [ 48.360203] o4: fffff8000f41a888 o5: fffff8000f5ad2c0 sp: fffff8000f55ea41 ret_pc: 0000000000764384 [ 48.361666] RPC: <dev_set_name+0x24/0x40> [ 48.362418] l0: 0000000080000000 l1: 0000001111001607 l2: 0000000010025168 l3: 0000000000000400 [ 48.363788] l4: 0000000000000000 l5: 0000000000000001 l6: 0000000000000000 l7: 0000000000000008 [ 48.365198] i0: fffff8000f516c00 i1: 000000001000ad08 i2: 0000000000000000 i3: 00000000000000d0 [ 48.366586] i4: 0000000000000000 i5: 0000000000000000 i6: fffff8000f55eaf1 i7: 000000001000a4e4 [ 48.368098] I7: <register_virtio_device+0x64/0x100 [virtio]> [ 48.369130] Call Trace: [ 48.369740] [000000001000a4e4] register_virtio_device+0x64/0x100 [virtio] [ 48.370915] [0000000010025820] virtio_pci_probe+0xa0/0x160 [virtio_pci] [ 48.371983] [00000000006eaf40] pci_device_probe+0x80/0x100 [ 48.372879] [000000000076928c] driver_probe_device+0x16c/0x480 [ 48.373829] [0000000000769628] __driver_attach+0x88/0xa0 [ 48.374683] [0000000000766fdc] bus_for_each_dev+0x5c/0xa0 [ 48.375554] [0000000000768c1c] driver_attach+0x1c/0x40 [ 48.376408] [0000000000768710] bus_add_driver+0x1f0/0x2a0 [ 48.377281] [000000000076a114] driver_register+0x74/0x120 [ 48.378162] [00000000006e9894] __pci_register_driver+0x34/0x60 [ 48.379186] [000000001002a018] virtio_pci_driver_init+0x18/0x28 [virtio_pci] [ 48.380328] [0000000000426c58] do_one_initcall+0xb8/0x200 [ 48.381226] [0000000000525200] do_init_module+0x50/0x1f0 [ 48.382091] [00000000004c2514] load_module+0x1c54/0x23c0 [ 48.382953] [00000000004c2e74] SyS_finit_module+0x94/0xe0 [ 48.383843] [00000000004060f4] linux_sparc_syscall+0x34/0x44 Fortunately it is possible to force legacy mode with a bit of QEMU command-line fu in order to get the desired behaviour: ./qemu-system-sparc64 -drive file=/home/build/src/qemu/image/sparc64/debian-9.0-sparc64-NETINST-1.iso,if=none,media=cdrom,id=cd,index=0 -device virtio-blk-pci,disable-modern=on,drive=cd -nographic -bios /home/build/src/openbios/openbios.git/openbios/obj-sparc64/openbios-builtin.elf.nostrip -m 256 OpenBIOS for Sparc64 open isn't unique. close isn't unique. Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.1 built on Aug 1 2016 18:06 Type 'help' for detailed information Trying disk:a... No valid state has been set by load or init-program 0 > boot virtio0:d (cut) [ 21.749180] ffe2f1d0: ttyS0 at MMIO 0x1fe020043f8 (irq = 5, base_baud = 115387) is a 16550A [ 21.749779] Console: ttyS0 (SU) [ 21.803436] console [ttyS0] enabled [ 21.824159] mousedev: PS/2 mouse device common for all mice [ 21.842179] rtc-m48t59 rtc-m48t59.0: rtc core: registered m48t59 as rtc0 [ 21.844768] ledtrig-cpu: registered to indicate activity on CPUs [ 21.858976] NET: Registered protocol family 10 [ 21.884821] mip6: Mobile IPv6 [ 21.885565] NET: Registered protocol family 17 [ 21.886398] mpls_gso: MPLS GSO support [ 21.892226] registered taskstats version 1 [ 21.894600] zswap: loaded using pool lzo/zbud [ 21.905840] rtc-m48t59 rtc-m48t59.0: setting system clock to 2016-08-01 20:36:46 UTC (1470083806) [ 23.025258] random: systemd-udevd urandom read with 0 bits of entropy available [ 26.240261] ne2k-pci.c:v1.03 9/22/2003 D. Becker/P. Gortmaker [ 26.364453] ne2k-pci 0000:00:04.0 eth0: RealTek RTL-8029 found at 0x1fe02008000, IRQ 6, 52:54:00:12:34:56. [ 26.386623] virtio-pci 0000:00:06.0: virtio_pci: leaving for legacy driver [ 29.109407] ne2k-pci 0000:00:04.0 enp0s4: renamed from eth0 [ 29.118803] vda: vda1 vda2 vda3 vda4 vda5 vda6 vda7 vda8 Starting system log daemon: syslogd, klogd. Given that transitional/legacy support is complicated enough, I'm quite tempted to rework this to a proper 1.0 driver before commit so the default behaviour "just works" for users. ATB, Mark.

1 0

[PATCH 0/2] Add legacy virtio-blk driver to OpenBIOS
by Mark Cave-Ayland 01 Aug '16

01 Aug '16

This patchset implements a legacy virtio-blk driver for OpenBIOS based upon Alex Graf's s390 driver included with QEMU and enables it for SPARC64 and PPC builds. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (2): drivers: add legacy virtio-blk driver config: enable virtio-blk driver for default PPC and SPARC64 builds config/examples/ppc_config.xml | 1 + config/examples/sparc64_config.xml | 1 + drivers/build.xml | 1 + drivers/pci.c | 18 ++ drivers/pci_database.c | 2 +- drivers/pci_database.h | 1 + drivers/virtio.c | 413 ++++++++++++++++++++++++++++++++++++ drivers/virtio.h | 331 +++++++++++++++++++++++++++++ include/drivers/drivers.h | 4 + 9 files changed, 771 insertions(+), 1 deletion(-) create mode 100644 drivers/virtio.c create mode 100644 drivers/virtio.h -- 1.7.10.4

2 3

[PATCH] Fix the location of the COPYING file
by Thomas Huth 31 Jul '16

31 Jul '16

The COPYING file is in the main directory, not in the Documentation folder. Signed-off-by: Thomas Huth <thuth(a)redhat.com> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index b6a9978..9f4b705 100644 --- a/README +++ b/README @@ -122,7 +122,7 @@ CREDITS ------- OpenBIOS was developed by Stefan Reinauer, Samuel Rydh and Patrick Mauritz. The OpenBIOS IDE driver was written by Jens Axboe. -For license details on this piece of software, see Documentation/COPYING. +For license details on this piece of software, see the file COPYING. If you have patches, questions, comments, feel free to contact the OpenBIOS -- 1.8.3.1

2 1

[PATCH 0/2] Miscellaneous minor fixes
by Mark Cave-Ayland 31 Jul '16

31 Jul '16

This patchset fixes up a couple of minor bugs found whilst developing the virtio driver (and should be considered a pre-requisite). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (2): ppc: fix va2pa() and pa2va() OF end range calculation libopenbios: don't allow find_package_method() to push a NULL for empty strings arch/ppc/qemu/ofmem.c | 4 ++-- libopenbios/bindings.c | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) -- 1.7.10.4

1 2

[Qemu-ppc] [PATCH] ppc: Add MacOS VGA driver ROM
by Programmingkid 27 Jul '16

27 Jul '16

> > The project is at https://github.com/ozbenh/QemuMacDrivers > > This adds a native MacOS driver in ROM (which can be picked up > by MacOS once OpenBIOS has been updated if Mark accepts > the patches I sent him) which allows MacOS classic > (tested 9.2.1) and MacOS X (tested 10.1.4 and 10.4) > to properly use QEMU std VGA (10.1.x doesn't work at all > without it, the others get the ability to change resolution > and color depth). > > Building the ROM is tricky and requires CodeWarrior for MacOS > so I include a pre-built binary. > > Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Could we see the patches you sent to Mark? Right now when I try to boot QEMU with your patch I see this message: qemu-system-ppc: Initialization of device VGA failed: failed to find romfile "qemu_vga.ndrv" Thanks

1 0

[PATCHv2 0/3] MacOS 9 fixups
by Mark Cave-Ayland 19 Jul '16

19 Jul '16

This patchset fixes up the r-stack in interpret mode and the evaluate word so OpenBIOS can boot OS 9 without r-stack corruption or introducing any regressions. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Move r-stack commands to a separate rstack.fs file - Minor tweaks suggested by Segher Cormac O'Brien (1): interpreter.fs: allow evaluate to split words on CR as well as LF Mark Cave-Ayland (2): rstack.fs: add pseudo r-stack implementation for interpret mode interpreter.fs: don't clobber stack across evaluate strings split on newlines forth/bootstrap/interpreter.fs | 4 +++- forth/lib/build.xml | 1 + forth/lib/rstack.fs | 21 +++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 forth/lib/rstack.fs -- 1.7.10.4

2 5

[PATCH 0/3] MacOS 9 fixups
by Mark Cave-Ayland 18 Jul '16

18 Jul '16

This patchset fixes up the r-stack in interpret mode and the evaluate word so OpenBIOS can boot OS 9 without r-stack corruption or introducing any regressions. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Cormac O'Brien (1): interpreter.fs: allow evaluate to split words on CR as well as LF Mark Cave-Ayland (2): bootstrap.fs: add pseudo r-stack implementation for interpret mode interpreter.fs: don't clobber stack across evaluate strings split on newlines forth/bootstrap/bootstrap.fs | 14 ++++++++++++++ forth/bootstrap/interpreter.fs | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) -- 1.7.10.4

2 18

Re: [OpenBIOS] Found out why replacing '\r' with '\n' works
by Programmingkid 17 Jul '16

17 Jul '16

On Apr 17, 2016, at 11:05 AM, Mark Cave-Ayland wrote: > On 17/04/16 15:50, Programmingkid wrote: > >> Good news, I found out why replacing '\r' with '\n' works to boot Mac OS 9. It is because there are several words that require that character to be at the end of the line. >> >> http://www.complang.tuwien.ac.at/forth/1275.ps >> This is the specifications to Open Firmware. Just do a search for EOL (End of Line a.k.a '\n'). You will see that several words need it in order to work. >> >> They will look like this: >> >> dev ( "device-specifier<eol>" -- ) >> >> The <eol> text is what specifies that '\n' should be at the end of the line. > > Really? Interesting. Can you provide a self-contained test case that > demonstrates that it is in fact the line ending that causes this > independent of the r-stack manipulation? Bear in mind that OpenBIOS may > deviate from the specification in its behaviour here. I implemented another stack that two new words use in place of >r and r> when running code in the bootscript. I see this message with and without the '\r' to '\n' patch: >> Dictionary space overflow: dicthead=000c3fe4 dictlimit=00080000 this image is not for this platform This means the implementing another stack did not fix the problem. It appears to make it worse. Here is the patch: Index: include/libc/string.h =================================================================== --- include/libc/string.h (revision 1391) +++ include/libc/string.h (working copy) @@ -47,7 +47,7 @@ extern char *strdup( const char *str ); extern int strcasecmp( const char *cs, const char *ct ); extern int strncasecmp( const char *cs, const char *ct, size_t count ); - +extern char *strstr(char *buffer, const char *search_string); extern char *strncpy_nopad( char *dest, const char *src, size_t n ); #define _U 0x01 /* upper */ Index: kernel/bootstrap.c =================================================================== --- kernel/bootstrap.c (revision 1391) +++ kernel/bootstrap.c (working copy) @@ -89,7 +89,7 @@ "here", "here!", "dobranch", "do?branch", "unaligned-w@", "unaligned-w!", "unaligned-l@", "unaligned-l!", "ioc@", "iow@", "iol@", "ioc!", "iow!", "iol!", "i", "j", "call", "sys-debug", - "$include", "$encode-file", "(debug", "(debug-off)" + "$include", "$encode-file", "(debug", "(debug-off)", "sub_>r", "sub_r>" }; /* Index: kernel/forth.c =================================================================== --- kernel/forth.c (revision 1391) +++ kernel/forth.c (working copy) @@ -1848,6 +1848,37 @@ PUSH(rstack[rstackcnt - 2]); } +/* The substitute return stack */ +#define MAX_SUB_RSTACK_SIZE 100 +static int sub_return_stack[MAX_SUB_RSTACK_SIZE]; +static int top = 0; + +/* + * sub_>r ( i -- ) (Substitute R: -- i ) + */ + +static void sub_gt_r(void) +{ + if (top >= MAX_SUB_RSTACK_SIZE) { + printf_console("Stack overflow\n"); + return; + } + sub_return_stack[top++] = POP(); +} + +/* + * sub_r> ( -- i ) (Substitute R: i -- ) + */ + +static void sub_r_gt(void) +{ + if (top < 0 ) { + printf_console("Stack underflow\n"); + return; + } + PUSH(sub_return_stack[top--]); +} + /* words[] is a function array of all native code functions used by * the dictionary, i.e. CFAs and primitives. * Any change here needs a matching change in the primitive word's @@ -1963,4 +1994,6 @@ do_encode_file, /* $encode-file */ do_debug_xt, /* (debug */ do_debug_off, /* (debug-off) */ + sub_gt_r, /* sub_>r */ + sub_r_gt /* sub_r> */ }; Index: libc/string.c =================================================================== --- libc/string.c (revision 1391) +++ libc/string.c (working copy) @@ -385,3 +385,30 @@ return __res; } +// Search for a string within another string +char *strstr(char *buffer, const char *search_string) +{ + if (!*search_string || (strlen(search_string) == 0)) { + return buffer; + } + + int match_found, index, index2; + for (index = 0; index < strlen(buffer); index++) { + if (buffer[index] == search_string[0]) { + match_found = 1; + // see if we have a match + for (index2 = 0; index2 < strlen(search_string); index2++) { + if (buffer[index + index2] != search_string[index2]) { + match_found = 0; // match not found + break; + } + } + if(match_found == 1) { + return &buffer[index]; + } + } + } + + // Could not find search_string in buffer + return NULL; +} Index: libopenbios/bootinfo_load.c =================================================================== --- libopenbios/bootinfo_load.c (revision 1391) +++ libopenbios/bootinfo_load.c (working copy) @@ -19,6 +19,7 @@ #include "libopenbios/bootinfo_load.h" #include "libopenbios/ofmem.h" #include "libc/vsprintf.h" +#include "libc/string.h" //#define DEBUG_BOOTINFO @@ -116,6 +117,60 @@ return LOADER_NOT_SUPPORT; } +static void erase_memory(char *memory, int size) +{ + int i; + for(i = 0; i < size; i++) { + memory[i] = ' '; + } +} + +// Replace all occurrences of orig_str in buffer with replace_str +static void replace_string(char *buffer, const char *orig_str, const char *replace_str) +{ + char *ptr; + int index, new_buf_index = 0; + const int max_size = 5000; + char *new_buffer = malloc(max_size * sizeof(char)); + erase_memory(new_buffer, max_size); + + for (index = 0; index < strlen(buffer); index++) { + if (buffer[index] == orig_str[0]) { + ptr = strstr(buffer + index, orig_str); + + // if we encountered an orig_str in the buffer + if (index == (ptr - buffer)) { + sprintf(new_buffer + new_buf_index, "%s ", replace_str); + new_buf_index += strlen(replace_str) + 1; + index += strlen(orig_str); + continue; + } + } + new_buffer[new_buf_index++] = buffer[index]; + } + + // Clear the origial buffer + erase_memory(buffer, max_size); + + // copy new_buffer into buffer + for (index = 0; index < strlen(new_buffer); index++) { + buffer[index] = new_buffer[index]; + } + buffer[index+1] = '\0'; +} + +/* Replace >r and r> with sub_>r and sub_r> */ +static void replace_return_stack_words(char *bootscript) +{ + const char *find_str1 = ">r"; + const char *replace_str1 = "sub_>r"; + const char *find_str2 = "r>"; + const char *replace_str2 = "sub_r>"; + + replace_string(bootscript, find_str1, replace_str1); + replace_string(bootscript, find_str2, replace_str2); +} + /* Parse SGML structure like: <chrp-boot> @@ -190,8 +245,11 @@ while (current < size) { c = base[current++]; + + if(c == '\r') + c = '\n'; - if (c == '<') { + if (c == '<') { script = 0; tag = 1; taglen = 0; @@ -262,6 +320,7 @@ /* If the payload is bootinfo then we execute it immediately */ if (scriptvalid) { DPRINTF("bootscript: %s\n", bootscript); + replace_return_stack_words(bootscript); feval(bootscript); } else

3 13

OpenBIOS SVN repository migration to github complete
by Mark Cave-Ayland 11 Jul '16

11 Jul '16

Hi all, After several weeks of planning, I'm pleased to announce that the official OpenBIOS repository has now been moved from SVN on coreboot.org over to the OpenBIOS project on github.com: https://github.com/openbios I've been through the OpenBIOS wiki and updated the links (and some of the text) at http://www.openfirmware.info/OpenBIOS to point towards the github repository, although for the moment the wiki and mailing lists will still be hosted on the openfirmware.info domain. For those people who have been using the git-svn mirror of the OpenBIOS repository at git://git.qemu-project.org/openbios.git for development, you will need to manually update any current working branches to point to the updated HEAD. This is because of differences in the metadata between the two git repositories. The basic update procedure for a git.qemu-project.org clone is as follows: 1) git fetch origin # bring in new commits 2) git branch --set-upstream master origin/master # update master to point to new upstream master and then for each branch you wish to bring up to date: 1) git checkout <branch> # switch to the named branch 2) git rebase master # rebase branch onto new HEAD There should be no conflicts since the only differences between the repositories are in the metadata and not the content. Once this is done, you should find that the master HEADs on github and git.qemu-project.org are the same moving forward, so patches/pull requests from either repository can be handled interchangeably. ATB, Mark.

1 0

[PATCH] Ensure saved context pointers in switch_to() for all archs are marked as volatile
by Mark Cave-Ayland 03 Jul '16

03 Jul '16

As discovered with the previous ppc patchset, the saved context pointer must be marked as volatile, otherwise the compiler may decide to optimise away saving the pointer to the local stack. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/arch/amd64/context.c | 5 +++-- openbios-devel/arch/sparc64/context.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/openbios-devel/arch/amd64/context.c b/openbios-devel/arch/amd64/context.c index 2e4df6a..33ab51e 100644 --- a/openbios-devel/arch/amd64/context.c +++ b/openbios-devel/arch/amd64/context.c @@ -97,14 +97,15 @@ init_context(uint8_t *stack, uint32_t stack_size, int num_params) /* Switch to another context. */ struct context *switch_to(struct context *ctx) { - struct context *save, *ret; + volatile struct context *save; + struct context *ret; debug("switching to new context:\n"); save = __context; __context = ctx; asm ("pushl %cs; call __switch_context"); ret = __context; - __context = save; + __context = (struct context *)save; return ret; } diff --git a/openbios-devel/arch/sparc64/context.c b/openbios-devel/arch/sparc64/context.c index 98932ee..823116f 100644 --- a/openbios-devel/arch/sparc64/context.c +++ b/openbios-devel/arch/sparc64/context.c @@ -88,7 +88,8 @@ init_context(uint8_t *stack, uint64_t stack_size, int num_params) /* Switch to another context. */ struct context *switch_to(struct context *ctx) { - struct context *save, *ret; + volatile struct context *save; + struct context *ret; debug("switching to new context: entry point %#llx stack 0x%016llx\n", ctx->pc, ctx->regs[REG_SP]); save = __context; @@ -96,7 +97,7 @@ struct context *switch_to(struct context *ctx) //asm ("pushl %cs; call __switch_context"); asm ("call __switch_context_nosave; nop"); ret = __context; - __context = save; + __context = (struct context *)save; return ret; } -- 1.7.10.4

1 0

[PATCH] SPARC32: add disk:a slice to bootpath when booting from disk
by Mark Cave-Ayland 03 Jul '16

03 Jul '16

Solaris 9 installs its root filesystem into the first logical slice rather than the first physical slice on the disk, so add disk:a to boot-device to attempt a boot from the first logical slice before falling back to the first physical slice as before. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/arch/sparc32/openbios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c index 6f4ee45..10ac9b9 100644 --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -897,7 +897,7 @@ arch_init( void ) push_str("floppy"); break; case 'c': - push_str("disk"); + push_str("disk:a disk"); break; default: case 'd': -- 1.7.10.4

1 0

[PATCH] SPARC32: add disk:d slice to bootpath when booting from disk
by Mark Cave-Ayland 03 Jul '16

03 Jul '16

Solaris 9 installs its bootloader into the slice rather than the disk, so add disk:d to the disk bootpath to enable automatic booting in this case. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/arch/sparc32/openbios.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openbios-devel/arch/sparc32/openbios.c b/openbios-devel/arch/sparc32/openbios.c index 6f4ee45..a58b3cd 100644 --- a/openbios-devel/arch/sparc32/openbios.c +++ b/openbios-devel/arch/sparc32/openbios.c @@ -897,7 +897,7 @@ arch_init( void ) push_str("floppy"); break; case 'c': - push_str("disk"); + push_str("disk:d disk"); break; default: case 'd': -- 1.7.10.4

1 1

Re: [OpenBIOS] Help with QEMU 2.6.50 on Ubuntu Mate 15.10
by Mark Cave-Ayland 26 Jun '16

26 Jun '16

On 25/06/16 20:34, G 3 wrote: > I just did a git pull today to this commit: > > commit a01aef5d2f96c334d048f43f0d3573a1152b37ca > Merge: c728876 21a4d96 > Author: Peter Maydell <peter.maydell(a)linaro.org > <mailto:peter.maydell@linaro.org>> > Date: Fri Jun 24 11:00:15 2016 +0100 > > When I tried to run qemu-system-ppc with and without the -bios option, > all I see is a empty black window. Switching consoles yields a Guest > hasn't initialized the display yet message. Are you having better luck > or is this a known issue? I've just tried this here and everything seems okay for me on Linux? Do you have a test Linux VM you can use to at least verify whether the regression is QEMU-wide or just related to a OS X host? You should be able to find your last good commit in the "git reflog" history at which point you should be able to do a bisect fairly easily. ATB, Mark.

2 1

Help with QEMU 2.6.50 on Ubuntu Mate 15.10
by G 3 25 Jun '16

25 Jun '16

I just did a git pull today to this commit: commit a01aef5d2f96c334d048f43f0d3573a1152b37ca Merge: c728876 21a4d96 Author: Peter Maydell <peter.maydell(a)linaro.org> Date: Fri Jun 24 11:00:15 2016 +0100 When I tried to run qemu-system-ppc with and without the -bios option, all I see is a empty black window. Switching consoles yields a Guest hasn't initialized the display yet message. Are you having better luck or is this a known issue?

1 0

[PATCH v4] ppc: use rfid when running under a CPU from the 970 family.
by Cédric Le Goater 22 Jun '16

22 Jun '16

A recent attempt to restrict the use of rfi on 64bit cpus in qemu broke 32bit OpenBIOS when run under a 970. This patches memory to replace rfi instructions with rfid in the vector code. Signed-off-by: Cédric Le Goater <clg(a)kaod.org> Suggested-by: Alexander Graf <agraf(a)suse.de> --- Tested on qemu. Changes since v3 : - fix pointer comparison - make comments clearer Changes since v2 : - make it nicer arch/ppc/qemu/ofmem.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) Index: openbios.git/arch/ppc/qemu/ofmem.c =================================================================== --- openbios.git.orig/arch/ppc/qemu/ofmem.c +++ openbios.git/arch/ppc/qemu/ofmem.c @@ -478,6 +478,36 @@ isi_exception(void) hash_page(nip, phys, mode); } +/* + * Power ISA 2.x has deleted the rfi instruction and rfid shoud be + * used instead on cpus following this instruction set or later. + * + * OpenBIOS 32bits is compiled to use rfi. But, when it runs on a + * Power ISA 2.x cpu (a 970 for instance), we need to replace the rfi + * instructions with rfid in the vectors' memory section. Else we + * won't go any futher than the first exception ... + */ +#define RFI 0x4c000064 +#define RFID 0x4c000024 + +extern char __vectors[]; +extern char __vectors_end[]; + +static void patch_rfi(void) +{ + uint32_t* ptr; + uint32_t* vec_start = (uint32_t*) 0x100UL; + uint32_t* vec_end = (uint32_t*) (__vectors_end - __vectors); + + if (!is_ppc64()) + return; + + for (ptr = vec_start; ptr != vec_end; ptr++) { + if (*ptr == RFI) + *ptr = RFID; + } + flush_icache_range((char*) vec_start , (char*) vec_end); +} /************************************************************************/ /* init / cleanup */ @@ -532,6 +562,8 @@ setup_mmu(unsigned long ramsize) memcpy((void *)get_rom_base(), (void *)OF_CODE_START, OF_CODE_SIZE); + patch_rfi(); + /* Enable MMU */ mtmsr(mfmsr() | MSR_IR | MSR_DR);

2 1

[PATCH v3] ppc: use rfid when running under a CPU from the 970 family.
by Cédric Le Goater 22 Jun '16

22 Jun '16

A recent attempt to restrict the use of rfi on 64bit cpus in qemu broke 32bit OpenBIOS when run under a 970. This patches memory to replace rfi instructions with rfid in the vector code. Signed-off-by: Cédric Le Goater <clg(a)kaod.org> Suggested-by: Alexander Graf <agraf(a)suse.de> --- Tested on qemu. Changes since v2 : - make it nicer arch/ppc/qemu/ofmem.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) Index: openbios.git/arch/ppc/qemu/ofmem.c =================================================================== --- openbios.git.orig/arch/ppc/qemu/ofmem.c +++ openbios.git/arch/ppc/qemu/ofmem.c @@ -478,6 +478,30 @@ isi_exception(void) hash_page(nip, phys, mode); } +/* When running on ppc64, we cannot use rfi anymore. Let's patch the + * vectors to use rfid instead. + */ +#define RFI 0x4c000064 +#define RFID 0x4c000024 + +extern char __vectors[]; +extern char __vectors_end[]; + +static void patch_rfi(void) +{ + uint32_t* ptr; + uint32_t* vec_start = (uint32_t*) 0x100UL; + uint32_t* vec_end = (uint32_t*) (__vectors_end - __vectors); + + if (!is_ppc64()) + return; + + for (ptr = vec_start; ptr < vec_end; ptr++) { + if (*ptr == RFI) + *ptr = RFID; + } + flush_icache_range((char*) vec_start , (char*) vec_end); +} /************************************************************************/ /* init / cleanup */ @@ -532,6 +556,8 @@ setup_mmu(unsigned long ramsize) memcpy((void *)get_rom_base(), (void *)OF_CODE_START, OF_CODE_SIZE); + patch_rfi(); + /* Enable MMU */ mtmsr(mfmsr() | MSR_IR | MSR_DR);

2 2

[PATCH v2] ppc: use rfid when running under a CPU from the 970 family.
by Cédric Le Goater 22 Jun '16

22 Jun '16

A recent attempt to restrict the use of rfi on 64bit cpus in qemu broke 32bit OpenBIOS when run under a 970. This patches memory to replace rfi instructions with rfid in the vector code. Signed-off-by: Cédric Le Goater <clg(a)kaod.org> Suggested-by: Alexander Graf <agraf(a)suse.de> --- Tested on qemu. arch/ppc/qemu/ofmem.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) Index: openbios.git/arch/ppc/qemu/ofmem.c =================================================================== --- openbios.git.orig/arch/ppc/qemu/ofmem.c +++ openbios.git/arch/ppc/qemu/ofmem.c @@ -478,6 +478,26 @@ isi_exception(void) hash_page(nip, phys, mode); } +/* When running on ppc64, we cannot use rfi anymore. Let's patch the + * vectors to use rfid instead. + */ +#define RFI 0x4c000064 +#define RFID 0x4c000024 + +static void patch_rfi(char *from, uint32_t len) +{ + int i; + + for (i = 0; i < len; i += 4) { + uint32_t* addr = (uint32_t *) (from + i); + if (*addr == RFI) + *addr = RFID; + } + flush_icache_range(from, from + len); +} + +extern char __vectors[]; +extern char __vectors_end[]; /************************************************************************/ /* init / cleanup */ @@ -532,6 +552,10 @@ setup_mmu(unsigned long ramsize) memcpy((void *)get_rom_base(), (void *)OF_CODE_START, OF_CODE_SIZE); + if (is_ppc64()) { + patch_rfi(0x0, (uint32_t) __vectors_end - (uint32_t) __vectors); + } + /* Enable MMU */ mtmsr(mfmsr() | MSR_IR | MSR_DR);

2 5

[PATCH] ppc: use rfid when running under a CPU from the 970 family.
by Cédric Le Goater 21 Jun '16

21 Jun '16

A recent attempt to restrict the use of rfi to 64bit cpus in qemu broke 32bit OpenBIOS when run under a 970. This is adding a dynamic check on the pvr to choose between rfi and rfid. Only the 970 family is supported. Signed-off-by: Cédric Le Goater <clg(a)kaod.org> --- Tested on qemu. arch/ppc/qemu/start.S | 25 +++++++++++++++++++++++-- arch/ppc/start.S | 25 +++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) Index: openbios.git/arch/ppc/qemu/start.S =================================================================== --- openbios.git.orig/arch/ppc/qemu/start.S +++ openbios.git/arch/ppc/qemu/start.S @@ -27,6 +27,27 @@ #ifdef CONFIG_PPC_64BITSUPPORT +/* When running on ppc64, we cannot use rfi anymore. Let's try to + * catch which cpu we are running on and act accordingly. This is + * for 970s only. + */ +.macro do_rfi + mtsprg1 r3 + mfpvr r3 + rlwinm r3,r3,16,16,31 + cmplwi cr1,r3,0x0039 /* 970 CPUs */ + beq- cr1,0f + cmplwi cr1,r3,0x003C /* 970fx CPUs */ + beq- cr1,0f + cmplwi cr1,r3,0x0044 /* 970mp CPUs */ + beq- cr1,0f + mfsprg1 r3 + rfi +0: + mfsprg1 r3 + rfid +.endm + /* We're trying to use the same code for the ppc32 and ppc64 handlers here. * On ppc32 we only save/restore the registers, C considers volatile. * @@ -148,7 +169,7 @@ ll r31,(35 * ULONG_SIZE)(r1) ; \ .endif ; \ ll r1,(1 * ULONG_SIZE)(r1) ; /* restore stack at last */ \ - rfi + do_rfi // PPC32 @@ -319,7 +340,7 @@ VECTOR( 0x800, "FPU" ): ori r3,r3,0x2000 mtsrr1 r3 mfsprg1 r3 - RFI + do_rfi ILLEGAL_VECTOR( 0x900 ) ILLEGAL_VECTOR( 0xa00 ) Index: openbios.git/arch/ppc/start.S =================================================================== --- openbios.git.orig/arch/ppc/start.S +++ openbios.git/arch/ppc/start.S @@ -25,6 +25,27 @@ #define ILLEGAL_VECTOR( v ) .org __vectors + v ; bl trap_error ; #define VECTOR( v, dummystr ) .org __vectors + v ; vector__##v +/* When running on ppc64, we cannot use rfi anymore. Let's try to + * catch which cpu we are running on and act accordingly. This is + * for 970s only. + */ +.macro do_rfi + mtsprg1 r3 + mfpvr r3 + rlwinm r3,r3,16,16,31 + cmplwi cr1,r3,0x0039 /* 970 CPUs */ + beq- cr1,0f + cmplwi cr1,r3,0x003C /* 970fx CPUs */ + beq- cr1,0f + cmplwi cr1,r3,0x0044 /* 970mp CPUs */ + beq- cr1,0f + mfsprg1 r3 + rfi +0: + mfsprg1 r3 + rfid +.endm + #define EXCEPTION_PREAMBLE \ mtsprg1 r1 ; /* scratch */ \ mfsprg0 r1 ; /* exception stack in sprg0 */ \ @@ -252,7 +273,7 @@ exception_return: lwz r11,44(r1) lwz r12,48(r1) lwz r1,4(r1) // restore r1 - rfi + do_rfi trap_error: mflr r3 @@ -287,7 +308,7 @@ VECTOR( 0x800, "FPU" ): ori r3,r3,0x2000 mtsrr1 r3 mfsprg1 r3 - rfi + do_rfi ILLEGAL_VECTOR( 0x900 ) ILLEGAL_VECTOR( 0xa00 )

5 15

Fail to boot a macosx 10.5 disk image
by Cédric Le Goater 20 Jun '16

20 Jun '16

Hello, This thread was started on qemu-devel@ but openbios@ seems more appropriate place now. On 06/07/2016 10:24 AM, Mark Cave-Ayland wrote: > On 07/06/16 08:04, Cédric Le Goater wrote: > >>>>> 2. I have an old ibook G4 from which I dd'ed the disk. openbios >>>>> complains for some invalid state. is that supported ? >>> >>> Yes, OpenBIOS should boot most things these days (MorphOS is the only >>> execption I know of where the bootloader won't execute correctly as it >>> assumes real mode). The above message means that OpenBIOS couldn't find >>> a bootloader, or it could but was unable to execute it, e.g. due to >>> incompatible architecture - which OS is your image running? >> >> I am pretty sure it is a Mac OS X v10.5. I still have the hardware but it >> is running Linux now : >> >> # cat /proc/cpuinfo >> processor : 0 >> cpu : 7447A, altivec supported >> clock : 1333.333000MHz >> revision : 1.5 (pvr 8003 0105) >> bogomips : 36.86 >> >> total bogomips : 36.86 >> timebase : 18432000 >> platform : PowerMac >> model : PowerBook6,7 >> machine : PowerBook6,7 >> motherboard : PowerBook6,7 MacRISC3 Power Macintosh >> detected as : 287 (iBook G4) >> pmac flags : 0000001a >> L2 cache : 512K unified >> pmac-generation : NewWorld >> Memory : 1024 MB >> >> # lsprop /proc/device-tree/rom@ff800000/boot-rom@fff00000/ >> reg fff00000 00100000 >> info fff00000 00003f00 000493f0 20050705 >> 815fda85 fff08000 00078001 000493f0 >> 20050705 23765c6c fff80000 00080002 >> 000493f0 20050705 b3364dca fff03f00 >> 00000083 000493f0 20050705 c2b72d61 >> fff03f80 00000084 e24a68ca 15a82001 >> ffffffff fff04000 00004005 6e767261 >> 6d000000 00000000 00000000 00000000 >> [140 bytes total] >> name "boot-rom" >> security-modes 6e6f6e65 2c206675 6c6c2c20 636f6d6d >> 616e642c 206e6f2d 70617373 776f7264 >> image 00080000 (524288) >> model "Apple PowerBook6,7 4.9.3f0 BootROM built on 07/05/05 at 11:14:11" >> write-characteristic >> "flash" >> hwi-flags 402a1220 (1076498976) >> BootROM-version "$0004.93f0" >> BootROM-build-date >> "07/05/05 at 11:14:11" >> linux,phandle ff89cb08 >> has-config-block >> >> >>> Have you tried both mac99 and g3beige machines? >> >> yes. > > (I'm wondering if we should start a new thread here either just on > qemu-ppc or over on the OpenBIOS list) doing so on openbios@ > OpenBIOS will read hfs/hfsplus filesystems fine - I wonder if maybe it > can't locate a suitable partition in the Apple Partition Map? > > If you boot to the Forth prompt with -prom-env 'auto-boot?=false' can > you try the following to see if you can list the disk contents: > > dir hd:,\ > > If that doesn't work it means that the partition auto-detection is > failing, so try manually forcing the partition number until you find one > that works e.g. > > dir hd:0,\ > dir hd:1,\ > etc. > > up until around partition 10? Once you find one that works it should be > possible to boot that partition directly e.g. > > boot hd:1 So it is hd:3 and then, openbios dies directly : ... IN: 0xfff0d6c8: mr r28,r3 0xfff0d6cc: add r30,r30,r3 0xfff0d6d0: add r31,r31,r3 0xfff0d6d4: b 0xfff0d6a0 IN: 0xfff0d6a0: mr r3,r29 0xfff0d6a4: li r5,0 0xfff0d6a8: mr r6,r30 0xfff0d6ac: bl 0xfff279e8 IN: 0x00000300: .long 0x0 IN: 0x00000700: .long 0x0 which is this loop in bootcode_load() : ... bootcode = loadbase; offset = 0; while(1) { if (seek_io(fd, offset) == -1) break; count = read_io(fd, (void *)bootcode, 512); offset += count; bootcode += count; } ... How do I add more logging with openbios ? Thanks, C.

4 17

[PATCH 0/4] ppc: introduce execution context
by Mark Cave-Ayland 04 May '16

04 May '16

This patch series is part of a much larger WIP series designed to remove various hacks from the load/init-program/go words. However in order for the follow-on series to work, all architectures must build an execution context similar to the IEEE1275 specification description of saved-program-state. PPC is the only architecture which doesn't make use of contexts when entering/leaving the Forth environment, so start by adding this functionality in order that it can be expanded on further with later patches. While no functionality is changed by this patch, there should be no regressions when attempting to boot existing client images. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (4): ppc: move call_elf() to separate switch.S file ppc: add new context handler ppc: use separate context to call client images ppc: unify CIF save stack layout with that of new context stack openbios-devel/arch/ppc/build.xml | 2 + openbios-devel/arch/ppc/qemu/context.c | 138 ++++++++++++++++++ openbios-devel/arch/ppc/qemu/context.h | 34 +++++ openbios-devel/arch/ppc/qemu/init.c | 4 +- openbios-devel/arch/ppc/qemu/ldscript | 6 +- openbios-devel/arch/ppc/qemu/start.S | 244 +++++++++++++------------------- openbios-devel/arch/ppc/qemu/switch.S | 211 +++++++++++++++++++++++++++ openbios-devel/include/arch/ppc/io.h | 2 +- 8 files changed, 492 insertions(+), 149 deletions(-) create mode 100644 openbios-devel/arch/ppc/qemu/context.c create mode 100644 openbios-devel/arch/ppc/qemu/context.h create mode 100644 openbios-devel/arch/ppc/qemu/switch.S -- 1.7.10.4

3 25

PowerPC special purpose registers
by Programmingkid 03 May '16

03 May '16

You know how you see messages about writing to missing registers like these: OS 9.2] Trying to write invalid spr 0 (0x000) at 00f113c0 11:26:23.910 WARNING [Mac OS 9.2] Trying to read invalid spr 0 (0x000) at 00f113c8 11:26:24.055 WARNING [Mac OS 9.2] Trying to write privileged spr 955 (0x3bb) at 00f164b8 11:26:24.055 WARNING [Mac OS 9.2] Trying to write invalid spr 959 (0x3bf) at 00f16520 11:26:24.055 WARNING [Mac OS 9.2] Trying to read invalid spr 959 (0x3bf) at 00f16528 11:26:24.056 WARNING [Mac OS 9.2] Trying to write invalid spr 944 (0x3b0) at 00f1653c 11:26:24.056 WARNING [Mac OS 9.2] Trying to read invalid spr 944 (0x3b0) at 00f16544 11:26:24.056 WARNING [Mac OS 9.2] Trying to write invalid spr 951 (0x3b7) at 00f16550 11:26:24.056 WARNING [Mac OS 9.2] Trying to read invalid spr 951 (0x3b7) at 00f16558 11:26:24.204 WARNING [Mac OS 9.2] Trying to write privileged spr 955 (0x3bb) at 00f164b8 11:26:24.204 WARNING [Mac OS 9.2] Trying to write invalid spr 959 (0x3bf) at 00f16520 11:26:24.204 WARNING [Mac OS 9.2] Trying to read invalid spr 959 (0x3bf) at 00f16528 11:26:24.204 WARNING [Mac OS 9.2] Trying to write invalid spr 944 (0x3b0) at 00f1653c 11:26:24.204 WARNING [Mac OS 9.2] Trying to read invalid spr 944 (0x3b0) at 00f16544 11:26:24.205 WARNING [Mac OS 9.2] Trying to write invalid spr 951 (0x3b7) at 00f16550 11:26:24.205 WARNING [Mac OS 9.2] Trying to read invalid spr 951 (0x3b7) at 00f16558 Should these registers be implemented? Maybe Apple expected these registers to be available on their hardware. Using these files: http://www.nxp.com/files/32bit/doc/ref_manual/MPC7450UM.pdf page 1-36 and http://www.nxp.com/files/32bit/doc/data_sheet/MPC604.pdf page 19, as a guide, here is what I found out: SPR Name 944 Monitor Control Register 2 951 Breakpoint Address Mask Register1 955 Sampled Instruction Address 1 959 Sampled Data Address * PowerPC 604 only My current theory is there might be implementation details that are off in QEMU's emulated PowerPC 750 processor. The only way I know how to test this out is run QEMU in KVM mode on PowerPC hardware. I'm hoping someone out there has this setup available and can tell us if Mac OS 9.2 works better in KVM mode or not.

3 5

[PATCHv2 0/4] ppc: introduce execution context
by Mark Cave-Ayland 02 May '16

02 May '16

This patch series is part of a much larger WIP series designed to remove various hacks from the load/init-program/go words. However in order for the follow-on series to work, all architectures must build an execution context similar to the IEEE1275 specification description of saved-program-state. PPC is the only architecture which doesn't make use of contexts when entering/leaving the Forth environment, so start by adding this functionality in order that it can be expanded on further with later patches. While no functionality is changed by this patch, there should be no regressions when attempting to boot existing client images. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Use single asm invocation in switch_to() with clobber register - Fix unsigned int -> unsigned long - Fix missing volatile from __context pointer Mark Cave-Ayland (4): ppc: move call_elf() to separate switch.S file ppc: add new context handler ppc: use separate context to call client images ppc: unify CIF save stack layout with that of new context stack openbios-devel/arch/ppc/build.xml | 2 + openbios-devel/arch/ppc/qemu/context.c | 140 ++++++++++++++++++ openbios-devel/arch/ppc/qemu/context.h | 34 +++++ openbios-devel/arch/ppc/qemu/init.c | 4 +- openbios-devel/arch/ppc/qemu/ldscript | 6 +- openbios-devel/arch/ppc/qemu/start.S | 244 +++++++++++++------------------- openbios-devel/arch/ppc/qemu/switch.S | 211 +++++++++++++++++++++++++++ openbios-devel/include/arch/ppc/io.h | 2 +- 8 files changed, 494 insertions(+), 149 deletions(-) create mode 100644 openbios-devel/arch/ppc/qemu/context.c create mode 100644 openbios-devel/arch/ppc/qemu/context.h create mode 100644 openbios-devel/arch/ppc/qemu/switch.S -- 1.7.10.4

2 7

Findings on booting Mac OS 9.2
by Programmingkid 02 May '16

02 May '16

I made a patch that prints everything that (evaluate) does, hoping it would tell me where execution stopped in the boot script. Here is the patch: Index: forth/bootstrap/interpreter.fs =================================================================== --- forth/bootstrap/interpreter.fs (revision 1395) +++ forth/bootstrap/interpreter.fs (working copy) @@ -151,6 +151,7 @@ ; : (evaluate) ( str len -- ??? ) + 2dup fprintk save-source -1 ['] source-id (to) dup Index: kernel/bootstrap.c =================================================================== --- kernel/bootstrap.c (revision 1395) +++ kernel/bootstrap.c (working copy) @@ -89,7 +89,7 @@ "here", "here!", "dobranch", "do?branch", "unaligned-w@", "unaligned-w!", "unaligned-l@", "unaligned-l!", "ioc@", "iow@", "iol@", "ioc!", "iow!", "iol!", "i", "j", "call", "sys-debug", - "$include", "$encode-file", "(debug", "(debug-off)" + "$include", "$encode-file", "(debug", "(debug-off)", "fprintk" }; /* Index: kernel/forth.c =================================================================== --- kernel/forth.c (revision 1395) +++ kernel/forth.c (working copy) @@ -1848,6 +1848,26 @@ PUSH(rstack[rstackcnt - 2]); } +/* + * fprintk ( addr len -- ) + * writes a forth string to the serial output + */ + +static void fprintk(void) +{ + int len = POP(); + int addr = POP(); + char *message = malloc(sizeof(char) * 5000); + snprintf(message, len + 1, "%s", addr); + int i; + for (i = 0; i < len; i++) { + if (message[i] == '\r') + message[i] = ' '; + } + printk(message); + free(message); +} + /* words[] is a function array of all native code functions used by * the dictionary, i.e. CFAs and primitives. * Any change here needs a matching change in the primitive word's @@ -1963,4 +1983,5 @@ do_encode_file, /* $encode-file */ do_debug_xt, /* (debug */ do_debug_off, /* (debug-off) */ + fprintk, /* fprintk */ }; Index: libc/extra.c =================================================================== --- libc/extra.c (revision 1395) +++ libc/extra.c (working copy) @@ -31,7 +31,7 @@ int forth_printf( const char *fmt, ... ) { - char buf[512]; + char buf[5000]; va_list args; int i; Well after trying to run Mac OS 9.2 several times, this was the output: ['] display-ih cell+['] frame-buffer-adr cell+['] openbios-video-width cell+['] openbios-video-height cell+['] depth-bits cell+['] line-bytes cell+['] color-palette cell+to fb8-blitmaskto fb8-fillrectto fb8-invertrectto (romfont)to (romfont-height)to (romfont-width)['] vga-driver-fcode 2 cells + 1 byte-load: write dup >r bounds do i c@ fb-emit loop r> ; : draw-logo draw-logo ; : restore reset-screen ; fcode-debug? >> ============================================================= >> OpenBIOS 1.1 [May 2 2016 02:45] >> Configuration device id QEMU version 1 machine id 1 >> CPUs: 1 >> Memory: 384M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,750 milliseconds isn't unique. >> bootstrdup encode-string " selected-partition-args" propertystrdup encode-string " selected-partition-args" propertyload-baseload-baseload-baseload-size here >r dev / " model" active-package get-package-property abort" can't find MODEL" decode-string 2swap 2drop " iMac,1" $= ?dup 0= if " compatible" active-package get-package-property abort" can't find COMPATIBLE" false >r begin dup while decode-string here over 2swap bounds ?do i c@ dup [char] A [char] Z between if h# 20 xor then c, loop 2dup " macrisc" $= r> or >r 2drop repeat 2drop r> then r> here - allot 0= abort" this image is not for this platform" decimal 1 load-base load-size 14 - adler32 load-base load-size + 12 - 12 ['] eval catch if 2drop ." , bad checksum value" -1 then <> if ." , checksum error" abort then hex dev /openprom 0 0 " supports-bootinfo" property device-end " /chosen" find-package 0= abort" can't find '/chosen'" constant /chosen " memory" /chosen get-package-property abort" memory??" decode-int constant xmem 2drop " mmu" /chosen get-package-property abort" mmu??" decode-int constant xmmu 2drop " AAPL,debug" " /" find-package 0= abort" can't find '/'" I don't know if I can trust this output because there appears to be a limit to how much can be printed to the serial console. Sometimes I would see at the end "h# C864630D". I'm not sure why. This text is located at the very end of the boot script file. Past the forth section. I don't think the abort" word is the problem because there is no indication that it aborted the script. Hopefully someone will find this information useful.

2 1

[PATCH] Implement substitute return stack words
by Programmingkid 26 Apr '16

26 Apr '16

Implement the sub_>r and sub_r> words. They can be used in place of >r and r>. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: kernel/bootstrap.c =================================================================== --- kernel/bootstrap.c (revision 1395) +++ kernel/bootstrap.c (working copy) @@ -89,7 +89,7 @@ "here", "here!", "dobranch", "do?branch", "unaligned-w@", "unaligned-w!", "unaligned-l@", "unaligned-l!", "ioc@", "iow@", "iol@", "ioc!", "iow!", "iol!", "i", "j", "call", "sys-debug", - "$include", "$encode-file", "(debug", "(debug-off)" + "$include", "$encode-file", "(debug", "(debug-off)", "sub_>r", "sub_r>" }; /* Index: kernel/forth.c =================================================================== --- kernel/forth.c (revision 1395) +++ kernel/forth.c (working copy) @@ -1848,6 +1848,37 @@ PUSH(rstack[rstackcnt - 2]); } +/* The substitute return stack */ +#define MAX_SUB_RSTACK_SIZE 100 +static int sub_return_stack[MAX_SUB_RSTACK_SIZE]; +static int top = 0; + +/* + * sub_>r ( i -- ) (Substitute R: -- i ) + */ + +static void sub_gt_r(void) +{ + if (top >= MAX_SUB_RSTACK_SIZE) { + printf_console("Stack overflow\n"); + return; + } + sub_return_stack[top++] = POP(); +} + +/* + * sub_r> ( -- i ) (Substitute R: i -- ) + */ + +static void sub_r_gt(void) +{ + if (top < 0 ) { + printf_console("Stack underflow\n"); + return; + } + PUSH(sub_return_stack[--top]); +} + /* words[] is a function array of all native code functions used by * the dictionary, i.e. CFAs and primitives. * Any change here needs a matching change in the primitive word's @@ -1963,4 +1994,6 @@ do_encode_file, /* $encode-file */ do_debug_xt, /* (debug */ do_debug_off, /* (debug-off) */ + sub_gt_r, /* sub_>r */ + sub_r_gt /* sub_r> */ };

1 0

[PATCH] implement the strstr() function
by Programmingkid 26 Apr '16

26 Apr '16

Implement the strstr() function. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: include/libc/string.h =================================================================== --- include/libc/string.h (revision 1395) +++ include/libc/string.h (working copy) @@ -47,7 +47,7 @@ extern char *strdup( const char *str ); extern int strcasecmp( const char *cs, const char *ct ); extern int strncasecmp( const char *cs, const char *ct, size_t count ); - +extern char *strstr(char *buffer, const char *search_string); extern char *strncpy_nopad( char *dest, const char *src, size_t n ); #define _U 0x01 /* upper */ Index: libc/string.c =================================================================== --- libc/string.c (revision 1395) +++ libc/string.c (working copy) @@ -385,3 +385,30 @@ return __res; } +// Search for a string within another string +char *strstr(char *buffer, const char *search_string) +{ + if (!*search_string || (strlen(search_string) == 0)) { + return buffer; + } + + int match_found, index, index2; + for (index = 0; index < strlen(buffer); index++) { + if (buffer[index] == search_string[0]) { + match_found = 1; + // see if we have a match + for (index2 = 0; index2 < strlen(search_string); index2++) { + if (buffer[index + index2] != search_string[index2]) { + match_found = 0; // match not found + break; + } + } + if(match_found == 1) { + return &buffer[index]; + } + } + } + + // Could not find search_string in buffer + return NULL; +}

1 0

Increasing dictionary space size
by Programmingkid 26 Apr '16

26 Apr '16

How do we increase the size of the dictionary? I thought it would be as simple as increasing the DICTIONARY_SIZE constant, but that causes this error: ppc-elf-ld: section .romentry [00000000fffffffc -> 00000000ffffffff] overlaps section .data [00000000fff3c000 -> 000000010013c1d7] ppc-elf-ld: openbios-qemu.elf.nostrip: section .romentry vma 0xfffffffc overlaps previous sections

2 8

Current finding on booting Mac OS 9.2
by Programmingkid 22 Apr '16

22 Apr '16

As Segher had suggested, I executed the boot script one line at a time. This enabled me to see what line failed. The line that is failing is this: r> here - allot The message printed after this line is executed is: "Dictionary space overflow: dicthead=000c3fe4 dictlimit=00080000" So I decide to find out what value was being allot'ed. Using this code: r> here - dup ." Calling allot with " . cr allot The value that is being allocated is 0xa43ef or 672,751. Just for a comparison, I tried my code on Apple's Open Firmware. The value it allocates is 0xffffffd7. So I think the solution might be to increase available memory to OpenBIOS's dictionary. I'm thinking the kernel.c file is where things might need adjusting. This is the patch I used. It replaces r> and >r with substitute words that don't touch the return stack. This patch also executes one line at a time. Index: include/libc/string.h =================================================================== --- include/libc/string.h (revision 1395) +++ include/libc/string.h (working copy) @@ -47,7 +47,7 @@ extern char *strdup( const char *str ); extern int strcasecmp( const char *cs, const char *ct ); extern int strncasecmp( const char *cs, const char *ct, size_t count ); - +extern char *strstr(char *buffer, const char *search_string); extern char *strncpy_nopad( char *dest, const char *src, size_t n ); #define _U 0x01 /* upper */ Index: kernel/bootstrap.c =================================================================== --- kernel/bootstrap.c (revision 1395) +++ kernel/bootstrap.c (working copy) @@ -89,7 +89,7 @@ "here", "here!", "dobranch", "do?branch", "unaligned-w@", "unaligned-w!", "unaligned-l@", "unaligned-l!", "ioc@", "iow@", "iol@", "ioc!", "iow!", "iol!", "i", "j", "call", "sys-debug", - "$include", "$encode-file", "(debug", "(debug-off)" + "$include", "$encode-file", "(debug", "(debug-off)", "sub_>r", "sub_r>" }; /* Index: kernel/forth.c =================================================================== --- kernel/forth.c (revision 1395) +++ kernel/forth.c (working copy) @@ -1848,6 +1848,37 @@ PUSH(rstack[rstackcnt - 2]); } +/* The substitute return stack */ +#define MAX_SUB_RSTACK_SIZE 100 +static int sub_return_stack[MAX_SUB_RSTACK_SIZE]; +static int top = 0; + +/* + * sub_>r ( i -- ) (Substitute R: -- i ) + */ + +static void sub_gt_r(void) +{ + if (top >= MAX_SUB_RSTACK_SIZE) { + printf_console("Stack overflow\n"); + return; + } + sub_return_stack[top++] = POP(); +} + +/* + * sub_r> ( -- i ) (Substitute R: i -- ) + */ + +static void sub_r_gt(void) +{ + if (top < 0 ) { + printf_console("Stack underflow\n"); + return; + } + PUSH(sub_return_stack[top--]); +} + /* words[] is a function array of all native code functions used by * the dictionary, i.e. CFAs and primitives. * Any change here needs a matching change in the primitive word's @@ -1963,4 +1994,6 @@ do_encode_file, /* $encode-file */ do_debug_xt, /* (debug */ do_debug_off, /* (debug-off) */ + sub_gt_r, /* sub_>r */ + sub_r_gt /* sub_r> */ }; Index: libc/string.c =================================================================== --- libc/string.c (revision 1395) +++ libc/string.c (working copy) @@ -385,3 +385,30 @@ return __res; } +// Search for a string within another string +char *strstr(char *buffer, const char *search_string) +{ + if (!*search_string || (strlen(search_string) == 0)) { + return buffer; + } + + int match_found, index, index2; + for (index = 0; index < strlen(buffer); index++) { + if (buffer[index] == search_string[0]) { + match_found = 1; + // see if we have a match + for (index2 = 0; index2 < strlen(search_string); index2++) { + if (buffer[index + index2] != search_string[index2]) { + match_found = 0; // match not found + break; + } + } + if(match_found == 1) { + return &buffer[index]; + } + } + } + + // Could not find search_string in buffer + return NULL; +} Index: libopenbios/bootinfo_load.c =================================================================== --- libopenbios/bootinfo_load.c (revision 1395) +++ libopenbios/bootinfo_load.c (working copy) @@ -19,6 +19,7 @@ #include "libopenbios/bootinfo_load.h" #include "libopenbios/ofmem.h" #include "libc/vsprintf.h" +#include "libc/string.h" //#define DEBUG_BOOTINFO @@ -116,6 +117,85 @@ return LOADER_NOT_SUPPORT; } +static void erase_memory(char *memory, int size) +{ + int i; + for(i = 0; i < size; i++) { + memory[i] = ' '; + } +} + +// Replace all occurrences of orig_str in buffer with replace_str +static void replace_string(char *buffer, const char *orig_str, const char *replace_str) +{ + char *ptr; + int index, new_buf_index = 0; + const int max_size = 5000; + char *new_buffer = malloc(max_size * sizeof(char)); + erase_memory(new_buffer, max_size); + + for (index = 0; index < strlen(buffer); index++) { + if (buffer[index] == orig_str[0]) { + ptr = strstr(buffer + index, orig_str); + + // if we encountered an orig_str in the buffer + if (index == (ptr - buffer)) { + sprintf(new_buffer + new_buf_index, "%s ", replace_str); + new_buf_index += strlen(replace_str) + 1; + index += strlen(orig_str); + continue; + } + } + new_buffer[new_buf_index++] = buffer[index]; + } + + // Clear the origial buffer + erase_memory(buffer, max_size); + + // copy new_buffer into buffer + for (index = 0; index < strlen(new_buffer); index++) { + buffer[index] = new_buffer[index]; + } + buffer[index+1] = '\0'; +} + +/* Replace >r and r> with sub_>r and sub_r> */ +static void replace_return_stack_words(char *bootscript) +{ + const char *find_str1 = ">r"; + const char *replace_str1 = "sub_>r"; + const char *find_str2 = "r>"; + const char *replace_str2 = "sub_r>"; + + replace_string(bootscript, find_str1, replace_str1); + replace_string(bootscript, find_str2, replace_str2); +} + +void run_script(char *bootscript) +{ + int index = 0, buf_index = 0; + char c; + char *buffer = malloc(1000 * sizeof(char)); + + while (1) { + c = bootscript[index]; + + // fill up buffer + while (c != '\n' && c != '\r' && c != '\0') { + buffer[buf_index++] = c; + c = bootscript[++index]; + } + buffer[buf_index] = '\0'; + buf_index = 0; + index++; + printk("%s\n", buffer); + feval(buffer); + if (c == '\0') { + return; + } + } +} + /* Parse SGML structure like: <chrp-boot> @@ -191,7 +271,7 @@ c = base[current++]; - if (c == '<') { + if (c == '<') { script = 0; tag = 1; taglen = 0; @@ -262,7 +342,8 @@ /* If the payload is bootinfo then we execute it immediately */ if (scriptvalid) { DPRINTF("bootscript: %s\n", bootscript); - feval(bootscript); + replace_return_stack_words(bootscript); + run_script(bootscript); } else DPRINTF("Unable to parse bootinfo bootscript\n");

2 5

Re: [OpenBIOS] Found out why replacing '\r' with '\n' works
by Programmingkid 19 Apr '16

19 Apr '16

On Apr 17, 2016, at 11:05 AM, Mark Cave-Ayland wrote: > On 17/04/16 15:50, Programmingkid wrote: > >> Good news, I found out why replacing '\r' with '\n' works to boot Mac OS 9. It is because there are several words that require that character to be at the end of the line. >> >> http://www.complang.tuwien.ac.at/forth/1275.ps >> This is the specifications to Open Firmware. Just do a search for EOL (End of Line a.k.a '\n'). You will see that several words need it in order to work. >> >> They will look like this: >> >> dev ( "device-specifier<eol>" -- ) >> >> The <eol> text is what specifies that '\n' should be at the end of the line. > > Really? Interesting. Can you provide a self-contained test case that > demonstrates that it is in fact the line ending that causes this > independent of the r-stack manipulation? Bear in mind that OpenBIOS may > deviate from the specification in its behaviour here. Well I did a test but the results did not go as expected. Index: libopenbios/bootinfo_load.c =================================================================== --- libopenbios/bootinfo_load.c (revision 1395) +++ libopenbios/bootinfo_load.c (working copy) @@ -262,7 +262,8 @@ /* If the payload is bootinfo then we execute it immediately */ if (scriptvalid) { DPRINTF("bootscript: %s\n", bootscript); - feval(bootscript); + //feval(bootscript); + feval("dev /chosen\rcr pwd cr"); } else DPRINTF("Unable to parse bootinfo bootscript\n"); In the above code, if the '\r' was causing problems with dev, then this code would not have worked. The thing is it does work. It will print "/chosen" every time. My guess now is there is another word that is next to a '\r' character that can't handle that situation.

1 0

[commit] r1395 - trunk/openbios-devel/drivers
by repository service 17 Apr '16

17 Apr '16

Author: mcayland Date: Sun Apr 17 16:41:50 2016 New Revision: 1395 URL: http://tracker.coreboot.org/trac/openbios/changeset/1395 Log: escc.c: add empty ranges property to escc and escc-legacy nodes This fixes an intermittent panic in the AppleSCCSerial module for MacOS 10.2 and the g3beige machine during initialisation as the module tries to write to the on-chip registers at 0x130XX rather than calculating the correct address derived from the parent PCI node. As described in the IEEE-1275 specification: if a "ranges" property exists but has a zero-length property value, the child address space is identical to the parent address space. 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 Mar 18 14:06:06 2016 (r1394) +++ trunk/openbios-devel/drivers/escc.c Sun Apr 17 16:41:50 2016 (r1395) @@ -514,6 +514,7 @@ set_property(dnode, "device_type", "escc", strlen("escc") + 1); set_property(dnode, "compatible", "escc\0CHRP,es0", 14); + set_property(dnode, "ranges", "", 0); fword("finish-device"); @@ -541,6 +542,7 @@ set_property(dnode, "device_type", "escc-legacy", strlen("escc-legacy") + 1); set_property(dnode, "compatible", "chrp,es1", 9); + set_property(dnode, "ranges", "", 0); fword("finish-device");

1 0

Even more findings to report about booting Mac OS 9
by Programmingkid 17 Apr '16

17 Apr '16

I made a program that tells what control characters are in the Mac OS ROM file. It reported that every single control character is in that file. Then I had it only look at the bootscript part. The carriage return and line feed characters are the only control characters found there. http://www.ascii-code.com/ This page will tell you what the control characters are in case you don't know. I added some code to the bootinfo_init_program() function in bootinfo_load.c file that changes all control characters to '\n'. This made Mac OS 9 boot. But when I changed the control characters to a single space, Mac OS 9 failed to boot. This seems strange to me. The space character is the ultimate whitespace character, so why would it fail when '\n' succeeds? My only guess right now is a bug with one of the words in Forth. Here is the code I used. It is found around line 190 in the file: while (current < size) { c = base[current++]; // remove all control characters if (c >= 0 && c <= 31) { c = '\n'; } if (c == '<') { script = 0; tag = 1; taglen = 0;

3 15

Where Mac OS 9.2 stops booting
by Programmingkid 16 Apr '16

16 Apr '16

I wanted to share what I found out. If I remove the '\r' to '\n' patch that allows Mac OS 9 to boot, the boot script will stop executing at a r> word. This is the position: <BOOT-SCRIPT> here >r dev / cr ." Checkpoint 1" cr " model" active-package get-package-property abort" can't find MODEL" decode-string 2swap 2drop " iMac,1" $= ?dup 0= if " compatible" active-package get-package-property abort" can't find COMPATIBLE" false >r ." checkpoint 1.5" cr begin dup while decode-string here over 2swap bounds ?do i c@ dup [char] A [char] Z between if h# 20 xor then c, loop 2dup " macrisc" $= r> or >r 2drop repeat ." checkpoint 1.7" cr 2drop r> ." checkpoint 1.7.1" cr then ." checkpoint 1.7.2" cr r> <--------------- This is where execution stops ." Checkpoint 1.7.3" cr here ." Checkpoint 1.7.4" cr - allot ." checkpoint 1.8" cr 0= abort" this image is not for this platform" decimal 1 ." Checkpoint2" cr load-base load-size 14 - adler32 load-base load-size + 12 - 12 ['] eval catch if 2drop ." , bad checksum value" -1 then <> if ." , checksum error" cr \ abort ." Problem ignored :)" cr then hex dev /openprom 0 0 " supports-bootinfo" property device-end " /chosen" find-package 0= abort" can't find '/chosen'" constant /chosen " memory" /chosen get-package-property abort" memory??" decode-int constant xmem 2drop " mmu" /chosen get-package-property abort" mmu??" decode-int constant xmmu 2drop " AAPL,debug" " /" find-package 0= abort" can't find '/'" get-package-property if false else 2drop true then ." Checkpoint 3" cr constant debug? debug? if cr ." checking for RELEASE-LOAD-AREA" then " release-load-area" $find 0= if 2drop false then constant 'release-load-area debug? if 'release-load-area if ." , found it" else ." , not found" then then : do-translate " translate" xmmu $call-method ; : do-map " map" xmmu $call-method ; : do-unmap " unmap" xmmu $call-method ; : claim-mem " claim" xmem $call-method ; : release-mem " release" xmem $call-method ; : claim-virt " claim" xmmu $call-method ; : release-virt " release" xmmu $call-method ; 1000 constant pagesz pagesz 1- constant pagesz-1 -1000 constant pagemask h# 005000 constant elf-offset h# 017008 constant elf-size elf-size pagesz-1 + pagemask and constant elf-pages h# 01C008 ." Checkpoint 4" cr constant parcels-offset h# 2617C4 constant parcels-size parcels-size pagesz-1 + pagemask and constant parcels-pages h# 27D7CC constant info-size info-size pagesz-1 + pagemask and constant info-pages 0 value load-base-claim 0 value info-base 'release-load-area if load-base to info-base else load-base info-pages 0 ['] claim-mem catch if 3drop 0 then to load-base-claim info-pages 1000 claim-virt to info-base load-base info-base info-pages 10 do-map then \ allocate room for both images parcels-pages 400000 claim-mem constant ." Checkpoint 5" cr rom-phys parcels-pages 1000 claim-virt constant rom-virt rom-phys rom-virt parcels-pages 10 do-map elf-pages 1000 claim-mem constant elf-phys elf-pages 1000 claim-virt constant elf-virt elf-phys elf-virt elf-pages 10 do-map info-base elf-offset + elf-virt elf-size move debug? if cr ." elf-phys,elf-virt,elf-pages: " elf-phys u. ." , " elf-virt u. ." , " elf-pages u. then \ copy the compressed image debug? if cr ." copying compressed ROM image" then rom-virt parcels-pages 0 fill info-base parcels-offset ." Checkpoint 6" cr + rom-virt parcels-size move 'release-load-area 0= if info-base info-pages do-unmap load-base-claim ?dup if info-pages release-mem then then debug? if cr ." MacOS-ROM phys,virt,size: " rom-phys u. ." , " rom-virt u. ." , " parcels-size u. then \ create the actual property debug? if cr ." finding/creating '/rom/macos' package" then device-end 0 to my-self " /rom" find-device " macos" ['] find-device catch if 2drop new-device " macos" device-name finish-device then " /rom/macos" find-device debug? if cr ." creating 'AAPL,toolbox-parcels' property" then rom-virt encode-int ." Checkpoint 7" cr parcels-size encode-int encode+ " AAPL,toolbox-parcels" property device-end debug? if cr ." copying MacOS.elf to load-base" then 'release-load-area if load-base elf-pages + 'release-load-area execute else load-base elf-pages 0 claim-mem load-base dup elf-pages 0 do-map then elf-virt ." Checkpoint 9" cr load-base elf-size move elf-virt elf-pages do-unmap elf-virt elf-pages release-virt elf-phys elf-pages release-mem debug? if cr ." init-program" then init-program debug? if cr ." .registers" .registers then debug? ." REACHED THE END" CR if cr ." go" cr then go cr ." end of BOOT-SCRIPT" </BOOT-SCRIPT> This boot script was taken from the Mac OS 9 file "Mac OS ROM". Does anyone have any idea why removing '\r' characters from the script makes it work?

3 3

ping [PATCH] bootinfo_load.c: Translate \r to \n for Mac OS 9 compatibility
by Programmingkid 16 Apr '16

16 Apr '16

Mac OS 9's bootscript uses '\r' a lot. These interfere with how OpenBIOS functions. So the solution is to translate them to '\n' characters. This will allow Mac OS 9 to boot. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> These are the operating systems I used to test my patch. - Mac OS 10.4.0 - Mac OS 9.2 - Fedora Linux 17 - Debian Linux 5 No regressions have been detected. Index: libopenbios/bootinfo_load.c =================================================================== --- libopenbios/bootinfo_load.c (revision 1391) +++ libopenbios/bootinfo_load.c (working copy) @@ -190,7 +190,10 @@ while (current < size) { c = base[current++]; - + if(c == '\r') { + c = '\n'; + } + if (c == '<') { script = 0; tag = 1;

3 11

[PATCH] escc.c: add empty ranges property to escc and escc-legacy nodes
by Mark Cave-Ayland 15 Apr '16

15 Apr '16

This fixes an intermittent panic in the AppleSCCSerial module for MacOS 10.2 and the g3beige machine during initialisation as the module tries to write to the on-chip registers at 0x130XX rather than calculating the correct address derived from the parent PCI node. As described in the IEEE-1275 specification: if a "ranges" property exists but has a zero-length property value, the child address space is identical to the parent address space. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/drivers/escc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openbios-devel/drivers/escc.c b/openbios-devel/drivers/escc.c index 5fa3139..1990e79 100644 --- a/openbios-devel/drivers/escc.c +++ b/openbios-devel/drivers/escc.c @@ -514,6 +514,7 @@ escc_init(const char *path, phys_addr_t addr) set_property(dnode, "device_type", "escc", strlen("escc") + 1); set_property(dnode, "compatible", "escc\0CHRP,es0", 14); + set_property(dnode, "ranges", "", 0); fword("finish-device"); @@ -541,6 +542,7 @@ escc_init(const char *path, phys_addr_t addr) set_property(dnode, "device_type", "escc-legacy", strlen("escc-legacy") + 1); set_property(dnode, "compatible", "chrp,es1", 9); + set_property(dnode, "ranges", "", 0); fword("finish-device"); -- 1.7.10.4

2 5

[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

[commit] r1394 - trunk/openbios-devel/drivers
by repository service 18 Mar '16

18 Mar '16

Author: mcayland Date: Fri Mar 18 14:06:06 2016 New Revision: 1394 URL: http://tracker.coreboot.org/trac/openbios/changeset/1394 Log: ohci: fix build warnings Explicitly mark the enum types in usbohci_private.h as extern. This prevents them from being allocated as common types in each object file and so avoids "warning: multiple common of... " being emitted by gcc. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/usbohci_private.h Modified: trunk/openbios-devel/drivers/usbohci_private.h ============================================================================== --- trunk/openbios-devel/drivers/usbohci_private.h Fri Mar 18 14:06:03 2016 (r1393) +++ trunk/openbios-devel/drivers/usbohci_private.h Fri Mar 18 14:06:06 2016 (r1394) @@ -43,7 +43,7 @@ // FIXME: fake typedef enum { CMD} reg; - enum { + extern enum { NumberDownstreamPorts = 1<<0, PowerSwitchingMode = 1<<8, NoPowerSwitching = 1<<9, @@ -53,17 +53,17 @@ PowerOnToPowerGoodTime = 1<<24 } HcRhDescriptorAReg; - enum { + extern enum { NumberDownstreamPortsMask = MASK(0, 8), PowerOnToPowerGoodTimeMask = MASK(24, 8) } HcRhDescriptorAMask; - enum { + extern enum { DeviceRemovable = 1<<0, PortPowerControlMask = 1<<16 } HcRhDescriptorBReg; - enum { + extern enum { CurrentConnectStatus = 1<<0, PortEnableStatus = 1<<1, PortSuspendStatus = 1<<2, @@ -77,7 +77,7 @@ PortOverCurrentIndicatorChange = 1<<19, PortResetStatusChange = 1<<20 } HcRhPortStatusRead; - enum { + extern enum { ClearPortEnable = 1<<0, SetPortEnable = 1<<1, SetPortSuspend = 1<<2, @@ -87,7 +87,7 @@ ClearPortPower = 1<<9, } HcRhPortStatusSet; - enum { + extern enum { LocalPowerStatus = 1<<0, OverCurrentIndicator = 1<<1, DeviceRemoteWakeupEnable = 1<<15, @@ -96,18 +96,18 @@ ClearRemoteWakeupEnable = 1<<31 } HcRhStatusReg; - enum { + extern enum { FrameInterval = 1<<0, FSLargestDataPacket = 1<<16, FrameIntervalToggle = 1<<31 } HcFmIntervalOffset; - enum { + extern enum { FrameIntervalMask = MASK(0, 14), FSLargestDataPacketMask = MASK(16, 15), FrameIntervalToggleMask = MASK(31, 1) } HcFmIntervalMask; - enum { + extern enum { ControlBulkServiceRatio = 1<<0, PeriodicListEnable = 1<<2, IsochronousEnable = 1<<3, @@ -119,7 +119,7 @@ RemoteWakeupEnable = 1<<10 } HcControlReg; - enum { + extern enum { ControlBulkServiceRatioMask = MASK(0, 2), HostControllerFunctionalStateMask = MASK(6, 2) } HcControlMask; @@ -131,7 +131,7 @@ USBSuspend = 3*HostControllerFunctionalState }; - enum { + extern enum { HostControllerReset = 1<<0, ControlListFilled = 1<<1, BulkListFilled = 1<<2, @@ -139,16 +139,16 @@ SchedulingOverrunCount = 1<<16 } HcCommandStatusReg; - enum { + extern enum { SchedulingOverrunCountMask = MASK(16, 2) } HcCommandStatusMask; - enum { + extern enum { FrameRemaining = 1<<0, FrameRemainingToggle = 1<<31 } HcFmRemainingReg; - enum { + extern enum { SchedulingOverrung = 1<<0, WritebackDoneHead = 1<<1, StartofFrame = 1<<2,

1 0

[commit] r1393 - trunk/openbios-devel/drivers
by repository service 18 Mar '16

18 Mar '16

Author: mcayland Date: Fri Mar 18 14:06:03 2016 New Revision: 1393 URL: http://tracker.coreboot.org/trac/openbios/changeset/1393 Log: SPARC32: fix build warnings on gcc6 Remove unused functions from the sbus and obio drivers. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/obio.c trunk/openbios-devel/drivers/sbus.c Modified: trunk/openbios-devel/drivers/obio.c ============================================================================== --- trunk/openbios-devel/drivers/obio.c Fri Mar 18 14:06:00 2016 (r1392) +++ trunk/openbios-devel/drivers/obio.c Fri Mar 18 14:06:03 2016 (r1393) @@ -26,8 +26,6 @@ #define PROMDEV_SCREEN 0 /* output to screen */ #define PROMDEV_TTYA 1 /* in/out to ttya */ -/* DECLARE data structures for the nodes. */ -DECLARE_UNNAMED_NODE( ob_obio, INSTALL_OPEN, sizeof(int) ); void ob_new_obio_device(const char *name, const char *type) @@ -397,45 +395,6 @@ } static void -ob_obio_open(__attribute__((unused))int *idx) -{ - int ret=1; - RET ( -ret ); -} - -static void -ob_obio_close(__attribute__((unused))int *idx) -{ - selfword("close-deblocker"); -} - -static void -ob_obio_initialize(__attribute__((unused))int *idx) -{ - push_str("/"); - fword("find-device"); - fword("new-device"); - - push_str("obio"); - fword("device-name"); - - push_str("hierarchical"); - fword("device-type"); - - PUSH(2); - fword("encode-int"); - push_str("#address-cells"); - fword("property"); - - PUSH(1); - fword("encode-int"); - push_str("#size-cells"); - fword("property"); - - fword("finish-device"); -} - -static void ob_set_obio_ranges(uint64_t base) { push_str("/obio"); @@ -458,27 +417,6 @@ fword("property"); } -static void -ob_obio_decodeunit(__attribute__((unused)) int *idx) -{ - fword("decode-unit-sbus"); -} - - -static void -ob_obio_encodeunit(__attribute__((unused)) int *idx) -{ - fword("encode-unit-sbus"); -} - -NODE_METHODS(ob_obio) = { - { NULL, ob_obio_initialize }, - { "open", ob_obio_open }, - { "close", ob_obio_close }, - { "encode-unit", ob_obio_encodeunit }, - { "decode-unit", ob_obio_decodeunit }, -}; - int ob_obio_init(uint64_t slavio_base, unsigned long fd_offset, @@ -491,10 +429,6 @@ // http://www.ibiblio.org/pub/historic-linux/early-ports/Sparc/NCR/NCR89C105.t… //printk("Initializing OBIO devices...\n"); -#if 0 // XXX - REGISTER_NAMED_NODE(ob_obio, "/obio"); - device_end(); -#endif ob_set_obio_ranges(slavio_base); // Zilog Z8530 serial ports, see http://www.zilog.com Modified: trunk/openbios-devel/drivers/sbus.c ============================================================================== --- trunk/openbios-devel/drivers/sbus.c Fri Mar 18 14:06:00 2016 (r1392) +++ trunk/openbios-devel/drivers/sbus.c Fri Mar 18 14:06:03 2016 (r1393) @@ -369,31 +369,6 @@ } } -static void -ob_sbus_open(void) -{ - int ret=1; - RET ( -ret ); -} - -static void -ob_sbus_close(void) -{ - selfword("close-deblocker"); -} - -static void -ob_sbus_initialize(void) -{ -} - - -NODE_METHODS(ob_sbus_node) = { - { NULL, ob_sbus_initialize }, - { "open", ob_sbus_open }, - { "close", ob_sbus_close }, -}; - struct sbus_offset { int slot, type; uint64_t base;

1 0

[commit] r1392 - trunk/openbios-devel/arch/sparc64
by repository service 18 Mar '16

18 Mar '16

Author: mcayland Date: Fri Mar 18 14:06:00 2016 New Revision: 1392 URL: http://tracker.coreboot.org/trac/openbios/changeset/1392 Log: SPARC64: fix build warnings on gcc6 Make sure we use the correct REGISTER_NODE macro when registering the /memory and /virtual-memory nodes. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.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 Fri Feb 26 00:00:15 2016 (r1391) +++ trunk/openbios-devel/arch/sparc64/lib.c Fri Mar 18 14:06:00 2016 (r1392) @@ -458,10 +458,10 @@ void ob_mmu_init(const char *cpuname, uint64_t ram_size) { /* memory node */ - REGISTER_NODE_METHODS(memory, "/memory"); + REGISTER_NODE(memory); /* MMU node */ - REGISTER_NODE_METHODS(mmu, "/virtual-memory"); + REGISTER_NODE(mmu); ofmem_register(find_dev("/memory"), find_dev("/virtual-memory"));

1 0

Google Summer of Code 2016: Make Mac OS 9 boot successfully with all Apple extensions
by Programmingkid 17 Mar '16

17 Mar '16

=== TITLE === Make all versions of Mac OS 9 boot successfully in QEMU with all Apple extensions '''Summary:''' Short description of the project Mac OS 9.2 does boot in QEMU without extensions, but certain extensions that ship with Mac OS 9.2 need to be disabled or else they will cause booting to fail. We need any issues with OpenBIOS and QEMU fixed so that Mac OS 9 will boot successfully in QEMU. Detailed description of the project. These are the known extensions that cause Mac OS 9.2 to crash: • Apple Audio Extension • Apple Enet • Multiprocessing folder • Open Transport aslm modules • Text Encoding Converter Without them some applications running in Mac OS 9 are severely limited or simply refuse to run. '''Links:''' http://wiki.qemu.org/PowerPC http://www.emaculation.com/forum/viewtopic.php?f=34&t=7047&sid=3044078243e3… '''Details:''' * Skill level: advanced * Language: C, PowerPC assembly * Mentor: None currently * Suggested by: John Arbuckle programmingkidx(a)gmail.com

2 1

Re: [OpenBIOS] Request to help for Sparc arch - Solaris vm creation.
by Programmingkid 16 Mar '16

16 Mar '16

On Mar 15, 2016, at 8:22 AM, Lsrtej P wrote: > Hi Openbios team, > > First of all I would like to thank you for the contribution to opensource community which is helping lot of developers like me to progress professionally. > > It would be great if you can help me with the problem I am facing with using qemu with openbios . > > I am trying to create a solaris environment with sparc architecture on an ubuntu 14.04 linux OS with help of qemu-system-sparc . > > When I am trying to load a solaris image using this qemu-system-sparc64 i am getting the following error message . > > <Mail Attachment.gif> > > When I tried debugging it I found that the openbios-sparc is not installed in ubuntu machine I am working with . > > This qemu-system-sparc64 uses a softlink which points to the directory /usr/share/qemu/openbios-sparc64 which is not found in the machine . > > I am stuck here , I am not sure what should be the contents of the above directory so that this sparc emulation works good . > > I tried to install the openbios from your official website but failed in using it along with qemu . > > Can you please help me to get out of this situation or suggest me some way to create a 64 bit sparc solaris environment on linux os . > > Thanks in advance :) > > Warm Regards, > Tej I tried to make a sparc32 and a sparc64 binary, but I saw a bunch of errors instead. Just to go past the 'switch-arch' stage, I had to rename sparc32_config.xml to sparc_config.xml. The build system for sparc might need a little fixing.

2 2

[PATCH 1/3] SPARC64: fix build warnings on gcc6
by Mark Cave-Ayland 15 Mar '16

15 Mar '16

Make sure we use the correct REGISTER_NODE macro when registering the /memory and /virtual-memory nodes. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/arch/sparc64/lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbios-devel/arch/sparc64/lib.c b/openbios-devel/arch/sparc64/lib.c index e9101af..4709ca8 100644 --- a/openbios-devel/arch/sparc64/lib.c +++ b/openbios-devel/arch/sparc64/lib.c @@ -458,10 +458,10 @@ NODE_METHODS(mmu) = { void ob_mmu_init(const char *cpuname, uint64_t ram_size) { /* memory node */ - REGISTER_NODE_METHODS(memory, "/memory"); + REGISTER_NODE(memory); /* MMU node */ - REGISTER_NODE_METHODS(mmu, "/virtual-memory"); + REGISTER_NODE(mmu); ofmem_register(find_dev("/memory"), find_dev("/virtual-memory")); -- 1.7.10.4

2 6

Re: [OpenBIOS] Request to help for Sparc arch - Solaris vm creation.
by Mark Cave-Ayland 15 Mar '16

15 Mar '16

On 15/03/16 12:22, Lsrtej P wrote: > Hi Openbios team, > > First of all I would like to thank you for the contribution to > opensource community which is helping lot of developers like me to > progress professionally. > > It would be great if you can help me with the problem I am facing with > using qemu with openbios . > > I am trying to create a solaris environment with sparc architecture on > an ubuntu 14.04 linux OS with help of qemu-system-sparc . > > When I am trying to load a solaris image using this qemu-system-sparc64 > i am getting the following error message . > > > > When I tried debugging it I found that the openbios-sparc is not > installed in ubuntu machine I am working with . > > This qemu-system-sparc64 uses a softlink which points to the directory > /usr/share/qemu/openbios-sparc64 which is not found in the machine . > > I am stuck here , I am not sure what should be the contents of the above > directory so that this sparc emulation works good . > > I tried to install the openbios from your official website but failed > in using it along with qemu . > > Can you please help me to get out of this situation or suggest me some > way to create a 64 bit sparc solaris environment on linux os . > > Thanks in advance :) > > Warm Regards, > Tej Hi Tej, Seems like you didn't get my reply for some reason? Fortunately it's still listed in the archives at https://www.coreboot.org/pipermail/openbios/2016-March/009283.html. Please let us know if you have any further questions :) ATB, Mark.

1 0

[PATCHv2 1/3] SPARC64: fix build warnings on gcc6
by Mark Cave-Ayland 15 Mar '16

15 Mar '16

Make sure we use the correct REGISTER_NODE macro when registering the /memory and /virtual-memory nodes. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/arch/sparc64/lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openbios-devel/arch/sparc64/lib.c b/openbios-devel/arch/sparc64/lib.c index e9101af..4709ca8 100644 --- a/openbios-devel/arch/sparc64/lib.c +++ b/openbios-devel/arch/sparc64/lib.c @@ -458,10 +458,10 @@ NODE_METHODS(mmu) = { void ob_mmu_init(const char *cpuname, uint64_t ram_size) { /* memory node */ - REGISTER_NODE_METHODS(memory, "/memory"); + REGISTER_NODE(memory); /* MMU node */ - REGISTER_NODE_METHODS(mmu, "/virtual-memory"); + REGISTER_NODE(mmu); ofmem_register(find_dev("/memory"), find_dev("/virtual-memory")); -- 1.7.10.4

2 3

Request to help for Sparc arch - Solaris vm creation.
by Lsrtej P 15 Mar '16

15 Mar '16

Hi Openbios team, First of all I would like to thank you for the contribution to opensource community which is helping lot of developers like me to progress professionally. It would be great if you can help me with the problem I am facing with using qemu with openbios . I am trying to create a solaris environment with sparc architecture on an ubuntu 14.04 linux OS with help of qemu-system-sparc . When I am trying to load a solaris image using this qemu-system-sparc64 i am getting the following error message . When I tried debugging it I found that the openbios-sparc is not installed in ubuntu machine I am working with . This qemu-system-sparc64 uses a softlink which points to the directory /usr/share/qemu/openbios-sparc64 which is not found in the machine . I am stuck here , I am not sure what should be the contents of the above directory so that this sparc emulation works good . I tried to install the openbios from your official website but failed in using it along with qemu . Can you please help me to get out of this situation or suggest me some way to create a 64 bit sparc solaris environment on linux os . Thanks in advance :) Warm Regards, Tej =====-----=====-----===== Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited. If you have received this communication in error, please notify us by reply e-mail or telephone and immediately and permanently delete the message and any attachments. Thank you

1 0

Re: [OpenBIOS] Request to help for Sparc arch - Solaris vm creation.
by Mark Cave-Ayland 14 Mar '16

14 Mar '16

On 12/03/16 10:09, Lsrtej P wrote: > Hi Openbios team, > > First of all I would like to thank you for the contribution to > opensource community which is helping lot of developers like me to > progress professionally. > > It would be great if you can help me with the problem I am facing with > using qemu with openbios . > > I am trying to create a solaris environment with sparc architecture on > an ubuntu 14.04 linux OS with help of qemu-system-sparc . > > When I am trying to load a solaris image using this qemu-system-sparc64 > i am getting the following error message . > > > > When I tried debugging it I found that the openbios-sparc is not > installed in ubuntu machine I am working with . > > This qemu-system-sparc64 uses a softlink which points to the directory > /usr/share/qemu/openbios-sparc64 which is not found in the machine . > > I am stuck here , I am not sure what should be the contents of the above > directory so that this sparc emulation works good . > > I tried to install the openbios from your official website but failed > in using it along with qemu . > > Can you please help me to get out of this situation or suggest me some > way to create a 64 bit sparc solaris environment on linux os . > > Thanks in advance :) > > Warm Regards, > Tej Hi Tej, It sounds like there is a dependency missing somewhere between your QEMU and OpenBIOS packages - as you can see at https://launchpad.net/ubuntu/+source/openbios, OpenBIOS is packaged separately under Ubuntu so I'm not sure why this hasn't been brought in? Once the package is installed you should find that QEMU can locate the binary automatically. As regards running Solaris under Linux using qemu-system-sparc64 sadly this is still a work in progress. Since the work is currently unsponsored then myself and a few others are quite restricted in the time we can spend on this so progress isn't as fast as we would like. On the plus side, qemu-system-sparc64 is getting much more reliable with newer QEMU/OpenBIOS releases and is now capable of booting NetBSD/OpenBSD and (nearly) FreeBSD. So all I can say about Solaris for the moment is watch this space :) ATB, Mark.

1 0

Request to help for Sparc arch - Solaris vm creation.
by Lsrtej P 12 Mar '16

12 Mar '16

Hi Openbios team, First of all I would like to thank you for the contribution to opensource community which is helping lot of developers like me to progress professionally. It would be great if you can help me with the problem I am facing with using qemu with openbios . I am trying to create a solaris environment with sparc architecture on an ubuntu 14.04 linux OS with help of qemu-system-sparc . When I am trying to load a solaris image using this qemu-system-sparc64 i am getting the following error message . When I tried debugging it I found that the openbios-sparc is not installed in ubuntu machine I am working with . This qemu-system-sparc64 uses a softlink which points to the directory /usr/share/qemu/openbios-sparc64 which is not found in the machine . I am stuck here , I am not sure what should be the contents of the above directory so that this sparc emulation works good . I tried to install the openbios from your official website but failed in using it along with qemu . Can you please help me to get out of this situation or suggest me some way to create a 64 bit sparc solaris environment on linux os . Thanks in advance :) Warm Regards, Tej ____________________________________________ Experience certainty. IT Services Business Solutions Consulting ____________________________________________ =====-----=====-----===== Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited. If you have received this communication in error, please notify us by reply e-mail or telephone and immediately and permanently delete the message and any attachments. Thank you

1 0

build warnings on gcc6
by Cole Robinson 11 Mar '16

11 Mar '16

openbios has some warnings (that are errors with -Werror) on gcc6. See results below, with gcc6 from fedora, and building openbios revision 1378 Thanks, Cole /builddir/build/BUILD/openbios-1.1/libc/string.c: In function 'strdup': /builddir/build/BUILD/openbios-1.1/libc/string.c:353:4: warning: nonnull argument 'str' compared to NULL [-Wnonnull-compare] if( !str ) In file included from /builddir/build/BUILD/openbios-1.1/drivers/sbus.c:14:0: /builddir/build/BUILD/openbios-1.1/drivers/sbus.c:391:14: warning: 'ob_sbus_node_m' defined but not used [-Wunused-const-variable] NODE_METHODS(ob_sbus_node) = { ^ /builddir/build/BUILD/openbios-1.1/include/libopenbios/bindings.h:139:23: note: in definition of macro 'NODE_METHODS' static const method_t name##_m[] In file included from /builddir/build/BUILD/openbios-1.1/arch/sparc64/lib.c:12:0: /builddir/build/BUILD/openbios-1.1/arch/sparc64/lib.c:444:14: warning: 'mmu_p' defined but not used [-Wunused-const-variable] DECLARE_NODE(mmu, INSTALL_OPEN, 0, "/virtual-memory"); ^ /builddir/build/BUILD/openbios-1.1/include/libopenbios/bindings.h:135:27: note: in definition of macro 'DECLARE_NODE' static const char * const name##_p[] = { paths }; \ ^~~~ /builddir/build/BUILD/openbios-1.1/arch/sparc64/lib.c:436:14: warning: 'memory_p' defined but not used [-Wunused-const-variable] DECLARE_NODE(memory, INSTALL_OPEN, 0, "/memory"); ^ /builddir/build/BUILD/openbios-1.1/include/libopenbios/bindings.h:135:27: note: in definition of macro 'DECLARE_NODE' static const char * const name##_p[] = { paths }; \

4 8

Re: [OpenBIOS] [PATCH] bootinfo_load.c: Translate \r to \n for Mac OS 9 compatibility
by Programmingkid 11 Mar '16

11 Mar '16

I forgot to mention that this patch eliminates the error message printed by Fedora when using the older forth-based CR and LF filtering patch.

1 0

Why some Linux distributions start booting to black screens
by Programmingkid 11 Mar '16

11 Mar '16

Some Linux distributions like Fedora start booting to an all black screen. I found out the reason why is because there appears to be something wrong with the screen node's color! word. If you type these commands in OpenBIOS: dev screen see color! You will see that color! is empty. This would definitely prevent the color of text from being changed.

3 7

[PATCH] bootinfo_load.c: Translate \r to \n for Mac OS 9 compatibility
by Programmingkid 08 Mar '16

08 Mar '16

Mac OS 9's bootscript uses '\r' a lot. These interfere with how OpenBIOS functions. So the solution is to translate them to '\n' characters. This will allow Mac OS 9 to boot. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> These are the operating systems I used to test my patch. - Mac OS 10.4.0 - Mac OS 9.2 - Fedora Linux 17 - Debian Linux 5 No regressions have been detected. Index: libopenbios/bootinfo_load.c =================================================================== --- libopenbios/bootinfo_load.c (revision 1391) +++ libopenbios/bootinfo_load.c (working copy) @@ -190,7 +190,10 @@ while (current < size) { c = base[current++]; - + if(c == '\r') { + c = '\n'; + } + if (c == '<') { script = 0; tag = 1;

1 0

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 26 Feb '16

26 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 26 Feb '16

26 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 26 Feb '16

26 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 26 Feb '16

26 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

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

25 Feb '16

Author: mcayland Date: Thu Feb 25 23:59:56 2016 New Revision: 1387 URL: http://tracker.coreboot.org/trac/openbios/changeset/1387 Log: ppc: fix ESCC reg properties 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. Based upon an original patch from Hervé Poussineau <hpoussin(a)reactos.org>. 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:53 2016 (r1386) +++ trunk/openbios-devel/drivers/escc.c Thu Feb 25 23:59:56 2016 (r1387) @@ -388,7 +388,20 @@ cell props[10]; int index; int legacy; - + int reg_offsets[2][2][3] = { + { + /* ch-b */ + { 0x00, 0x10, 0x40 }, + /* ch-a */ + { 0x20, 0x30, 0x50 } + },{ + /* legacy ch-b */ + { 0x0, 0x2, 0x8 }, + /* legacy ch-a */ + { 0x4, 0x6, 0xa } + } + }; + switch (esnum) { case 2: index = 1; legacy = 0; break; case 3: index = 0; legacy = 0; break; @@ -425,17 +438,21 @@ set_property(dnode, "compatible", buf, 9); if (legacy) { - props[0] = IO_ESCC_LEGACY_OFFSET + index * 0x4; - props[1] = 0x00000001; - props[2] = IO_ESCC_LEGACY_OFFSET + index * 0x4 + 2; - props[3] = 0x00000001; - props[4] = IO_ESCC_LEGACY_OFFSET + index * 0x4 + 6; - props[5] = 0x00000001; + 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)); } else { - props[0] = IO_ESCC_OFFSET + index * 0x20; - props[1] = 0x00000020; - set_property(dnode, "reg", (char *)&props, 2 * sizeof(cell)); + 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)); } if (legacy) { @@ -446,13 +463,13 @@ OLDWORLD(set_property(dnode, "AAPL,address", (char *)&props, 1 * sizeof(cell))); - props[0] = 0x00000010 - index; + props[0] = 0x10 - index; OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); props[0] = (0x24) + index; - props[1] = 0; - props[2] = 0; + props[1] = 0x0; + props[2] = 0x0; NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 3 * sizeof(cell)));

1 0

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

25 Feb '16

Author: mcayland Date: Thu Feb 25 23:59:53 2016 New Revision: 1386 URL: http://tracker.coreboot.org/trac/openbios/changeset/1386 Log: escc.c: rename offset to index This better describes the variable since it contains a reference to the channel rather than an offset. 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 Sat Feb 20 14:22:24 2016 (r1385) +++ trunk/openbios-devel/drivers/escc.c Thu Feb 25 23:59:53 2016 (r1386) @@ -386,15 +386,15 @@ phandle_t dnode, aliases; cell props[10]; - int offset; + int index; int legacy; switch (esnum) { - case 2: offset = 1; legacy = 0; break; - case 3: offset = 0; legacy = 0; break; - case 4: offset = 1; legacy = 1; break; - case 5: offset = 0; legacy = 1; break; - default: return; + case 2: index = 1; legacy = 0; break; + case 3: index = 0; legacy = 0; break; + case 4: index = 1; legacy = 1; break; + case 5: index = 0; legacy = 1; break; + default: return; } /* add device */ @@ -425,32 +425,32 @@ set_property(dnode, "compatible", buf, 9); if (legacy) { - props[0] = IO_ESCC_LEGACY_OFFSET + offset * 0x4; + props[0] = IO_ESCC_LEGACY_OFFSET + index * 0x4; props[1] = 0x00000001; - props[2] = IO_ESCC_LEGACY_OFFSET + offset * 0x4 + 2; + props[2] = IO_ESCC_LEGACY_OFFSET + index * 0x4 + 2; props[3] = 0x00000001; - props[4] = IO_ESCC_LEGACY_OFFSET + offset * 0x4 + 6; + props[4] = IO_ESCC_LEGACY_OFFSET + index * 0x4 + 6; props[5] = 0x00000001; set_property(dnode, "reg", (char *)&props, 6 * sizeof(cell)); } else { - props[0] = IO_ESCC_OFFSET + offset * 0x20; + props[0] = IO_ESCC_OFFSET + index * 0x20; props[1] = 0x00000020; set_property(dnode, "reg", (char *)&props, 2 * sizeof(cell)); } if (legacy) { - props[0] = addr + IO_ESCC_LEGACY_OFFSET + offset * 0x4; + props[0] = addr + IO_ESCC_LEGACY_OFFSET + index * 0x4; } else { - props[0] = addr + IO_ESCC_OFFSET + offset * 0x20; + props[0] = addr + IO_ESCC_OFFSET + index * 0x20; } OLDWORLD(set_property(dnode, "AAPL,address", (char *)&props, 1 * sizeof(cell))); - props[0] = 0x00000010 - offset; + props[0] = 0x00000010 - index; OLDWORLD(set_property(dnode, "AAPL,interrupts", (char *)&props, 1 * sizeof(cell))); - props[0] = (0x24) + offset; + props[0] = (0x24) + index; props[1] = 0; props[2] = 0; NEWWORLD(set_property(dnode, "interrupts", @@ -460,11 +460,11 @@ if (legacy) { uart_init_line( - (unsigned char*)addr + IO_ESCC_LEGACY_OFFSET + offset * 0x4, + (unsigned char*)addr + IO_ESCC_LEGACY_OFFSET + index * 0x4, CONFIG_SERIAL_SPEED); } else { uart_init_line( - (unsigned char*)addr + IO_ESCC_OFFSET + offset * 0x20, + (unsigned char*)addr + IO_ESCC_OFFSET + index * 0x20, CONFIG_SERIAL_SPEED); } }

1 0

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

25 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. It definitely looks to be true. I will start working on this problem immediately.

1 0

Has anyone figured out how to invoke Macsbug from the cocoa gui?
by Programmingkid 25 Feb '16

25 Feb '16

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?

3 3

Trying to figure out what 9 means to the escc
by Programmingkid 25 Feb '16

25 Feb '16

With the below patch I can see that Mac OS 9.0 is having escc_mem_write() go to the SERIAL_CTRL case. Then to the W_CMD case. Then to the CMD_HI case. This then causes newreg to be set to the value 9. What I need to know is what is this value for. Does anyone know what it means? Afterwords Mac OS 9.0 will write the value 0xc0 to the escc. This causes the escc to reset. This pdf might be helpful for anyone who is interested in helping: http://www.zilog.com/docs/serial/scc_escc_um.pdf --- hw/char/escc.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/hw/char/escc.c b/hw/char/escc.c index 98a1c21..f1fc70e 100644 --- a/hw/char/escc.c +++ b/hw/char/escc.c @@ -472,6 +472,7 @@ static void escc_update_parameters(ChannelState *s) static void escc_mem_write(void *opaque, hwaddr addr, uint64_t val, unsigned size) { + ESCCState *serial = opaque; ChannelState *s; uint32_t saddr; @@ -481,22 +482,31 @@ static void escc_mem_write(void *opaque, hwaddr addr, saddr = (addr >> serial->it_shift) & 1; channel = (addr >> (serial->it_shift + 1)) & 1; s = &serial->chn[channel]; + + printf("%s(): start value:0x%x register:0x%x\n", __func__, val, saddr); + switch (saddr) { case SERIAL_CTRL: + printf("%s() SERIAL_CTRL case\n", __func__); trace_escc_mem_writeb_ctrl(CHN_C(s), s->reg, val & 0xff); newreg = 0; switch (s->reg) { case W_CMD: + printf("%s() W_CMD case\n", __func__); newreg = val & CMD_PTR_MASK; val &= CMD_CMD_MASK; switch (val) { case CMD_HI: + printf("%s() CMD_HI case\n", __func__); newreg |= CMD_HI; + printf("%s(): newreg = 0x%x\n", __func__, newreg); break; case CMD_CLR_TXINT: + printf("%s() CMD_CLR_TXINT case\n", __func__); clr_txint(s); break; case CMD_CLR_IUS: + printf("%s() CMD_CLR_IUS case\n", __func__); if (s->rxint_under_svc) { s->rxint_under_svc = 0; if (s->txint) { @@ -508,6 +518,7 @@ static void escc_mem_write(void *opaque, hwaddr addr, escc_update_irq(s); break; default: + printf("%s(): unprogrammed command detected: value:%d\n", __func__, val); break; } break; @@ -515,36 +526,44 @@ static void escc_mem_write(void *opaque, hwaddr addr, case W_SYNC1 ... W_TXBUF: case W_MISC1 ... W_CLOCK: case W_MISC2 ... W_EXTINT: + printf("%s() W_MISC2 case\n", __func__); s->wregs[s->reg] = val; break; case W_TXCTRL1: case W_TXCTRL2: + printf("%s() W_TXCTRL2 case\n", __func__); s->wregs[s->reg] = val; escc_update_parameters(s); break; case W_BRGLO: case W_BRGHI: + printf("%s() W_BRGHI case\n", __func__); s->wregs[s->reg] = val; s->rregs[s->reg] = val; escc_update_parameters(s); break; case W_MINTR: + printf("%s(): W_MINTR detected\n", __func__); switch (val & MINTR_RST_MASK) { case 0: default: break; case MINTR_RST_B: + printf("%s() MINTR_RST_B case\n", __func__); escc_reset_chn(&serial->chn[0]); return; case MINTR_RST_A: + printf("%s() MINTR_RST_A case\n", __func__); escc_reset_chn(&serial->chn[1]); return; case MINTR_RST_ALL: + printf("%s(): MINTR_RST_ALL case\n", __func__); escc_reset(DEVICE(serial)); return; } break; default: + printf("%s(): unprogrammed command detected: value:%d\n", __func__, val); break; } if (s->reg == 0) @@ -553,6 +572,7 @@ static void escc_mem_write(void *opaque, hwaddr addr, s->reg = 0; break; case SERIAL_DATA: + printf("%s() SERIAL_DATA case\n", __func__); trace_escc_mem_writeb_data(CHN_C(s), val); s->tx = val; if (s->wregs[W_TXCTRL2] & TXCTRL2_TXEN) { // tx enabled @@ -567,6 +587,7 @@ static void escc_mem_write(void *opaque, hwaddr addr, set_txint(s); break; default: + printf("%s(): unprogrammed command detected: value:%d\n", __func__, val); break; } } @@ -583,11 +604,16 @@ static uint64_t escc_mem_read(void *opaque, hwaddr addr, saddr = (addr >> serial->it_shift) & 1; channel = (addr >> (serial->it_shift + 1)) & 1; s = &serial->chn[channel]; + + printf("%s(): address:0x%x saddr:0x%x\n", __func__, addr, saddr); + switch (saddr) { case SERIAL_CTRL: trace_escc_mem_readb_ctrl(CHN_C(s), s->reg, s->rregs[s->reg]); + printf("%s(): s->reg = 0x%x\n", __func__, s->reg); ret = s->rregs[s->reg]; s->reg = 0; + printf("%s(): SERIAL_CTRL returning 0x%x\n", __func__, ret); return ret; case SERIAL_DATA: s->rregs[R_STATUS] &= ~STATUS_RXAV; @@ -599,8 +625,10 @@ static uint64_t escc_mem_read(void *opaque, hwaddr addr, trace_escc_mem_readb_data(CHN_C(s), ret); if (s->chr) qemu_chr_accept_input(s->chr); + printf("%s(): SERIAL_DATA returning 0x%x\n", __func__, ret); return ret; default: + printf("%s(): default case for address 0x%x\n", __func__, addr); break; } return 0; -- 1.7.5.4

2 2

[PATCHv2 0/6] ppc: ESCC fixups (MacOS related)
by Mark Cave-Ayland 25 Feb '16

25 Feb '16

This patchset is really a roll-up/rework of ESCC patches posted by Hervé and John along with a general tidy-up of the ESCC channel code and addition of DBDMA properties. The most interesting change with this patchset is that a basic OS 9.2 image with just OT extensions enabled now hangs in QEMU in a loop constantly polling ESCC registers rather than crashing into MacsBug. NOTE: for OS 9 testers, QEMU's default G4 CPU for mac99 seems buggy and always crashes into MacsBug. Make sure that you have the interpreter.fs patch applied and run QEMU with -cpu G3. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Switch channel offsets over to match http://nandra.segv.jp/NetBSD/G4.dump-device-tree.txt (fixes serial port on Linux) - Fix DBDMA region size to 0x100 Mark Cave-Ayland (6): escc.c: rename offset to index ppc: fix ESCC reg properties escc.c: tidy-up legacy and non-legacy codepaths escc.c: add empty slot-names property to serial ports escc.c: add DBDMA addresses to reg property escc.c: add DBDMA interrupt properties openbios-devel/drivers/escc.c | 92 +++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 36 deletions(-) -- 1.7.10.4

5 17

[PATCH 0/6] ppc: ESCC fixups (MacOS related)
by Mark Cave-Ayland 20 Feb '16

20 Feb '16

This patchset is really a roll-up/rework of ESCC patches posted by Hervé and John along with a general tidy-up of the ESCC channel code and addition of DBDMA properties. The most interesting change with this patchset is that a basic OS 9.2 image with just OT extensions enabled now hangs in QEMU in a loop constantly polling ESCC registers rather than crashing into MacsBug. There are still some issues accessing the serial ports in BSD/Linux but fortunately no regressions/hangs show in testing here with this patchset applied. NOTE: for OS 9 testers, QEMU's default G4 CPU for mac99 seems buggy and always crashes into MacsBug. Make sure that you have the interpreter.fs patch applied and run QEMU with -cpu G3. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (6): escc.c: rename offset to index ppc: fix ESCC reg properties escc.c: tidy-up legacy and non-legacy codepaths escc.c: add empty slot-names property to serial ports escc.c: add DBDMA addresses to reg property escc.c: add DBDMA interrupt properties openbios-devel/drivers/escc.c | 92 +++++++++++++++++++++++++---------------- 1 file changed, 56 insertions(+), 36 deletions(-) -- 1.7.10.4

3 13

[commit] r1385 - trunk/openbios-devel/arch/ppc/qemu
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:24 2016 New Revision: 1385 URL: http://tracker.coreboot.org/trac/openbios/changeset/1385 Log: ppc: move copyright property hooks from adler32 word Instead insert the copyright property if we detect the /rom/macos device generated by the MacOS boot loader just before we call the client with go and remove it before control is returned back to the interpreter. This effectively hides the property from everyone except for MacOS bootloaders. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/init.c trunk/openbios-devel/arch/ppc/qemu/qemu.fs Modified: trunk/openbios-devel/arch/ppc/qemu/init.c ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/init.c Sat Feb 20 14:22:22 2016 (r1384) +++ trunk/openbios-devel/arch/ppc/qemu/init.c Sat Feb 20 14:22:24 2016 (r1385) @@ -601,6 +601,11 @@ { ucell addr; + /* Insert copyright property for MacOS 9 and below */ + if (find_dev("/rom/macos")) { + fword("insert-copyright-property"); + } + feval("saved-program-state >sps.entry @"); addr = POP(); Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:22 2016 (r1384) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:24 2016 (r1385) @@ -121,18 +121,16 @@ active-package! ; +: (exit) + \ Clean up before returning to the interpreter + delete-copyright-property +; + \ ------------------------------------------------------------------------- \ Adler-32 wrapper \ ------------------------------------------------------------------------- : adler32 ( adler buf len -- checksum ) - \ Since Mac OS 9 is the only system using this word, we take this - \ opportunity to inject a copyright message that is necessary for the - \ system to boot. - insert-copyright-property - - ( adler buf len ) - " (adler32)" $find if execute else

1 0

[commit] r1384 - trunk/openbios-devel/arch/ppc/qemu
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:22 2016 New Revision: 1384 URL: http://tracker.coreboot.org/trac/openbios/changeset/1384 Log: ppc: add complementary delete-copyright-property word This simply removes the copyright property generated by insert-copyright-property. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:17 2016 (r1383) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:22 2016 (r1384) @@ -111,6 +111,16 @@ then ; +: delete-copyright-property + \ Remove copyright property created above + active-package + " /" find-package if + active-package! + " copyright" delete-property + then + active-package! +; + \ ------------------------------------------------------------------------- \ Adler-32 wrapper \ -------------------------------------------------------------------------

1 0

[commit] r1383 - trunk/openbios-devel/forth/system
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:17 2016 New Revision: 1383 URL: http://tracker.coreboot.org/trac/openbios/changeset/1383 Log: ciface.fs: implement optional (exit) hook when returning control back to the interpreter This allows us to optionally intercept and execute code before returning back to the Forth interactive console. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Sat Feb 20 14:22:14 2016 (r1382) +++ trunk/openbios-devel/forth/system/ciface.fs Sat Feb 20 14:22:17 2016 (r1383) @@ -326,6 +326,14 @@ : exit ( -- ) ." EXIT" + + \ Execute (exit) hook if one exists + s" (exit)" $find if + execute + else + 2drop + then + outer-interpreter ;

1 0

[commit] r1382 - trunk/openbios-devel/arch/ppc/qemu
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:14 2016 New Revision: 1382 URL: http://tracker.coreboot.org/trac/openbios/changeset/1382 Log: ppc: use ROT13 encoding for copyright property Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:11 2016 (r1381) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:14 2016 (r1382) @@ -100,8 +100,8 @@ : insert-copyright-property \ As required for MacOS 9 and below - " Copyright 1983-2001 Apple Computer, Inc. THIS MESSAGE FOR COMPATIBILITY ONLY" - encode-string " copyright" + " Pbclevtug 1983-2001 Nccyr Pbzchgre, Vap. GUVF ZRFFNTR SBE PBZCNGVOVYVGL BAYL" + rot13-str encode-string " copyright" " /" find-package if " set-property" $find if execute

1 0

[commit] r1381 - trunk/openbios-devel/arch/ppc/qemu
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:11 2016 New Revision: 1381 URL: http://tracker.coreboot.org/trac/openbios/changeset/1381 Log: ppc: move copyright property generation into a separate word Separate this out rather than keeping it as part of adler32. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs Modified: trunk/openbios-devel/arch/ppc/qemu/qemu.fs ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:09 2016 (r1380) +++ trunk/openbios-devel/arch/ppc/qemu/qemu.fs Sat Feb 20 14:22:11 2016 (r1381) @@ -95,13 +95,11 @@ ; PREPOST-initializer \ ------------------------------------------------------------------------- -\ Adler-32 wrapper +\ copyright property handling \ ------------------------------------------------------------------------- -: adler32 ( adler buf len -- checksum ) - \ Since Mac OS 9 is the only system using this word, we take this - \ opportunity to inject a copyright message that is necessary for the - \ system to boot. +: insert-copyright-property + \ As required for MacOS 9 and below " Copyright 1983-2001 Apple Computer, Inc. THIS MESSAGE FOR COMPATIBILITY ONLY" encode-string " copyright" " /" find-package if @@ -111,6 +109,17 @@ 3drop drop then then +; + +\ ------------------------------------------------------------------------- +\ Adler-32 wrapper +\ ------------------------------------------------------------------------- + +: adler32 ( adler buf len -- checksum ) + \ Since Mac OS 9 is the only system using this word, we take this + \ opportunity to inject a copyright message that is necessary for the + \ system to boot. + insert-copyright-property ( adler buf len )

1 0

[commit] r1380 - trunk/openbios-devel/forth/lib
by repository service 20 Feb '16

20 Feb '16

Author: mcayland Date: Sat Feb 20 14:22:09 2016 New Revision: 1380 URL: http://tracker.coreboot.org/trac/openbios/changeset/1380 Log: string.fs: add functions to support ROT13 string encoding/decoding Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/forth/lib/string.fs Modified: trunk/openbios-devel/forth/lib/string.fs ============================================================================== --- trunk/openbios-devel/forth/lib/string.fs Sat Feb 13 14:34:31 2016 (r1379) +++ trunk/openbios-devel/forth/lib/string.fs Sat Feb 20 14:22:09 2016 (r1380) @@ -125,3 +125,17 @@ : parse-hex ( str len -- value ) base @ hex -rot $number if 0 then swap base ! ; + + +\ ----------------------------------------------------- +\ miscellaneous functions +\ ----------------------------------------------------- + +: rot13 ( c - c ) + dup upc [char] A [char] M between if d# 13 + exit then + dup upc [char] N [char] Z between if d# 13 - then +; + +: rot13-str ( str len -- newstr len ) + strdup 2dup bounds ?do i c@ rot13 i c! loop +;

1 0

[PATCHv2 0/6] ppc: improve copyright property handling
by Mark Cave-Ayland 14 Feb '16

14 Feb '16

This series changes the injection of the copyright property on PPC such that it is included just before control is handed to the client. The motivation behind this is that older versions of the MacOS bootloader don't call the adler32 word which means the injection is omitted and boot fails. The property is only inserted if a MacOS boot loader is detected and is removed if the bootloader terminates, thereby only making it visible to MacOS clients. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Updated Forth suggested by Segher - Update messages/comments as suggested by Alyssa - Only insert copyright property if MacOS bootloader detected Mark Cave-Ayland (6): string.fs: add functions to support ROT13 string encoding/decoding ppc: move copyright property generation into a separate word ppc: use ROT13 encoding for copyright property ciface.fs: implement optional (exit) hook when returning control back to the interpreter ppc: add complementary delete-copyright-property word ppc: move copyright property hooks from adler32 word openbios-devel/arch/ppc/qemu/init.c | 5 +++++ openbios-devel/arch/ppc/qemu/qemu.fs | 33 +++++++++++++++++++++++++-------- openbios-devel/forth/lib/string.fs | 19 +++++++++++++++++++ openbios-devel/forth/system/ciface.fs | 8 ++++++++ 4 files changed, 57 insertions(+), 8 deletions(-) -- 1.7.10.4

4 17

[PATCH] ppc: fix reuse of MMU translation slots
by Alyssa Milburn 14 Feb '16

14 Feb '16

The current code always picks slot 0 in the reuse case. (This doesn't seem to matter in the cases I've tested, though.) Signed-off-by: Alyssa Milburn <fuzzie(a)fuzzie.org> --- arch/ppc/qemu/ofmem.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index 6f346a3..c9fe154 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -359,9 +359,11 @@ hash_page_64(unsigned long ea, phys_addr_t phys, ucell mode) found = 1; /* otherwise use a free slot */ - for (i = 0; !found && i < 8; i++) - if (!pp[i].v) - found = 1; + if (!found) { + for (i = 0; !found && i < 8; i++) + if (!pp[i].v) + found = 1; + } /* out of slots, just evict one */ if (!found) @@ -414,9 +416,11 @@ hash_page_32(unsigned long ea, phys_addr_t phys, ucell mode) found = 1; /* otherwise use a free slot */ - for (i = 0; !found && i < 8; i++) - if (!pp[i].v) - found = 1; + if (!found) { + for (i = 0; !found && i < 8; i++) + if (!pp[i].v) + found = 1; + } /* out of slots, just evict one */ if (!found) -- 2.1.0

3 3

[PATCH 0/7] ppc: improve fake copyright message handling
by Mark Cave-Ayland 13 Feb '16

13 Feb '16

This series changes the injection of the fake copyright message such that it is included just before control is handled to the client. The motivation behind this is that older versions of the MacOS bootloader don't call the adler32 word which means the injection is omitted and boot fails. The first patch is actually a build fix (and will likely be applied separately) while the rest of the patchset ensures that the message is only visible to the bootloader client as discussed on the mailing list. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (7): pci.c: fix build for non-SPARC/PPC platforms string.fs: add functions to support ROT13 string encoding/decoding ppc: move fake copyright notice generation into a separate word ppc: use ROT13 encoding for fake copyright message ciface.fs: implement optional (exit) hook when returning control back to the interpreter ppc: add complimentary delete-fake-copyright word ppc: move fake copyright hooks from adler32 word openbios-devel/arch/ppc/qemu/init.c | 3 +++ openbios-devel/arch/ppc/qemu/qemu.fs | 33 +++++++++++++++++++++++++-------- openbios-devel/drivers/pci.c | 9 +++++---- openbios-devel/forth/lib/string.fs | 28 ++++++++++++++++++++++++++++ openbios-devel/forth/system/ciface.fs | 8 ++++++++ 5 files changed, 69 insertions(+), 12 deletions(-) -- 1.7.10.4

6 23

[commit] r1379 - trunk/openbios-devel/drivers
by repository service 13 Feb '16

13 Feb '16

Author: mcayland Date: Sat Feb 13 14:34:31 2016 New Revision: 1379 URL: http://tracker.coreboot.org/trac/openbios/changeset/1379 Log: pci.c: fix build for non-SPARC/PPC platforms Commit r1377 accidentally broke compilation with -Werror for platforms without a default PCI interrupt implementation. Supply a suitable (empty) stub in order to keep the compiler quiet. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Wed Feb 3 21:46:31 2016 (r1378) +++ trunk/openbios-devel/drivers/pci.c Sat Feb 13 14:34:31 2016 (r1379) @@ -1500,19 +1500,20 @@ /* Device address is in 1st 32-bit word of encoded PCI address for config space */ if ((addr & PCI_RANGE_TYPE_MASK) == PCI_RANGE_CONFIG) { -#ifdef CONFIG_SPARC64 +#if defined(CONFIG_SPARC64) ncells += pci_encode_phys_addr(props + ncells, 0, 0, addr, 0, 0); props[ncells++] = intno; props[ncells++] = dnode; props[ncells++] = SUN4U_INTERRUPT(addr, intno); -#endif - -#ifdef CONFIG_PPC +#elif defined(CONFIG_PPC) ncells += pci_encode_phys_addr(props + ncells, 0, 0, addr, 0, 0); props[ncells++] = intno; props[ncells++] = dnode; props[ncells++] = arch->irqs[intno - 1]; props[ncells++] = 3; +#else + /* Keep compiler quiet */ + dnode = dnode; #endif } }

1 0

[PATCH] drivers/escc.c: Add slot-names property ch-a node under escc
by Programmingkid 12 Feb '16

12 Feb '16

Mac OS X's AppleSCCSerial kernel extension requires the slot-names property in order to use any serial ports. This patch adds the property. After this patch is applied, the next thing that stops Mac OS X from using the serial port is something having to do with DMA. http://www.opensource.apple.com/source/AppleSCCSerial/AppleSCCSerial-126.4.… In this file the setPortName() function is what does the searching for slot-names. Index: drivers/escc.c =================================================================== --- drivers/escc.c (revision 1378) +++ drivers/escc.c (working copy) @@ -456,6 +456,11 @@ NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 3 * sizeof(cell))); + /* The four numbers in front of Modem are needed for AppleSCCSerial + kernel extension compatibility. */ + char *names = "0001Modem"; + NEWWORLD(set_property(dnode, "slot-names", names, strlen(names) + 1)); + device_end(); if (legacy) {

6 20

[PATCH v2] drivers/escc.c: Add slot-names property to ch-a and ch-b nodes under escc node
by Programmingkid 11 Feb '16

11 Feb '16

subject: [PATCH v2] drivers/escc.c: Add slot-names property ch-a node under escc The escc node's ch-a node needs a slot-names property in order to satisfy the Mac OS X driver's requirements. This patch adds the slot-names property to the escc/ch-a node. The ch-b node will have a slot-names property set to 0. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Changes from last patch: Replaced C code with Forth code. Replaced 0001 string with integer 1 value. Have the ch-b node's property set to just 0 to mirror what real hardware would have. Notes: It does look like Mac OS 9 needs a working ESCC in order to run. For an experiment I set the ch-a node's slot-names property to 0 just see what would happen. Mac OS 9 crashed at the same place as usual. Index: drivers/escc.c =================================================================== --- drivers/escc.c (revision 1378) +++ drivers/escc.c (working copy) @@ -456,6 +456,22 @@ NEWWORLD(set_property(dnode, "interrupts", (char *)&props, 3 * sizeof(cell))); + if(strcmp(node, "a") == 0) { /* ch-a */ + /* Setup the slot-names property - used by Mac OS */ + fword("1"); /* Bitmask of available slots */ + fword("encode-int"); + push_str("Modem"); /* One name is given to each available slot */ + fword("encode-string"); + fword("encode+"); + push_str("slot-names"); + fword("property"); + } else { /* ch-b */ + fword("0"); /* Bitmask of available slots */ + fword("encode-int"); + push_str("slot-names"); + fword("property"); + } + device_end(); if (legacy) {

1 0

Re: [OpenBIOS] [PATCH] ppc: fix ESCC reg properties
by Howard Spoelstra 08 Feb '16

08 Feb '16

Those are tty.serial and tty.printer

2 1

advice/help on OF device nodes?
by Alyssa Milburn 07 Feb '16

07 Feb '16

Hi, I wanted to do the below (based on the nvram code in the same file), but it doesn't work (I always get zero). Can anyone explain what I'm doing wrong? (This isn't a suggested fix/patch, I'm just wondering what I'm missing.) - Alyssa @@ -162,6 +162,7 @@ macio_nvram_get(char *buf) static void openpic_init(const char *path, phys_addr_t addr) { + phandle_t chosen; phandle_t dnode; int props[2]; char buf[128]; @@ -186,6 +187,11 @@ openpic_init(const char *path, phys_addr_t addr) set_int_property(dnode, "clock-frequency", 4166666); fword("finish-device"); + + chosen = find_dev("/chosen"); + push_str(buf); + fword("open-dev"); + set_int_property(chosen, "interrupt-controller", POP()); } DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io");

3 3

patch to allow Mac OS 9 to boot
by Programmingkid 06 Feb '16

06 Feb '16

http://www.openfirmware.info/pipermail/openbios/2015-June/008722.html diff --git a/openbios-devel/forth/bootstrap/interpreter.fs b/openbios-devel/forth/bootstrap/interpreter.fs index 5187058..74a109f 100644 --- a/openbios-devel/forth/bootstrap/interpreter.fs +++ b/openbios-devel/forth/bootstrap/interpreter.fs @@ -163,7 +163,7 @@ defer outer-interpreter : evaluate ( str len -- ?? ) 2dup + -rot over + over do - i c@ 0a = if + i c@ dup 0a = swap 0d = or if i over - This is most of the patch that is needed to make OpenBIOS successfully boot Mac OS 9. From the bootstrap.fs file, the 0a means linefeed. The file also says the 0d means carret '^'? If this patch is to look for linefeeds and carriage returns, why use the carret character here? This is a solution I came up with to fix incompatibility with other operating systems and still be able to boot Mac OS 9. The adler32 word is only used on Mac OS 9, so what if it sets a flag variable to indicate Mac OS 9 is being used. Then OpenBIOS uses that flag to determine which line of code should be used. Here is the pseudo-code: In adler32.... set using_mac_os_9 = true In the evaluate word: if (using_mac_os_9 == true) { i c@ dup 0a = swap 0d = or if } else { i c@ 0a = if } Does this sound good?

4 15

[PATCH] add copyright message to root node at startup
by Programmingkid 06 Feb '16

06 Feb '16

Mac OS 9 and earlier require that OpenBIOS has Apple's copyright message in the root node, under the copyright property. This patch adds that message. This patch also removes the code from the adler32 word that did the same thing. Operating systems might need to read the copyright message before the adler32 word is called. So this patch takes care of that problem by supplying the copyright message at startup. This makes the copyright adding code in the adler32 word obsolete. Only the Macintosh emulator will have this message added to the root node. Other machines such as PREP don't run Apple's software so the copyright message will not be added to them. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: arch/ppc/qemu/init.c =================================================================== --- arch/ppc/qemu/init.c (revision 1378) +++ arch/ppc/qemu/init.c (working copy) @@ -739,6 +739,32 @@ RET(s2 << 16 | s1); } +/* Encodes and decodes a string */ +static void string_encoder (unsigned char *string, int length) { + const int encoder = 1; + int i; + for (i = 0; i < length; i++) { + string[i] ^= encoder; + } +} + +/* + * Adds the copyright string to the root node. + * Classic Mac OS requires it to boot. + */ +static void add_copyright() +{ + const int size_of_string = 60; + unsigned char message[size_of_string + 1]; + snprintf(message, size_of_string + 1, "%s", "Bnqxshfiu!0892,3110!@qqmd!Bnl" + "qtuds-!Hob/!@mm!Shfiur!Sdrdswde"); + string_encoder(message, size_of_string); + push_str(message); + fword("encode-string"); + push_str("copyright"); + fword("property"); +} + void arch_of_init(void) { @@ -827,10 +853,19 @@ fword("encode-int"); push_str("clock-frequency"); fword("property"); + + /* + * We might figure out how to run the classic Mac OS on the g3beige + * target one day + */ + add_copyright(); + break; case ARCH_MAC99: case ARCH_MAC99_U3: + /* Kept here because PREP isn't made to run Apple's software */ + add_copyright(); case ARCH_PREP: default: Index: arch/ppc/qemu/qemu.fs =================================================================== --- arch/ppc/qemu/qemu.fs (revision 1378) +++ arch/ppc/qemu/qemu.fs (working copy) @@ -99,19 +99,6 @@ \ ------------------------------------------------------------------------- : adler32 ( adler buf len -- checksum ) - \ Since Mac OS 9 is the only system using this word, we take this - \ opportunity to inject a copyright message that is necessary for the - \ system to boot. - " Copyright 1983-2001 Apple Computer, Inc. THIS MESSAGE FOR COMPATIBILITY ONLY" - encode-string " copyright" - " /" find-package if - " set-property" $find if - execute - else - 3drop drop - then - then - ( adler buf len ) " (adler32)" $find if

4 16

[PATCH v2] add copyright message to root node at startup
by Programmingkid 05 Feb '16

05 Feb '16

Mac OS 9 and earlier require that OpenBIOS has Apple's copyright message in the root node, under the copyright property. This patch adds that message. This patch also removes the code from the adler32 word that did the same thing. Operating systems might need to read the copyright message before the adler32 word is called. So this patch takes care of that problem by supplying the copyright message at startup. This makes the copyright adding code in the adler32 word obsolete. Only the Macintosh emulator will have this message added to the root node. Other machines such as PREP don't run Apple's software so the copyright message will not be added to them. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Changes from version 1: Removed the add_copyright() message from the ARCH_HEATHROW target because the real life version of this machine doesn't have the copyright message. Index: arch/ppc/qemu/init.c =================================================================== --- arch/ppc/qemu/init.c (revision 1378) +++ arch/ppc/qemu/init.c (working copy) @@ -739,6 +739,32 @@ RET(s2 << 16 | s1); } +/* Encodes and decodes a string */ +static void string_encoder (unsigned char *string, int length) { + const int encoder = 1; + int i; + for (i = 0; i < length; i++) { + string[i] ^= encoder; + } +} + +/* + * Adds the copyright string to the root node. + * Classic Mac OS requires it to boot. + */ +static void add_copyright() +{ + const int size_of_string = 60; + unsigned char message[size_of_string + 1]; + snprintf(message, size_of_string + 1, "%s", "Bnqxshfiu!0892,3110!@qqmd!Bnl" + "qtuds-!Hob/!@mm!Shfiur!Sdrdswde"); + string_encoder(message, size_of_string); + push_str(message); + fword("encode-string"); + push_str("copyright"); + fword("property"); +} + void arch_of_init(void) { @@ -831,6 +857,8 @@ case ARCH_MAC99: case ARCH_MAC99_U3: + /* Kept here because PREP isn't made to run Macintosh software */ + add_copyright(); case ARCH_PREP: default: Index: arch/ppc/qemu/qemu.fs =================================================================== --- arch/ppc/qemu/qemu.fs (revision 1378) +++ arch/ppc/qemu/qemu.fs (working copy) @@ -99,19 +99,6 @@ \ ------------------------------------------------------------------------- : adler32 ( adler buf len -- checksum ) - \ Since Mac OS 9 is the only system using this word, we take this - \ opportunity to inject a copyright message that is necessary for the - \ system to boot. - " Copyright 1983-2001 Apple Computer, Inc. THIS MESSAGE FOR COMPATIBILITY ONLY" - encode-string " copyright" - " /" find-package if - " set-property" $find if - execute - else - 3drop drop - then - then - ( adler buf len ) " (adler32)" $find if

1 0

[PATCH] ppc: [HACK] add some RTAS properties to make Mac OS 8.5 try to boot
by Alyssa Milburn 04 Feb '16

04 Feb '16

Just for entertainment value; with this applied, 8.5 will successfully get all the way to beyond quiesce(). I didn't think about whether this actually makes any sense at all (presumably not), beware. --- arch/ppc/qemu/init.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 2b5b8e1..667eb6a 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -912,6 +912,20 @@ arch_of_init(void) size *= 2; set_property(ph, "rtas-size", (char*)&size, sizeof(size)); set_int_property(ph, "rtas-version", is_apple() ? 0x41 : 1); + set_int_property(ph, "restart-rtas", 0xabcdef01); + set_int_property(ph, "nvram-fetch", 0xabcdef02); + set_int_property(ph, "nvram-store", 0xabcdef03); + set_int_property(ph, "get-time-of-day", 0xabcdef04); + set_int_property(ph, "set-time-of-day", 0xabcdef05); + set_int_property(ph, "set-time-for-power-on", 0xabcdef06); + set_int_property(ph, "event-scan", 0xabcdef07); + set_int_property(ph, "check-exception", 0xabcdef08); + set_int_property(ph, "read-pci-config", 0xabcdef09); + set_int_property(ph, "write-pci-config", 0xabcdef0a); + set_int_property(ph, "set-indicator", 0xabcdef0c); + set_int_property(ph, "power-off", 0xabcdef12); + set_int_property(ph, "system-reboot", 0xabcdef15); + set_int_property(ph, "get-time-for-power-on", 0xabcdef1e); } break; } -- 2.5.3

2 4

Re: [OpenBIOS] [PATCH] ppc: fix ESCC reg properties
by Alyssa Milburn 03 Feb '16

03 Feb '16

Hey, Great that this fixes stuff! The attached (qemu) patch might also be of interest(?) although I didn't submit it because the ports are all unimplemented and it looks like they aren't used by anything. And I'm not sure what to do about the inconsistent ports thing (my PowerMac1,1 provides different values in OF for the low regs) so I sort of gave up on this angle which I guess was a mistake. :) - Alyssa

2 1

[commit] r1378 - trunk/openbios-devel/config/scripts
by repository service 03 Feb '16

03 Feb '16

Author: mcayland Date: Wed Feb 3 21:46:31 2016 New Revision: 1378 URL: http://tracker.coreboot.org/trac/openbios/changeset/1378 Log: ppc: force target cpu With gcc-5.2 default target is power7. - For 32-bit PPC builds set the target cpu to 604 in order to support PReP as well as Macs in the future. - For 64-bit PPC builds set the target cpu to 970 as used in 64-bit Macs but disable altivec. Based on an original patch by Laurent Vivier <laurent(a)vivier.eu>. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Fri Jan 8 13:09:48 2016 (r1377) +++ trunk/openbios-devel/config/scripts/switch-arch Wed Feb 3 21:46:31 2016 (r1378) @@ -265,7 +265,8 @@ ppc) select_prefix powerpc powerpc64 if [ "$unix" = "no" ]; then - CFLAGS="-m32 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" + # 604 cpu includes support for PReP as well as Mac + CFLAGS="-m32 -mcpu=604 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" AS_FLAGS="-m32" else CFLAGS="-fno-builtin" @@ -275,7 +276,9 @@ ppc64) select_prefix powerpc64 - CFLAGS="-Wa,-a64 -m64 -msoft-float -fno-builtin" + + # 970 cpu is used in all 64-bit Macs but disable altivec + CFLAGS="-mcpu=970 -mno-altivec -Wa,-a64 -m64 -msoft-float -fno-builtin" AS_FLAGS="-Wa,-a64" ;;

1 0

[PATCH] ppc: force target CPU
by Laurent Vivier 02 Feb '16

02 Feb '16

With gcc-5.2 default target is power7. As openbios targets PowerMacs G3/G4/G5, force gcc target to be G3 (32bit) or G5 (64bit). Signed-off-by: Laurent Vivier <laurent(a)vivier.eu> --- config/scripts/switch-arch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/scripts/switch-arch b/config/scripts/switch-arch index 38d263d..bcf807a 100755 --- a/config/scripts/switch-arch +++ b/config/scripts/switch-arch @@ -265,7 +265,7 @@ for ARCH in $arch_list; do ppc) select_prefix powerpc powerpc64 if [ "$unix" = "no" ]; then - CFLAGS="-m32 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" + CFLAGS="-m32 -mcpu=G3 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" AS_FLAGS="-m32" else CFLAGS="-fno-builtin" @@ -275,7 +275,7 @@ for ARCH in $arch_list; do ppc64) select_prefix powerpc64 - CFLAGS="-Wa,-a64 -m64 -msoft-float -fno-builtin" + CFLAGS="-Wa,-a64 -m64 -mcpu=G5 -msoft-float -fno-builtin" AS_FLAGS="-Wa,-a64" ;; -- 2.5.0

8 35

[PATCH] ppc: force target cpu
by Mark Cave-Ayland 02 Feb '16

02 Feb '16

With gcc-5.2 default target is power7. - For 32-bit PPC builds set the target cpu to 604 in order to support PReP as well as Macs in the future. - For 64-bit PPC builds set the target cpu to 970 as used in 64-bit Macs but disable altivec. Based on an original patch by Laurent Vivier <laurent(a)vivier.eu>. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/config/scripts/switch-arch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/openbios-devel/config/scripts/switch-arch b/openbios-devel/config/scripts/switch-arch index 38d263d..ab3b4ce 100755 --- a/openbios-devel/config/scripts/switch-arch +++ b/openbios-devel/config/scripts/switch-arch @@ -265,7 +265,8 @@ for ARCH in $arch_list; do ppc) select_prefix powerpc powerpc64 if [ "$unix" = "no" ]; then - CFLAGS="-m32 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" + # 604 cpu includes support for PReP as well as Mac + CFLAGS="-m32 -mcpu=604 -msoft-float -fno-builtin-bcopy -fno-builtin-log2" AS_FLAGS="-m32" else CFLAGS="-fno-builtin" @@ -275,7 +276,9 @@ for ARCH in $arch_list; do ppc64) select_prefix powerpc64 - CFLAGS="-Wa,-a64 -m64 -msoft-float -fno-builtin" + + # 970 cpu is used in all 64-bit Macs but disable altivec + CFLAGS="-mcpu=970 -mno-altivec -Wa,-a64 -m64 -msoft-float -fno-builtin" AS_FLAGS="-Wa,-a64" ;; -- 1.7.10.4

1 0

Re: [OpenBIOS] [PATCH 1/1] [FCODE-utils] Allow overriding more Makefile vars
by Mark Cave-Ayland 21 Jan '16

21 Jan '16

On 21/01/16 14:12, Peter Lemenkov wrote: > Hello All! > Sorry for the delayed answer. > > 2016-01-18 14:53 GMT+01:00 Segher Boessenkool <segher(a)kernel.crashing.org>: > >> Why not? Manual says to do just this; and I tested it just now to make >> sure I am not imagining things, and it works fine. So what is unusual >> in your setup? > > I accidentally confused you - everything works fine if I pass > variables like you suggested. But I'd like to add possibility to > override variables using envronment variables. > > This is exactly how various Linux distros' buildsystems are working. > So being able to setup variables system-wide would be helpful! If you're trying to override DESTDIR then you'd already need something that executes "make DESTDIR=/path/to/destdir" so if this works as Segher suggests then can you not do "make DESTDIR=$DESTDIR" or similar? ATB, Mark.

1 0

Re: [OpenBIOS] [PATCH 1/1] [FCODE-utils] Allow overriding more Makefile vars
by Segher Boessenkool 21 Jan '16

21 Jan '16

On Mon, Jan 18, 2016 at 01:38:04PM +0100, Peter Lemenkov wrote: > >> > But why do you need it? Why doesn't e.g. > >> > > >> > make DESTDIR=/opt/bla > >> > > >> > work for you as-is? Or do you need those vars to be passed in via the > >> > environment? > >> > >> Unfortunately this DESTDIR trick won't work. Explicitly stated > >> variables from the Makefile itself have preference over the > >> environment variables unless they stated with "?=". At least this is > >> how GNU make works. > > > > But this is *not* an environment variable! > > Yes, sorry. Anyway we can't override Makefile-variables that way > unless we allow it. Why not? Manual says to do just this; and I tested it just now to make sure I am not imagining things, and it works fine. So what is unusual in your setup? Segher

2 1

Re: [OpenBIOS] [PATCH 1/1] [FCODE-utils] Allow overriding more Makefile vars
by Segher Boessenkool 18 Jan '16

18 Jan '16

On Mon, Jan 18, 2016 at 11:04:34AM +0100, Peter Lemenkov wrote: > Hello All! > > 2016-01-18 7:50 GMT+01:00 Segher Boessenkool <segher(a)kernel.crashing.org>: > > > It probably works fine. "?=" can be problematic with e.g. recursive > > makefiles, but you don't have those here. > > Also it's already used within the Makefiles to override C-compiler, so > my patch won't change the current situation. > > > But why do you need it? Why doesn't e.g. > > > > make DESTDIR=/opt/bla > > > > work for you as-is? Or do you need those vars to be passed in via the > > environment? > > Unfortunately this DESTDIR trick won't work. Explicitly stated > variables from the Makefile itself have preference over the > environment variables unless they stated with "?=". At least this is > how GNU make works. But this is *not* an environment variable! Segher

2 1

[PATCH 1/1] [FCODE-utils] Allow overriding more Makefile vars
by Peter Lemenkov 18 Jan '16

18 Jan '16

As a package maintainer I'd like to override some more Makefile variables. Namely: * DESTDIR * strip command invokation (ability to suppress it by passing /bin/true instead of /bin/strip) * pass custom gcc flags This patch allows this. It does not break any existing workflows where it's not required to change these variables. Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com> --- detok/Makefile | 6 +++--- romheaders/Makefile | 6 +++--- toke/Makefile | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/detok/Makefile b/detok/Makefile index 3ba6c30..0e422fb 100644 --- a/detok/Makefile +++ b/detok/Makefile @@ -24,13 +24,13 @@ PROGRAM = detok -DESTDIR = /usr/local +DESTDIR ?= /usr/local CC ?= gcc -STRIP = strip +STRIP ?= strip INCLUDES = -I../shared # Normal Flags: -CFLAGS = -O2 -Wall #-Wextra +CFLAGS ?= -O2 -Wall #-Wextra LDFLAGS = # Coverage: diff --git a/romheaders/Makefile b/romheaders/Makefile index a216e7b..1831036 100644 --- a/romheaders/Makefile +++ b/romheaders/Makefile @@ -24,10 +24,10 @@ PROGRAM = romheaders -DESTDIR = /usr/local +DESTDIR ?= /usr/local CC ?= gcc -STRIP = strip -CFLAGS = -O2 -Wall -Wextra +STRIP ?= strip +CFLAGS ?= -O2 -Wall -Wextra INCLUDES = -I../shared SOURCES = romheaders.c ../shared/classcodes.c diff --git a/toke/Makefile b/toke/Makefile index aa75acd..8e31abd 100644 --- a/toke/Makefile +++ b/toke/Makefile @@ -24,13 +24,13 @@ PROGRAM = toke -DESTDIR = /usr/local +DESTDIR ?= /usr/local CC ?= gcc -STRIP = strip +STRIP ?= strip INCLUDES = -I../shared # Normal flags -CFLAGS = -O2 -Wall #-Wextra +CFLAGS ?= -O2 -Wall #-Wextra LDFLAGS = # Coverage: -- 2.5.0

3 3

Progress on Sparc64?
by Nick Couchman 17 Jan '16

17 Jan '16

Wondering if there have been any recent developments getting OpenBIOS + Qemu working for the Sparc64 platform? I have a couple of legacy applications that require 64-bit Sparc support that would nice to have running on here. Anything I can do to help debug issues? I have ISOs for 64-bit Solaris 8, 9, 10, and 11, and am happy to test stuff out. -Nick == This e-mail may contain SEAKR Engineering (SEAKR) Confidential and Proprietary Information. If this message is not intended for you, you are strictly prohibited from using this message, its contents or attachments in any way. If you have received this message in error, please delete the message from your mailbox. This e-mail may contain export-controlled material and should be handled accordingly.

2 2

Re: [OpenBIOS] Progress on Sparc64?
by Nick Couchman 17 Jan '16

17 Jan '16

----- Original Message ----- > From: "Programmingkid" <teammember0x01(a)gmail.com> > To: "Nick E Couchman" <nick.couchman(a)seakr.com> > Cc: openbios(a)openbios.org > Sent: Friday, January 15, 2016 10:46:57 PM > Subject: Re: [OpenBIOS] Progress on Sparc64? > On Jan 16, 2016, at 12:32 AM, Nick Couchman wrote: > >> Wondering if there have been any recent developments getting OpenBIOS + Qemu >> working for the Sparc64 platform? I have a couple of legacy applications that >> require 64-bit Sparc support that would nice to have running on here. Anything >> I can do to help debug issues? I have ISOs for 64-bit Solaris 8, 9, 10, and >> 11, and am happy to test stuff out. >> >> -Nick > > http://wiki.qemu.org/SPARC > This page has a table that would benefit from your testing data. I only saw > Solaris 1 and 8 on it. We would welcome Solaris 9, 10, and 11 to the table. Okay. Any chance you have a Wiki account and can you create an account for me so that I can edit the page? Below are some of the results that I'm seeing trying to boot various versions of Solaris on the qemu-system-sparc64 platform. Let me know if there is other debugging info that would be useful - different qemu switches, gdb output, and/or Solaris boot parameters. ==Solaris 8 64-bit on Sparc64== [root@qemu ~]# !68 /opt/qemu/bin/qemu-system-sparc64 -nographic -cdrom /root/sol-8-hw4-install-sparc.iso -boot d -m 2048M OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.1 built on Oct 27 2015 23:43 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 5936 bytes entry point is 0x4000 open isn't unique. Jumping to entry point 0000000000100000 for type 0000000000000001... switching to new context: entry point 0x100000 stack 0x00000000ffe8aa09 warning:interpret: exception -13 caught interpret warning @ warning off : sync %tl-c %tstate h# 104185c0 x! %g1 h# 104185c8 x! %g2 h# 104185d0 x! %g3 h# 104185d8 x! %g4 h# 104185e0 x! %g5 h# 104185e8 x! %g6 h# 104185f0 x! %g7 h# 104185f8 x! %o0 h# 10418600 x! %o1 h# 10418608 x! %o2 h# 10418610 x! %o3 h# 10418618 x! %o4 h# 10418620 x! %o5 h# 10418628 x! %o6 h# 10418630 x! %o7 h# 10418638 x! %tl-c %tpc h# 10418640 x! %tl-c %tnpc h# 10418648 x! %y h# 10418650 l! %tl-c %tt h# 104185b8 x! sync ; warning ! failed with error ffffffffffffffed SunOS Release 5.8 Version Generic_108528-29 64-bit Copyright 1983-2003 Sun Microsystems, Inc. All rights reserved. spacex@:interpret: exception -13 caught interpret h# d constant MMU_PAGESHIFT h# 0 constant TTE8K h# 20 constant SFHME_SIZE h# 0 constant SFHME_TTE h# 8 constant HMEBLK_TAG h# 0 constant HMEBLK_NEXT h# 2c constant HMEBLK_MISC h# 38 constant HMEBLK_HME1 h# 8 constant NHMENTS h# 3 constant HBLK_SZMASK h# 10 constant HBLK_RANGE_SHIFT h# 8 constant HMEBP_HBLK h# 20 constant HMEBUCKET_SIZE h# 0 constant HTAG_SFMMUPSZ h# d constant HTAG_REHASHSZ h# 3 constant MAX_HASHCNT h# 7c900000 constant uhme_hash h# 7c800000 constant khme_hash h# 1ffff constant U\ panic[cpu0]/thread=10408000: boot_alloc: pp is NULL or free 00000000104071d0 unix:boot_mapin+7c (2000, 1041b2d0, 300001fa000, 0, 3000020e000, 0) %l0-3: 000003000020c000 ffffffffffffe000 000000001044aef8 0000000000014000 %l4-7: 0000030fffff7f10 0000000000000000 000000001040d970 0000000000007fa3 0000000010407280 unix:boot_alloc+50 (14000, 14000, 1000, 300001fa000, 1000c368, 0) %l0-3: 0000000010026090 0000000010407428 000000001040e000 0000000000000000 %l4-7: 0000000000000016 0000000000000000 0000000000000016 0000000000000000 0000000010407330 unix:segkmem_alloc+30 (300001fa000, 14000, 0, 0, 10451c98, 1044b300) %l0-3: 0000030fffff4268 00000300001ae390 0000000000000000 000000001044bdc0 %l4-7: 000000001044af18 000000001044aef8 0000000010452498 0000000000000000 00000000104073f0 genunix:vmem_xalloc+3e4 (10451670, 10451a78, ffffffffffffffff, ffffffffffffffff, 0, 0) %l0-3: 000000001004a3b4 ffffffffffffe000 0000000010451670 0000000000014000 %l4-7: 0000000000000000 0000000000000000 0000000000014000 0000000010451690 0000000010407520 genunix:vmem_alloc+34 (10451670, 14000, 0, 10438978, 1041c6a8, 4e0) %l0-3: 0000000010438970 00000300000f7778 0000000000000000 0000000000000001 %l4-7: 0000000000000001 0000000010438978 000000000000001a 0000000000000001 00000000104075e0 genunix:kmem_alloc+b4 (14000, 0, 14000, 1, f0, 0) %l0-3: 00000300000f7a00 ffffffffffffffc0 000000001044f8e0 00000000000003c0 %l4-7: 0000030fffff7378 0000000000000000 0000000000000016 00000000104075f3 0000000010407690 genunix:kmem_zalloc+a0 (14000, 0, 104542c8, 0, 0, 300000f7680) %l0-3: 000000001043a0b0 0000000000000028 00000300000f7a00 0000000000000008 %l4-7: ffffffffffffffff 0000000000000001 0000000000000000 0000000000000000 0000000010407740 genunix:impl_ddi_callback_init+98 (0, 1003f354, 0, 0, 0, 10407897) %l0-3: 0000000010444c00 0000000010419400 0000000000000000 0000000000000001 %l4-7: 0000000000000001 0000000010439720 0000000000000002 0000000000000001 0000000010407810 unix:setup_ddi+24 (0, 10424c50, 1041b2c8, 0, 0, 10407897) %l0-3: 0000000010114380 000000001013c798 000000007c900000 0000000000012000 %l4-7: 00000000000000b0 0000000010413c48 000000001040d970 0000000000007fa3 00000000104078c0 unix:startup_modules+1e8 (1040e000, 10414ab8, 30000000000, 10418668, 2000, 30000016000) %l0-3: 0000000000000103 0000000010423c00 0000000000000020 0000031002c00000 %l4-7: 0000000010418400 000000001041d000 000000001041c000 000000001041b000 0000000010407970 unix:startup+14 (10428c00, 0, 0, 1, 0, ffffffffffffffff) %l0-3: 0000000010026090 000000000000d925 0000000000000afd 0000000000000000 %l4-7: 0000000010472880 00000000002f0c43 00000000000beafd 0000000000000afd 0000000010407a20 genunix:main+4 (1040d400, 2000, 10407ec0, 10408030, fff2, 10052a0c) %l0-3: 0000000010408000 0000000000000001 0000000000000015 0000000000000f36 %l4-7: 0000000010429618 0000000010472880 00000000000d7438 0000000000000540 skipping system dump - no dump device configured rebooting... BOOTpanic - kernel: prom_reboot: reboot call returned! EXIT 0 > == End Solaris 8 64-bit == == Solaris 9 on Sparc64 == [root@qemu ~]# /opt/qemu/bin/qemu-system-sparc64 -nographic -cdrom /root/sol-9-905hw-ga-sparc-dvd.iso -boot d -m 2048M OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.1 built on Oct 27 2015 23:43 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 5936 bytes entry point is 0x4000 open isn't unique. Jumping to entry point 0000000000100000 for type 0000000000000001... switching to new context: entry point 0x100000 stack 0x00000000ffe8aa09 warning:interpret: exception -13 caught interpret warning @ warning off : sync %tl-c %tstate h# 1418608 x! %g1 h# 1418610 x! %g2 h# 1418618 x! %g3 h# 1418620 x! %g4 h# 1418628 x! %g5 h# 1418630 x! %g6 h# 1418638 x! %g7 h# 1418640 x! %o0 h# 1418648 x! %o1 h# 1418650 x! %o2 h# 1418658 x! %o3 h# 1418660 x! %o4 h# 1418668 x! %o5 h# 1418670 x! %o6 h# 1418678 x! %o7 h# 1418680 x! %tl-c %tpc h# 1418688 x! %tl-c %tnpc h# 1418690 x! %y h# 1418698 l! %tl-c %tt h# 1418600 x! sync ; warning ! failed with error ffffffffffffffed SunOS Release 5.9 Version Generic_118558-34 64-bit Copyright 1983-2003 Sun Microsystems, Inc. All rights reserved. Use is subject to license terms. - panic[cpu0]/thread=140a000: boot_alloc: pp is NULL or free 0000000001409120 unix:boot_mapin+80 (30000146000, 82000, 82000, 1000, 0, 30000004020) %l0-3: 00000300001c6000 00000300001c8000 0000000000000000 000000000142b4f8 %l4-7: 0000000000002000 0000000000000000 ffffffffffffffff ffffffffffffffff 00000000014091d0 unix:boot_alloc+4c (30000146000, 82000, 1000, 1422aa8, 0, 0) %l0-3: 0000000000000002 0000000000082000 000000000146bc00 0000000000081fff %l4-7: 0000030000004020 0000000000000000 ffffffffffffffff ffffffffffffffff 0000000001409280 unix:segkmem_alloc+8c (30000004000, 82000, 0, 0, 0, 0) %l0-3: 0000030000146000 0000000000082000 000000000146bc00 0000000001479360 %l4-7: 000003000003d7d8 0000000000000000 000000000116d398 00000000014229a8 0000000001409340 genunix:vmem_xalloc+4cc (ffffffffffffe000, 300000062d0, 0, 0, 0, 30000006020) %l0-3: 0000000000000004 000000000104fa18 0000030000006000 0000000000000000 %l4-7: 0000000000080008 0000000000000000 ffffffffffffffff ffffffffffffffff 0000000001409470 genunix:vmem_alloc+1f4 (30000006000, 80008, 0, 1422a1e, 144dcfb, 1422a00) %l0-3: 0000000000000000 0000000001422778 0000000000000008 0000000000080007 %l4-7: 0000030000006020 0000000000002000 000000000116d398 0000000000000000 0000000001409530 genunix:kmem_alloc+f0 (80008, 0, 20, 1a, 4e0, 1) %l0-3: 0000030000087640 000000000144f800 0000000000000000 0000030000087640 %l4-7: 000000000140d800 0000000001429ae0 0000000001429ab8 000000000144dcf0 00000000014095e0 genunix:kmem_zalloc+e4 (80008, 0, 4, a, 0, 0) %l0-3: 000000000144f8e0 0000030000087448 000000000140d800 ffffffffffffffff %l4-7: 0000000000000001 0000030000087640 0000000000000000 000000000144dcb8 0000000001409690 genunix:init_actions+38 (0, ffffffffffffffff, 5c, 0, 100c7e4, 0) %l0-3: 000000000144f400 0000000001444000 000000000144f6c8 0000000000000000 %l4-7: 0000000000000000 ffffffffffffffff 0000000000000001 0000030000066198 0000000001409760 genunix:ipp_init+c (100, 149d9e8, 1000, 12020, 78004000, 30000084db0) %l0-3: 000000000116cad4 000000000144d810 000000000149d048 00000000014439e8 %l4-7: 0000000000000001 0000000000000018 00000000014439f8 000000000149d000 0000000001409810 genunix:mod_setup+f4 (0, 1413240, 0, 78004000, 100, 78004000) %l0-3: 0000000000000000 0000000001497c00 0000000001495800 000000000000fc00 %l4-7: 0000000001077800 0000000078004000 000000007801601f ffffffffffffffff 00000000014098c0 unix:startup_modules+78 (12000, 142b000, 30000018000, 103, 78004000, 1432000) %l0-3: 0000000000000103 0000000000000000 000000000140c000 00000000014186b0 %l4-7: 00000000014186c0 0000000078004000 0000000000002000 0000000000012020 0000000001409970 unix:startup+1c (1, 0, 0, 142e6b8, 1400000, 0) %l0-3: 0000000000000001 0000000000000000 00000000babecafe 0000000000000000 %l4-7: 000000000142c000 000000000140e000 0000000001416208 0000000001439ca8 0000000001409a20 genunix:main+4 (1409ba0, ffd0cbb0, 1409ec0, 383cbf, 2000, 500) %l0-3: 000000000140b400 000000000140a000 0000000001413020 0000000000000000 %l4-7: 0000000078002000 000000000038c000 00000000014a0198 0000000001067d98 skipping system dump - no dump device configured rebooting... BOOTpanic - kernel: prom_reboot: reboot call returned! EXIT 0 > == End Solaris 9 on Sparc64 == == Solaris 10 on Sparc64 == [root@qemu ~]# /opt/qemu/bin/qemu-system-sparc64 -nographic -cdrom /root/sol-10-u11-ga-sparc-dvd.iso -boot d -m 2048M -cpu "Sun UltraSparc IIIi" OpenBIOS for Sparc64 Configuration device id QEMU version 1 machine id 0 kernel cmdline CPUs: 1 x SUNW,UltraSPARC-IIIi UUID: 00000000-0000-0000-0000-000000000000 Welcome to OpenBIOS v1.1 built on Oct 27 2015 23:43 Type 'help' for detailed information Trying cdrom:f... Not a bootable ELF image Not a bootable a.out image Loading FCode image... Loaded 7420 bytes entry point is 0x4000 == End Solaris 10 on Sparc64 == == This e-mail may contain SEAKR Engineering (SEAKR) Confidential and Proprietary Information. If this message is not intended for you, you are strictly prohibited from using this message, its contents or attachments in any way. If you have received this message in error, please delete the message from your mailbox. This e-mail may contain export-controlled material and should be handled accordingly.

2 1

[commit] r1377 - trunk/openbios-devel/drivers
by repository service 08 Jan '16

08 Jan '16

Author: mcayland Date: Fri Jan 8 13:09:48 2016 New Revision: 1377 URL: http://tracker.coreboot.org/trac/openbios/changeset/1377 Log: pci: don't hard-code PCI interrupt maps by default The current code for openpic interrupts is incorrect for two reasons: firstly it generates an interrupt-map property with 8 IRQ pins (when only 4 are specified and so the last 4 entries are junk), and secondly it hard-codes the entries with a non-standard interrupt-mask to give one entry per pin rather than one entry per PCI device. Switch everything over to use the existing code used by SPARC64 which dynamically enumerates the child nodes and builds up the correct properties on demand. This ensures that everything will work on PCI platforms particularly if extra cards are dynamically plugged into QEMU. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:46 2016 (r1376) +++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:48 2016 (r1377) @@ -1428,9 +1428,11 @@ static void ob_pci_host_set_interrupt_map(phandle_t host) { - phandle_t dnode = 0; - u32 props[128]; - int i; + phandle_t dnode = 0, pci_childnode = 0; + u32 props[128], intno; + int i, ncells, len; + u32 *val, addr; + char *reg; #if defined(CONFIG_PPC) phandle_t target_node; @@ -1474,69 +1476,60 @@ target_node = find_dev("/pci"); set_int_property(target_node, "interrupt-parent", dnode); - - /* openpic interrupt mapping */ - for (i = 0; i < (7*8); i += 7) { - props[i + PCI_INT_MAP_PCI0] = 0; - props[i + PCI_INT_MAP_PCI1] = 0; - props[i + PCI_INT_MAP_PCI2] = 0; - props[i + PCI_INT_MAP_PCI_INT] = (i / 7) + 1; // starts at PINA=1 - props[i + PCI_INT_MAP_PIC_HANDLE] = dnode; - props[i + PCI_INT_MAP_PIC_INT] = arch->irqs[i / 7]; - props[i + PCI_INT_MAP_PIC_POL] = 3; - } - set_property(host, "interrupt-map", (char *)props, 7 * 8 * sizeof(props[0])); - - props[PCI_INT_MAP_PCI0] = 0; - props[PCI_INT_MAP_PCI1] = 0; - props[PCI_INT_MAP_PCI2] = 0; - props[PCI_INT_MAP_PCI_INT] = 0x7; - - set_property(host, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); } -#elif defined(CONFIG_SPARC64) - int ncells, len; - u32 *val, addr; - char *reg; +#else + /* PCI host bridge is the default interrupt controller */ + dnode = host; +#endif /* Set interrupt-map for PCI devices with an interrupt pin present */ ncells = 0; PUSH(host); fword("child"); - dnode = POP(); - while (dnode) { - if (get_int_property(dnode, "interrupts", &len)) { - reg = get_property(dnode, "reg", &len); - if (reg) { + pci_childnode = POP(); + while (pci_childnode) { + intno = get_int_property(pci_childnode, "interrupts", &len); + if (len && intno) { + reg = get_property(pci_childnode, "reg", &len); + if (len && reg) { val = (u32 *)reg; for (i = 0; i < (len / sizeof(u32)); i += 5) { addr = val[i]; /* Device address is in 1st 32-bit word of encoded PCI address for config space */ - if (!(addr & 0x03000000)) { + if ((addr & PCI_RANGE_TYPE_MASK) == PCI_RANGE_CONFIG) { +#ifdef CONFIG_SPARC64 ncells += pci_encode_phys_addr(props + ncells, 0, 0, addr, 0, 0); - props[ncells++] = 1; /* always interrupt pin 1 for QEMU */ - props[ncells++] = host; - props[ncells++] = SUN4U_INTERRUPT(addr, 1); + props[ncells++] = intno; + props[ncells++] = dnode; + props[ncells++] = SUN4U_INTERRUPT(addr, intno); +#endif + +#ifdef CONFIG_PPC + ncells += pci_encode_phys_addr(props + ncells, 0, 0, addr, 0, 0); + props[ncells++] = intno; + props[ncells++] = dnode; + props[ncells++] = arch->irqs[intno - 1]; + props[ncells++] = 3; +#endif } } } } - PUSH(dnode); + PUSH(pci_childnode); fword("peer"); - dnode = POP(); + pci_childnode = POP(); } set_property(host, "interrupt-map", (char *)props, ncells * sizeof(props[0])); props[0] = 0x0000f800; props[1] = 0x0; props[2] = 0x0; - props[3] = 7; + props[3] = 0x7; set_property(host, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); -#endif } int ob_pci_init(void)

1 0

[commit] r1376 - trunk/openbios-devel/drivers
by repository service 08 Jan '16

08 Jan '16

Author: mcayland Date: Fri Jan 8 13:09:46 2016 New Revision: 1376 URL: http://tracker.coreboot.org/trac/openbios/changeset/1376 Log: pci: remove the configuration space range from the PCI host bridge by default While the configuration space range appears in real SPARC device trees, it isn't mentioned in the IEEE-1275 PCI bindings and in fact causes Darwin/OS X to calculate PCI address spaces incorrectly. Disable this range in the PCI host bridge by default, except for SPARC64 where it can evidently still appear. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:44 2016 (r1375) +++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:46 2016 (r1376) @@ -460,13 +460,18 @@ int ncells; ncells = 0; - /* first encode PCI configuration space */ - { - ncells += pci_encode_phys_addr(props + ncells, 0, CONFIGURATION_SPACE, + +#ifdef CONFIG_SPARC64 + /* While configuration space isn't mentioned in the IEEE-1275 PCI + bindings, it appears in the PCI host bridge ranges property in + real device trees. Hence we disable this range for all host + bridges except for SPARC, particularly as it causes Darwin/OS X + to incorrectly calculated PCI memory space ranges on PPC. */ + ncells += pci_encode_phys_addr(props + ncells, 0, CONFIGURATION_SPACE, config->dev, 0, 0); ncells += host_encode_phys_addr(props + ncells, arch->cfg_addr); ncells += pci_encode_size(props + ncells, arch->cfg_len); - } +#endif if (arch->io_base) { ncells += pci_encode_phys_addr(props + ncells, 0, IO_SPACE,

1 0

[commit] r1375 - trunk/openbios-devel/drivers
by repository service 08 Jan '16

08 Jan '16

Author: mcayland Date: Fri Jan 8 13:09:44 2016 New Revision: 1375 URL: http://tracker.coreboot.org/trac/openbios/changeset/1375 Log: pci: enable AAPL,address property for all Apple PPC machines The property appears in device trees for both Old World and New World Macs so let's do the same. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:41 2016 (r1374) +++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:44 2016 (r1375) @@ -1020,7 +1020,10 @@ } pci_set_assigned_addresses(phandle, config, num_bars); - OLDWORLD(pci_set_AAPL_address(config)); + + if (is_apple()) { + pci_set_AAPL_address(config); + } PCI_DPRINTF("\n"); }

1 0

[commit] r1374 - trunk/openbios-devel/drivers
by repository service 08 Jan '16

08 Jan '16

Author: mcayland Date: Fri Jan 8 13:09:41 2016 New Revision: 1374 URL: http://tracker.coreboot.org/trac/openbios/changeset/1374 Log: pci: fix AAPL,address property for IO space mappings According to "Designing PCI Cards and Drivers for Power Macintosh Computers" the AAPL,address property should be an array of virtual addresses representing the bus addresses in the assigned-addresses array. While this works for PCI memory addresses, IO addresses are incorrect because the calculated address is still the PCI bus address. Switch over to using the new space-aware pci_bus_addr_to_host_addr() so that addresses in both memory and IO space are correctly calculated. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:38 2016 (r1373) +++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:41 2016 (r1374) @@ -597,13 +597,18 @@ { phandle_t dev = get_cur_dev(); cell props[7]; - int ncells, i; + uint32_t mask; + int ncells, i, flags, space_code; ncells = 0; for (i = 0; i < 6; i++) { if (!config->assigned[i] || !config->sizes[i]) continue; - props[ncells++] = config->assigned[i] & ~0x0000000F; + pci_decode_pci_addr(config->assigned[i], + &flags, &space_code, &mask); + + props[ncells++] = pci_bus_addr_to_host_addr(space_code, + config->assigned[i] & ~mask); } if (ncells) set_property(dev, "AAPL,address", (char *)props,

1 0

[commit] r1373 - trunk/openbios-devel/drivers
by repository service 08 Jan '16

08 Jan '16

Author: mcayland Date: Fri Jan 8 13:09:38 2016 New Revision: 1373 URL: http://tracker.coreboot.org/trac/openbios/changeset/1373 Log: pci: support PCI spaces other than memory in pci_bus_addr_to_host_addr() Currently only PCI memory space is mapped in ob_pci_map_in(). By adding multi-space support to pci_bus_addr_to_host_addr(), it becomes possible to translate physical addresses for both memory and IO space. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci.h Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:35 2016 (r1372) +++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:38 2016 (r1373) @@ -144,9 +144,16 @@ } #endif -static unsigned long pci_bus_addr_to_host_addr(uint32_t ba) +static unsigned long pci_bus_addr_to_host_addr(int space, uint32_t ba) { - return arch->host_pci_base + (unsigned long)ba; + if (space == IO_SPACE) { + return arch->io_base + (unsigned long)ba; + } else if (space == MEMORY_SPACE_32) { + return arch->host_pci_base + (unsigned long)ba; + } else { + /* Return unaltered to aid debugging property values */ + return (unsigned long)ba; + } } static void @@ -347,16 +354,20 @@ { phys_addr_t phys; uint32_t ba; - ucell size, virt; + ucell size, virt, tmp; + int space; PCI_DPRINTF("ob_pci_bar_map_in idx=%p\n", idx); size = POP(); - POP(); + tmp = POP(); POP(); ba = POP(); - phys = pci_bus_addr_to_host_addr(ba); + /* Get the space from the pci-addr.hi */ + space = ((tmp & PCI_RANGE_TYPE_MASK) >> 24); + + phys = pci_bus_addr_to_host_addr(space, ba); #if defined(CONFIG_OFMEM) ofmem_claim_phys(phys, size, 0); @@ -753,13 +764,19 @@ int vga_config_cb (const pci_config_t *config) { unsigned long rom; - uint32_t rom_size, size; + uint32_t rom_size, size, mask; + int flags, space_code; phandle_t ph; if (config->assigned[0] != 0x00000000) { setup_video(); - rom = pci_bus_addr_to_host_addr(config->assigned[1] & ~0x0000000F); + pci_decode_pci_addr(config->assigned[1], + &flags, &space_code, &mask); + + rom = pci_bus_addr_to_host_addr(space_code, + config->assigned[1] & ~0x0000000F); + rom_size = config->sizes[1]; ph = get_cur_dev(); Modified: trunk/openbios-devel/drivers/pci.h ============================================================================== --- trunk/openbios-devel/drivers/pci.h Fri Jan 8 13:09:35 2016 (r1372) +++ trunk/openbios-devel/drivers/pci.h Fri Jan 8 13:09:38 2016 (r1373) @@ -59,6 +59,15 @@ #define PCI_MIN_GNT 0x3e /* 8 bits */ #define PCI_MAX_LAT 0x3f /* 8 bits */ +#define PCI_RANGE_RELOCATABLE 0x80000000 +#define PCI_RANGE_PREFETCHABLE 0x40000000 +#define PCI_RANGE_ALIASED 0x20000000 +#define PCI_RANGE_TYPE_MASK 0x03000000 +#define PCI_RANGE_MMIO_64BIT 0x03000000 +#define PCI_RANGE_MMIO 0x02000000 +#define PCI_RANGE_IOPORT 0x01000000 +#define PCI_RANGE_CONFIG 0x00000000 + typedef struct { u16 signature; u8 reserved[0x16];

1 0

[commit] r1372 - trunk/openbios-devel/drivers
by repository service 08 Jan '16

08 Jan '16

Author: mcayland Date: Fri Jan 8 13:09:35 2016 New Revision: 1372 URL: http://tracker.coreboot.org/trac/openbios/changeset/1372 Log: pci: switch ob_pci_map_in() to use physical addresses rather than region and size This matches the parameters for the map-in word as defined in the IEEE-1275 PCI bindings and provides extra information about the address space in use to be used later. Even better this allows us to considerably simplify the Forth. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/drivers/pci.fs trunk/openbios-devel/drivers/vga.fs Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Jan 4 13:03:40 2016 (r1371) +++ trunk/openbios-devel/drivers/pci.c Fri Jan 8 13:09:35 2016 (r1372) @@ -340,7 +340,7 @@ ss, dev, fn, buf); } -/* ( pci-addr.lo pci-addr.hi size -- virt ) */ +/* ( pci-addr.lo pci-addr.mid pci-addr.hi size -- virt ) */ static void ob_pci_map_in(int *idx) @@ -353,6 +353,7 @@ size = POP(); POP(); + POP(); ba = POP(); phys = pci_bus_addr_to_host_addr(ba); Modified: trunk/openbios-devel/drivers/pci.fs ============================================================================== --- trunk/openbios-devel/drivers/pci.fs Mon Jan 4 13:03:40 2016 (r1371) +++ trunk/openbios-devel/drivers/pci.fs Fri Jan 8 13:09:35 2016 (r1372) @@ -12,59 +12,19 @@ rot encode-int encode+ ; -\ Get region offset for BAR reg -: pci-bar-offset@ ( bar-reg -- off.lo off.hi -1 | 0 ) - " reg" active-package get-package-property 0= if - begin - decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) - ff and 5 pick = if - >r >r 3drop r> r> - -1 exit - else - 2drop - then - \ Drop the size as we don't need it - decode-int drop decode-int drop - dup 0= - until - 3drop - 0 exit - else - 0 - then - ; - -\ Get region size for BAR reg -: pci-bar-size@ ( bar-reg -- size ) - " reg" active-package get-package-property 0= if - begin - decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) - ff and 5 pick = if - 2drop decode-int drop - decode-int - >r 3drop r> - exit - else - 2drop decode-int drop - decode-int drop - then - dup 0= - until - 3drop - 0 \ default size of 0 if BAR not found - then - ; - -\ Get base address for configured BAR reg -: pci-bar-base@ ( bar-reg -- addr.lo addr.hi -1 | 0 ) +\ Get PCI physical address and size for configured BAR reg +: pci-bar>pci-addr ( bar-reg -- addr.lo addr.mid addr.hi size -1 | 0 ) " assigned-addresses" active-package get-package-property 0= if begin decode-phys \ ( reg prop prop-len phys.lo phys.mid phys.hi ) - ff and 5 pick = if - >r >r 3drop r> r> + dup ff and 6 pick = if + >r >r >r rot drop + decode-int drop decode-int + -rot 2drop + r> swap r> r> rot -1 exit else - 2drop + 3drop then \ Drop the size as we don't need it decode-int drop decode-int drop @@ -77,16 +37,4 @@ then ; -\ Get PCI bus address and size for configured BAR reg -: pci-bar>pci-region ( bar-reg -- addr.lo addr.hi size ) - dup - >r pci-bar-offset@ if - swap r@ pci-bar-base@ if - swap d+ - then - swap r@ pci-bar-size@ - then - r> drop - ; - [THEN] Modified: trunk/openbios-devel/drivers/vga.fs ============================================================================== --- trunk/openbios-devel/drivers/vga.fs Mon Jan 4 13:03:40 2016 (r1371) +++ trunk/openbios-devel/drivers/vga.fs Fri Jan 8 13:09:35 2016 (r1372) @@ -109,16 +109,17 @@ \ PCI \ -" pci-bar>pci-region" (find-xt) value pci-bar>pci-region-xt -: pci-bar>pci-region pci-bar>pci-region-xt execute ; +" pci-bar>pci-addr" (find-xt) value pci-bar>pci-addr-xt +: pci-bar>pci-addr pci-bar>pci-addr-xt execute ; h# 10 constant cfg-bar0 \ Framebuffer BAR -1 value fb-addr : map-fb ( -- ) - cfg-bar0 pci-bar>pci-region \ ( pci-addr.lo pci-addr.hi size ) - " pci-map-in" $call-parent - to fb-addr + cfg-bar0 pci-bar>pci-addr if \ ( pci-addr.lo pci-addr.mid pci-addr.hi size ) + " pci-map-in" $call-parent + to fb-addr + then ; \

1 0

[PATCHv2 0/6] PCI address and property fixes
by Mark Cave-Ayland 05 Jan '16

05 Jan '16

This patchset is a result of work to fix the rtl8139 card under Apple PPC machines in QEMU (both g3beige and mac99). Primarily it fixes up pci_bus_addr_to_host_addr() to support both memory and IO spaces in order to generate a correct AAPL,address property for IO space mappings. As well as this, it removes the configuration space range from the PCI host bridge for all machines except SPARC64 which fixes an issue with Darwin/OS X calculating the wrong address spaces for PCI accesses. As a final tidy-up the last patch in the series is a nice rework which properly generates the PCI node interrupt-map property from the device tree rather than using hardcoded (and incorrect) properties for openpic. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> v2: - Updated cover letter - Remove OLDWORLD() macro typo - Add constants suggested by Alex - Include extra patch to tidy up interrupt-map property Mark Cave-Ayland (6): pci: switch ob_pci_map_in() to use physical addresses rather than region and size pci: support PCI spaces other than memory in pci_bus_addr_to_host_addr() pci: fix AAPL,address property for IO space mappings pci: enable AAPL,address property for all Apple PPC machines pci: remove the configuration space range from the PCI host bridge by default pci: don't hard-code PCI interrupt maps by default openbios-devel/drivers/pci.c | 130 ++++++++++++++++++++++++----------------- openbios-devel/drivers/pci.fs | 68 +++------------------ openbios-devel/drivers/pci.h | 9 +++ openbios-devel/drivers/vga.fs | 11 ++-- 4 files changed, 100 insertions(+), 118 deletions(-) -- 1.7.10.4

3 14

Re: [OpenBIOS] Emaculation bug reports
by Programmingkid 04 Jan '16

04 Jan '16

On Jan 3, 2016, at 2:27 PM, Mark Cave-Ayland wrote: > On 03/01/16 19:01, Programmingkid wrote: > >>>> The rtl8139 did not work on the mac99 target. I didn't see the timeout message. >>>> I did use your rtl8139 patchset fix. >>> >>> I think this might be because we're missing an interrupt mapping as they >>> are currently hard-coded in OpenBIOS. >>> >>> Quick hack alert: take a look at OpenBIOS's drivers/pci.c and in >>> particular ob_pci_host_set_interrupt_map(). See how at the moment we >>> patch in hard-coded interrupt-parent nodes to link each device node to >>> the interrupt controller? Maybe try adding something like the following >>> for the rtl8139 card: >>> >>> target_node = find_dev("/pci/pci10ec,8139"); >>> set_int_property(target_node, "interrupt-parent", dnode); >>> >>> Does that then get the rtl8139 card to work under -M mac99 correctly? >> >> Sorry it doesn't. I paste your code right below the "if (dnode) {". > > Ah well. Thought it was worth a quick shot. I did find out that the driver's init() and start() methods are never called. Using the ioreg command I can see the rtl8139 in the PCI slot. The NIC does work in Linux using the mac99 target. Note: I implemented your second set of patches for the rtl8139 and the booting from cd patchset.

2 2

[PATCH 0/5] PCI address and property fixes
by Mark Cave-Ayland 04 Jan '16

04 Jan '16

This patchset primarily fixes up pci_bus_addr_to_host_addr() to support both memory and IO spaces in order to generate a correct AAPL,address property for IO space mappings. As well as this, it removes the configuration space range from the PCI host bridge for all machines except SPARC64 which fixes an issue with Darwin/OS X calculating the wrong address spaces for PCI accesses. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (5): pci: switch ob_pci_map_in() to use physical addresses rather than region and size pci: support PCI spaces other than memory in pci_bus_addr_to_host_addr() pci: fix AAPL,address property for IO space mappings pci: enable AAPL,address property for all Apple PPC machines pci: remove the configuration space range from the PCI host bridge by default openbios-devel/drivers/pci.c | 56 ++++++++++++++++++++++++--------- openbios-devel/drivers/pci.fs | 68 +++++------------------------------------ openbios-devel/drivers/vga.fs | 11 ++++--- 3 files changed, 56 insertions(+), 79 deletions(-) -- 1.7.10.4

4 21

[commit] r1371 - trunk/openbios-devel/drivers
by repository service 04 Jan '16

04 Jan '16

Author: mcayland Date: Mon Jan 4 13:03:40 2016 New Revision: 1371 URL: http://tracker.coreboot.org/trac/openbios/changeset/1371 Log: macio: switch over to use 2 ata-3 ide controllers This better matches real device trees and fixes Darwin/OS X boot from CDROM under the QEMU mac99 machine (it seems that IOKit will only detect macio IDE devices connected to an ata-3 ide controller rather than the previous ata-4 ide controller). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:37 2016 (r1370) +++ trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:40 2016 (r1371) @@ -1542,10 +1542,10 @@ struct ide_channel *chan; /* IDE ports on Macs are numbered from 3. - * Also see comments in macio.c:openpic_init() */ + * Also see comments in pci.c:ob_pci_host_set_interrupt_map() */ current_channel = 3; - for (i = 0; i < nb_channels; i++, current_channel++) { + for (i = 0; i < nb_channels; i++) { chan = malloc(sizeof(struct ide_channel)); @@ -1651,7 +1651,7 @@ OLDWORLD(set_property(dnode, "AAPL,address", (char *)&props, 2*sizeof(props[0]))); - props[0] = 0; + props[0] = i; set_property(dnode, "AAPL,bus-id", (char*)props, 1 * sizeof(props[0])); IDE_DPRINTF(DEV_NAME": [io ports 0x%lx]\n", Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Mon Jan 4 13:03:37 2016 (r1370) +++ trunk/openbios-devel/drivers/pci.c Mon Jan 4 13:03:40 2016 (r1371) @@ -1430,12 +1430,12 @@ /* On a new world Mac these are not numbered but named by the * ATA version they support. Thus we have: ata-3, ata-3, ata-4 * On g3beige they all called just ide. - * We take ata-3 and ata-4 which seems to work for both - * at least for clients we care about */ - target_node = find_dev("/pci/mac-io/ata-3"); + * We take 2 x ata-3 buses which seems to work for + * at least the clients we care about */ + target_node = find_dev("/pci/mac-io/ata-3@20000"); set_int_property(target_node, "interrupt-parent", dnode); - target_node = find_dev("/pci/mac-io/ata-4"); + target_node = find_dev("/pci/mac-io/ata-3@21000"); set_int_property(target_node, "interrupt-parent", dnode); target_node = find_dev("/pci/mac-io/via-cuda");

1 0

[commit] r1370 - trunk/openbios-devel/drivers
by repository service 04 Jan '16

04 Jan '16

Author: mcayland Date: Mon Jan 4 13:03:37 2016 New Revision: 1370 URL: http://tracker.coreboot.org/trac/openbios/changeset/1370 Log: ide: reference IDE channels by phandle, not device name Otherwise when two device nodes have the same name property we are unable to distinguish between them. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/ide.c trunk/openbios-devel/drivers/ide.h Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:34 2016 (r1369) +++ trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:37 2016 (r1370) @@ -73,13 +73,13 @@ channels = chan; } -static struct ide_channel *ide_seek_channel(const char *name) +static struct ide_channel *ide_seek_channel(phandle_t ph) { struct ide_channel *current; current = channels; while (current) { - if (!strcmp(current->name, name)) + if (current->ph == ph) return current; current = current->next; } @@ -1247,11 +1247,10 @@ static void ob_ide_open(int *idx) { - int ret=1, len; + int ret=1; phandle_t ph; struct ide_drive *drive; struct ide_channel *chan; - char *idename; int unit; fword("my-unit"); @@ -1260,9 +1259,8 @@ fword("my-parent"); fword("ihandle>phandle"); ph=(phandle_t)POP(); - idename=get_property(ph, "name", &len); - chan = ide_seek_channel(idename); + chan = ide_seek_channel(ph); drive = &chan->drives[unit]; *(struct ide_drive **)idx = drive; @@ -1380,9 +1378,6 @@ chan = malloc(sizeof(struct ide_channel)); - snprintf(chan->name, sizeof(chan->name), - DEV_NAME, current_channel); - chan->mmio = 0; for (j = 0; j < 8; j++) @@ -1426,6 +1421,8 @@ current_channel); REGISTER_NAMED_NODE_PHANDLE(ob_ide_ctrl, nodebuff, dnode); + chan->ph = dnode; + #if !defined(CONFIG_PPC) && !defined(CONFIG_SPARC64) props[0]=14; props[1]=0; set_property(dnode, "interrupts", @@ -1552,9 +1549,6 @@ chan = malloc(sizeof(struct ide_channel)); - snprintf(chan->name, sizeof(chan->name), - DEV_NAME, current_channel); - chan->mmio = addr + MACIO_IDE_OFFSET + i * MACIO_IDE_SIZE; chan->obide_inb = macio_ide_inb; @@ -1594,6 +1588,8 @@ current_channel); REGISTER_NAMED_NODE_PHANDLE(ob_ide_ctrl, nodebuff, dnode); + chan->ph = dnode; + set_property(dnode, "compatible", (is_oldworld() ? "heathrow-ata" : "keylargo-ata"), 13); Modified: trunk/openbios-devel/drivers/ide.h ============================================================================== --- trunk/openbios-devel/drivers/ide.h Mon Jan 4 13:03:34 2016 (r1369) +++ trunk/openbios-devel/drivers/ide.h Mon Jan 4 13:03:37 2016 (r1370) @@ -167,7 +167,7 @@ struct ide_channel { - char name[32]; + phandle_t ph; struct ide_channel *next; /*

1 0

[commit] r1369 - trunk/openbios-devel/drivers
by repository service 04 Jan '16

04 Jan '16

Author: mcayland Date: Mon Jan 4 13:03:34 2016 New Revision: 1369 URL: http://tracker.coreboot.org/trac/openbios/changeset/1369 Log: ide: switch IDE init functions over to use new get_path_from_ph() helper Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/ide.c Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:32 2016 (r1368) +++ trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:34 2016 (r1369) @@ -1466,9 +1466,8 @@ break; } IDE_DPRINTF("%s]: %s\n", media, drive->model); - snprintf(nodebuff, sizeof(nodebuff), - "%s/" DEV_NAME "/%s", path, current_channel, - media); + snprintf(nodebuff, sizeof(nodebuff), "%s/%s", + get_path_from_ph(dnode), media); REGISTER_NAMED_NODE_PHANDLE(ob_ide, nodebuff, dnode); set_int_property(dnode, "reg", j); @@ -1686,9 +1685,8 @@ break; } IDE_DPRINTF("%s]: %s\n", media, drive->model); - snprintf(nodebuff, sizeof(nodebuff), - "%s/" DEV_NAME "/%s", path, current_channel, - media); + snprintf(nodebuff, sizeof(nodebuff), "%s/%s", + get_path_from_ph(dnode), media); REGISTER_NAMED_NODE_PHANDLE(ob_ide, nodebuff, dnode); set_int_property(dnode, "reg", j);

1 0

[commit] r1368 - in trunk/openbios-devel: include/libopenbios libopenbios
by repository service 04 Jan '16

04 Jan '16

Author: mcayland Date: Mon Jan 4 13:03:32 2016 New Revision: 1368 URL: http://tracker.coreboot.org/trac/openbios/changeset/1368 Log: libopenbios: introduce new get_path_from_ph() helper function This helper function returns the full device path for the device with the given phandle as a string. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/include/libopenbios/bindings.h trunk/openbios-devel/libopenbios/bindings.c Modified: trunk/openbios-devel/include/libopenbios/bindings.h ============================================================================== --- trunk/openbios-devel/include/libopenbios/bindings.h Mon Jan 4 13:03:29 2016 (r1367) +++ trunk/openbios-devel/include/libopenbios/bindings.h Mon Jan 4 13:03:32 2016 (r1368) @@ -56,6 +56,7 @@ extern ihandle_t open_dev( const char *spec ); extern void close_package( ihandle_t ih ); extern void close_dev( ihandle_t ih ); +extern char *get_path_from_ph( phandle_t ph ); /* property access */ extern void set_property( phandle_t ph, const char *name, Modified: trunk/openbios-devel/libopenbios/bindings.c ============================================================================== --- trunk/openbios-devel/libopenbios/bindings.c Mon Jan 4 13:03:29 2016 (r1367) +++ trunk/openbios-devel/libopenbios/bindings.c Mon Jan 4 13:03:32 2016 (r1368) @@ -366,6 +366,14 @@ return ret; } +char * +get_path_from_ph( phandle_t ph ) +{ + PUSH(ph); + fword("get-package-path"); + return pop_fstr_copy(); +} + phandle_t dt_iter_begin( void ) {

1 0

[commit] r1367 - trunk/openbios-devel/drivers
by repository service 04 Jan '16

04 Jan '16

Author: mcayland Date: Mon Jan 4 13:03:29 2016 New Revision: 1367 URL: http://tracker.coreboot.org/trac/openbios/changeset/1367 Log: ide: use REGISTER_NAMED_NODE_PHANDLE rather than REGISTER_NAMED_NODE There already exists a macro to create the device node and return its phandle, so use this directly rather than having to create the node and then navigate to its full path separately. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Reviewed-by: Alexander Graf <agraf(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/ide.c Modified: trunk/openbios-devel/drivers/ide.c ============================================================================== --- trunk/openbios-devel/drivers/ide.c Tue Dec 29 16:50:44 2015 (r1366) +++ trunk/openbios-devel/drivers/ide.c Mon Jan 4 13:03:29 2016 (r1367) @@ -1424,9 +1424,7 @@ snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path, current_channel); - REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); - - dnode = find_dev(nodebuff); + REGISTER_NAMED_NODE_PHANDLE(ob_ide_ctrl, nodebuff, dnode); #if !defined(CONFIG_PPC) && !defined(CONFIG_SPARC64) props[0]=14; props[1]=0; @@ -1471,8 +1469,7 @@ snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME "/%s", path, current_channel, media); - REGISTER_NAMED_NODE(ob_ide, nodebuff); - dnode=find_dev(nodebuff); + REGISTER_NAMED_NODE_PHANDLE(ob_ide, nodebuff, dnode); set_int_property(dnode, "reg", j); /* create aliases */ @@ -1596,9 +1593,7 @@ snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME, path, current_channel); - REGISTER_NAMED_NODE(ob_ide_ctrl, nodebuff); - - dnode = find_dev(nodebuff); + REGISTER_NAMED_NODE_PHANDLE(ob_ide_ctrl, nodebuff, dnode); set_property(dnode, "compatible", (is_oldworld() ? "heathrow-ata" : "keylargo-ata"), 13); @@ -1694,8 +1689,7 @@ snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME "/%s", path, current_channel, media); - REGISTER_NAMED_NODE(ob_ide, nodebuff); - dnode = find_dev(nodebuff); + REGISTER_NAMED_NODE_PHANDLE(ob_ide, nodebuff, dnode); set_int_property(dnode, "reg", j); /* create aliases */

1 0

[PATCH 0/5] macio: switch over to use 2 ata-3 controllers
by Mark Cave-Ayland 04 Jan '16

04 Jan '16

Further work on Darwin/OS X shows that IOKit expects both the hard disk and cdrom to be attached to the ata-3 controller for QEMU's mac99 machine. Currently OpenBIOS generates an ata-3 and an ata-4 controller (and by default attaches the cdrom to the ata-4 controller) meaning that IOKit would fail to locate and mount the cdrom on boot. Resolve this by instantiating 2 ata-3 controller nodes instead which also is a better match for a real device tree. The relevant changes to the device tree are shown below: Before: fff542a8 /pci@80000000/mac-io@3/ata-3@20000 (ata) fff54540 /pci@80000000/mac-io@3/ata-4@21000 (ata) fff547d8 /pci@80000000/mac-io@3/ata-4@21000/cdrom@0 (block) After: fff542a8 /pci@80000000/mac-io@3/ata-3@20000 (ata) fff54540 /pci@80000000/mac-io@3/ata-3@21000 (ata) fff547d8 /pci@80000000/mac-io@3/ata-3@21000/cdrom@0 (block) The OpenBIOS IDE code currently works by using the device name internally to reference the controller node, which of course breaks when 2 nodes are given the same name property. Patches 1-4 switch the OpenBIOS IDE code over to reference controller nodes by phandle rather than name, while patch 5 does the actual switch from 1 ata-3 and 1 ata-4 controller to 2 ata-3 controllers. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (5): ide: use REGISTER_NAMED_NODE_PHANDLE rather than REGISTER_NAMED_NODE libopenbios: introduce new get_path_from_ph() helper function ide: switch IDE init functions over to use new get_path_from_ph() helper ide: reference IDE channels by phandle, not device name macio: switch over to use 2 ata-3 ide controllers openbios-devel/drivers/ide.c | 46 +++++++++---------------- openbios-devel/drivers/ide.h | 2 +- openbios-devel/drivers/pci.c | 8 ++--- openbios-devel/include/libopenbios/bindings.h | 1 + openbios-devel/libopenbios/bindings.c | 8 +++++ 5 files changed, 31 insertions(+), 34 deletions(-) -- 1.7.10.4

3 7

[PATCH 0/8] SPARC64 Forth context rework
by Mark Cave-Ayland 29 Dec '15

29 Dec '15

This patchset is aimed at unifying the code used to preserve CPU context when switching from client programs into Forth, via either the CIF or interrupt handlers. It is part of a longer process to enable access to saved CPU context state from within Forth which will eventually enable proper implementation of the init-program and go words. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Mark Cave-Ayland (8): SPARC64: create proper stack frame when entering client interface SPARC64: introduce new Forth context stack (fcstack) for CPU contexts SPARC64: switch client interface over to use new Forth context stack SPARC64: switch IMMU/DMMU miss handlers over to use new Forth context stack SPARC64: move client interface stack inline to the new Forth context stack SPARC64: move IMMU/DMMU miss handler stacks inline to the new Forth context stack SPARC64: reorganise IMMU/DMMU trap context structure SPARC64: rearrange saved state window order openbios-devel/arch/sparc64/call-client.S | 218 +++++---------------- openbios-devel/arch/sparc64/context.c | 4 + openbios-devel/arch/sparc64/cpustate.h | 244 +++++++++++++++++++++++ openbios-devel/arch/sparc64/ldscript | 5 + openbios-devel/arch/sparc64/vectors.S | 300 ++++++----------------------- openbios-devel/include/arch/sparc64/io.h | 2 +- 6 files changed, 367 insertions(+), 406 deletions(-) create mode 100644 openbios-devel/arch/sparc64/cpustate.h -- 1.7.10.4

1 9

[commit] r1366 - trunk/openbios-devel/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:44 2015 New Revision: 1366 URL: http://tracker.coreboot.org/trac/openbios/changeset/1366 Log: SPARC64: rearrange saved state window order Instead of storing the windows in numerical order, store them starting from %cwp. This means the current window can be located at a fixed point in the state, rather than calculating the offset based upon %cwp. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/cpustate.h Modified: trunk/openbios-devel/arch/sparc64/cpustate.h ============================================================================== --- trunk/openbios-devel/arch/sparc64/cpustate.h Tue Dec 29 16:50:41 2015 (r1365) +++ trunk/openbios-devel/arch/sparc64/cpustate.h Tue Dec 29 16:50:44 2015 (r1366) @@ -72,11 +72,15 @@ /* Get the number of windows in %g6 */ \ rdpr %ver, %g6; \ and %g6, 0xf, %g6; \ - inc %g6; \ + \ + mov %g6, %g4; \ + inc %g4; \ + \ + /* Starting cwp in g7 */ \ + rdpr %cwp, %g7; \ \ save_cpu_window_##type: \ - deccc %g6; \ - wrpr %g6, %cwp; \ + wrpr %g7, %cwp; \ stx %l0, [%g5]; \ stx %l1, [%g5 + 0x8]; \ stx %l2, [%g5 + 0x10]; \ @@ -93,6 +97,9 @@ stx %i5, [%g5 + 0x68]; \ stx %i6, [%g5 + 0x70]; \ stx %i7, [%g5 + 0x78]; \ + dec %g7; \ + and %g7, %g6, %g7; \ + subcc %g4, 1, %g4; \ bne save_cpu_window_##type; \ add %g5, 0x80, %g5; \ \ @@ -144,14 +151,18 @@ /* Get the number of windows in %g6 */ \ rdpr %ver, %g6; \ and %g6, 0xf, %g6; \ - inc %g6; \ + \ + mov %g6, %g4; \ + inc %g4; \ + \ + /* Set starting window */ \ + ldx [%g1], %g7; \ \ /* Now iterate through all of the windows restoring all l and i registers */ \ add %g1, 0x90, %g5; \ \ restore_cpu_window_##type: \ - deccc %g6; \ - wrpr %g6, %cwp; \ + wrpr %g7, %cwp; \ ldx [%g5], %l0; \ ldx [%g5 + 0x8], %l1; \ ldx [%g5 + 0x10], %l2; \ @@ -168,6 +179,9 @@ ldx [%g5 + 0x68], %i5; \ ldx [%g5 + 0x70], %i6; \ ldx [%g5 + 0x78], %i7; \ + dec %g7; \ + and %g7, %g6, %g7; \ + subcc %g4, 1, %g4; \ bne restore_cpu_window_##type; \ add %g5, 0x80, %g5; \ \

1 0

[commit] r1365 - trunk/openbios-devel/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:41 2015 New Revision: 1365 URL: http://tracker.coreboot.org/trac/openbios/changeset/1365 Log: SPARC64: reorganise IMMU/DMMU trap context structure Here the trap context is reorganised to share the same prologue as the CIF context so that they can be subsequently unified. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Added: trunk/openbios-devel/arch/sparc64/cpustate.h - copied, changed from r1364, trunk/openbios-devel/arch/sparc64/call-client.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S trunk/openbios-devel/arch/sparc64/vectors.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:39 2015 (r1364) +++ trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:41 2015 (r1365) @@ -1,3 +1,5 @@ +#include "cpustate.h" + .globl sparc64_of_client_interface, client_tba @@ -9,142 +11,6 @@ * behaviour of OBP. */ -#define SAVE_WINDOW_STATE(type) \ - rdpr %cwp, %g7; \ - stx %g7, [%g1]; \ - rdpr %cansave, %g7; \ - stx %g7, [%g1 + 0x8]; \ - rdpr %canrestore, %g7; \ - stx %g7, [%g1 + 0x10]; \ - rdpr %otherwin, %g7; \ - stx %g7, [%g1 + 0x18]; \ - rdpr %wstate, %g7; \ - stx %g7, [%g1 + 0x20]; \ - rdpr %cleanwin, %g7; \ - stx %g7, [%g1 + 0x28]; \ - \ - stx %o0, [%g1 + 0x30]; \ - stx %o1, [%g1 + 0x38]; \ - stx %o2, [%g1 + 0x40]; \ - stx %o3, [%g1 + 0x48]; \ - stx %o4, [%g1 + 0x50]; \ - stx %o5, [%g1 + 0x58]; \ - stx %o6, [%g1 + 0x60]; \ - stx %o7, [%g1 + 0x68]; \ - \ - rdpr %pstate, %g7; \ - stx %g7, [%g1 + 0x70]; \ - rd %y, %g7; \ - stx %g7, [%g1 + 0x78]; \ - rd %fprs, %g7; \ - stx %g7, [%g1 + 0x80]; \ - \ - /* Now iterate through all of the windows saving all l and i registers */ \ - add %g1, 0x90, %g5; \ - \ - /* Get the number of windows in %g6 */ \ - rdpr %ver, %g6; \ - and %g6, 0xf, %g6; \ - inc %g6; \ - \ -save_cpu_window_##type: \ - deccc %g6; \ - wrpr %g6, %cwp; \ - stx %l0, [%g5]; \ - stx %l1, [%g5 + 0x8]; \ - stx %l2, [%g5 + 0x10]; \ - stx %l3, [%g5 + 0x18]; \ - stx %l4, [%g5 + 0x20]; \ - stx %l5, [%g5 + 0x28]; \ - stx %l6, [%g5 + 0x30]; \ - stx %l7, [%g5 + 0x38]; \ - stx %i0, [%g5 + 0x40]; \ - stx %i1, [%g5 + 0x48]; \ - stx %i2, [%g5 + 0x50]; \ - stx %i3, [%g5 + 0x58]; \ - stx %i4, [%g5 + 0x60]; \ - stx %i5, [%g5 + 0x68]; \ - stx %i6, [%g5 + 0x70]; \ - stx %i7, [%g5 + 0x78]; \ - bne save_cpu_window_##type; \ - add %g5, 0x80, %g5; \ - \ - /* For 8 windows with 16 registers to save in the window, memory required \ - is 16*8*8 = 0x400 bytes */ \ - \ - /* Now we should be in window 0 so update the other window registers */ \ - rdpr %ver, %g6; \ - and %g6, 0xf, %g6; \ - dec %g6; \ - wrpr %g6, %cansave; \ - \ - wrpr %g0, %cleanwin; \ - wrpr %g0, %canrestore; \ - wrpr %g0, %otherwin; - - -#define RESTORE_WINDOW_STATE(type) \ - /* Get the number of windows in %g6 */ \ - rdpr %ver, %g6; \ - and %g6, 0xf, %g6; \ - inc %g6; \ - \ - /* Now iterate through all of the windows restoring all l and i registers */ \ - add %g1, 0x90, %g5; \ - \ -restore_cpu_window_##type: \ - deccc %g6; \ - wrpr %g6, %cwp; \ - ldx [%g5], %l0; \ - ldx [%g5 + 0x8], %l1; \ - ldx [%g5 + 0x10], %l2; \ - ldx [%g5 + 0x18], %l3; \ - ldx [%g5 + 0x20], %l4; \ - ldx [%g5 + 0x28], %l5; \ - ldx [%g5 + 0x30], %l6; \ - ldx [%g5 + 0x38], %l7; \ - ldx [%g5 + 0x40], %i0; \ - ldx [%g5 + 0x48], %i1; \ - ldx [%g5 + 0x50], %i2; \ - ldx [%g5 + 0x58], %i3; \ - ldx [%g5 + 0x60], %i4; \ - ldx [%g5 + 0x68], %i5; \ - ldx [%g5 + 0x70], %i6; \ - ldx [%g5 + 0x78], %i7; \ - bne restore_cpu_window_##type; \ - add %g5, 0x80, %g5; \ - \ - /* Restore the window registers to their original value */ \ - ldx [%g1], %g7; \ - wrpr %g7, %cwp; \ - ldx [%g1 + 0x8], %g7; \ - wrpr %g7, %cansave; \ - ldx [%g1 + 0x10], %g7; \ - wrpr %g7, %canrestore; \ - ldx [%g1 + 0x18], %g7; \ - wrpr %g7, %otherwin; \ - ldx [%g1 + 0x20], %g7; \ - wrpr %g7, %wstate; \ - ldx [%g1 + 0x28], %g7; \ - wrpr %g7, %cleanwin; \ - \ - ldx [%g1 + 0x30], %o0; \ - ldx [%g1 + 0x38], %o1; \ - ldx [%g1 + 0x40], %o2; \ - ldx [%g1 + 0x48], %o3; \ - ldx [%g1 + 0x50], %o4; \ - ldx [%g1 + 0x58], %o5; \ - ldx [%g1 + 0x60], %o6; \ - ldx [%g1 + 0x68], %o7; \ - \ - ldx [%g1 + 0x70], %g7; \ - wrpr %g7, %pstate; \ - ldx [%g1 + 0x78], %g7; \ - wr %g7, 0, %y; \ - ldx [%g1 + 0x80], %g7; \ - wr %g7, 0, %fprs - - .data .align 8 @@ -192,15 +58,15 @@ /* Save windows */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 - add %g1, -0x510, %g1 + add %g1, -CONTEXT_STATE_SIZE, %g1 stx %g1, [%g7] - SAVE_WINDOW_STATE(cif) + SAVE_CPU_WINDOW_STATE(cif) /* Move to OpenBIOS context stack */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g6 - setx 0x2000, %g4, %g5 + setx CONTEXT_STACK_SIZE, %g4, %g5 sub %g6, %g5, %g6 stx %g6, [%g7] @@ -215,16 +81,16 @@ /* Restore windows */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 - setx 0x2000, %g4, %g5 + setx CONTEXT_STACK_SIZE, %g4, %g5 add %g1, %g5, %g1 stx %g1, [%g7] /* Return value */ stx %o0, [%g1 + 0x30] - RESTORE_WINDOW_STATE(cif) + RESTORE_CPU_WINDOW_STATE(cif) - add %g1, 0x510, %g1 + add %g1, CONTEXT_STATE_SIZE, %g1 setx _fcstack_ptr, %g6, %g7 stx %g1, [%g7] Copied and modified: trunk/openbios-devel/arch/sparc64/cpustate.h (from r1364, trunk/openbios-devel/arch/sparc64/call-client.S) ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:39 2015 (r1364, copy source) +++ trunk/openbios-devel/arch/sparc64/cpustate.h Tue Dec 29 16:50:41 2015 (r1365) @@ -1,15 +1,40 @@ - .globl sparc64_of_client_interface, client_tba +/* + * Save/restore CPU state macros + * + * Copyright (C) 2015 Mark Cave-Ayland (mark.cave-ayland(a)ilande.co.uk>) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +/* State size for context (see below) */ +#define CONTEXT_STATE_SIZE 0x510 +/* Stack size for context (allocated inline of the context stack) */ +#define CONTEXT_STACK_SIZE 0x2000 /* - * SAVE_WINDOW_STATE and RESTORE_WINDOW_STATE are used to ensure - * that the CPU window state is preserved across CIF calls. This is - * to workaround a *BSD restriction that window fill/spill traps must - * be minimised during trap table takeover, and likely emulates the - * behaviour of OBP. + * SAVE_CPU_STATE and RESTORE_CPU_STATE are macros used to enable a context switch + * to C to occur within the MMU I/D TLB miss handlers. + * + * Because these handlers are called on a TLB miss, we cannot use flushw to store + * processor window state on the stack, as the memory areas used by each window's + * stack pointer may not be in the TLB, causing recursive TLB miss traps. + * + * For this reason, we save window state by manually rotating the window registers + * and saving their contents (along with other vital registers) into a special + * tlb_handler_stack defined above which is guaranteed to be locked in the TLB, and + * so won't cause issues with trap recursion. + * + * Once this process is complete, we remain in a TL=0, CWP=0 state (with IE=1 to allow + * window fill/spill traps if required), switch to our safe tlb_handler_stack and + * invoke the miss handler. */ -#define SAVE_WINDOW_STATE(type) \ +#define SAVE_CPU_WINDOW_STATE(type) \ + /* Save window state into context at %g1 */ \ rdpr %cwp, %g7; \ stx %g7, [%g1]; \ rdpr %cansave, %g7; \ @@ -38,6 +63,8 @@ stx %g7, [%g1 + 0x78]; \ rd %fprs, %g7; \ stx %g7, [%g1 + 0x80]; \ + rdpr %tl, %g7; \ + stx %g7, [%g1 + 0x88]; \ \ /* Now iterate through all of the windows saving all l and i registers */ \ add %g1, 0x90, %g5; \ @@ -80,10 +107,40 @@ \ wrpr %g0, %cleanwin; \ wrpr %g0, %canrestore; \ - wrpr %g0, %otherwin; + wrpr %g0, %otherwin; \ + +#define SAVE_CPU_TRAP_STATE(type) \ + /* Save trap state into context at %g1 */ \ + add %g1, 0x490, %g5; \ + mov 4, %g6; \ + \ +save_trap_state_##type: \ + deccc %g6; \ + wrpr %g6, %tl; \ + rdpr %tpc, %g7; \ + stx %g7, [%g5]; \ + rdpr %tnpc, %g7; \ + stx %g7, [%g5 + 0x8]; \ + rdpr %tstate, %g7; \ + stx %g7, [%g5 + 0x10]; \ + rdpr %tt, %g7; \ + stx %g7, [%g5 + 0x18]; \ + bne save_trap_state_##type; \ + add %g5, 0x20, %g5; \ + \ + /* For 4 trap levels with 4 registers, memory required is \ + 4*8*4 = 0x80 bytes */ + +/* Save all state into context at %g1 */ +#define SAVE_CPU_STATE(type) \ + SAVE_CPU_WINDOW_STATE(type); \ + SAVE_CPU_TRAP_STATE(type); -#define RESTORE_WINDOW_STATE(type) \ + +#define RESTORE_CPU_WINDOW_STATE(type) \ + /* Restore window state from context at %g1 */ \ + \ /* Get the number of windows in %g6 */ \ rdpr %ver, %g6; \ and %g6, 0xf, %g6; \ @@ -142,111 +199,32 @@ ldx [%g1 + 0x78], %g7; \ wr %g7, 0, %y; \ ldx [%g1 + 0x80], %g7; \ - wr %g7, 0, %fprs - + wr %g7, 0, %fprs; \ - .data - .align 8 -client_stack: - .xword 0 -client_tba: - .xword 0 -client_window: - .skip 2048 - - - .text - .align 4 - .register %g2, #scratch - .register %g3, #scratch - .register %g6, #scratch - .register %g7, #scratch -/* - make some more space on stack since linux kernel only provides 128 bytes - without memory to spill registers (used by gcc in -O0 mode) -*/ - -sparc64_of_client_interface: - - /* Save globals on callers stack */ - add %sp, -248, %sp - - stx %g1, [%sp + 2047 + 192] - stx %g2, [%sp + 2047 + 200] - stx %g3, [%sp + 2047 + 208] - stx %g4, [%sp + 2047 + 216] - stx %g5, [%sp + 2047 + 224] - stx %g6, [%sp + 2047 + 232] - stx %g7, [%sp + 2047 + 240] - - /* Save client trap table */ - setx client_tba, %g6, %g7 - rdpr %tba, %g6 - stx %g6, [%g7] - - /* Save existing stack */ - setx client_stack, %g6, %g7 - stx %sp, [%g7] - - /* Save windows */ - setx _fcstack_ptr, %g6, %g7 - ldx [%g7], %g1 - add %g1, -0x510, %g1 - stx %g1, [%g7] - - SAVE_WINDOW_STATE(cif) - - /* Move to OpenBIOS context stack */ - setx _fcstack_ptr, %g6, %g7 - ldx [%g7], %g6 - setx 0x2000, %g4, %g5 - sub %g6, %g5, %g6 - stx %g6, [%g7] - - setx - 2047 - 192, %g6, %g7 - add %g1, %g7, %g7 - mov %g7, %sp - - /* Call client inteface */ - call of_client_interface - ldx [%g1 + 0x30], %o0 - - /* Restore windows */ - setx _fcstack_ptr, %g6, %g7 - ldx [%g7], %g1 - setx 0x2000, %g4, %g5 - add %g1, %g5, %g1 - stx %g1, [%g7] - - /* Return value */ - stx %o0, [%g1 + 0x30] - - RESTORE_WINDOW_STATE(cif) - - add %g1, 0x510, %g1 - setx _fcstack_ptr, %g6, %g7 - stx %g1, [%g7] - - /* Restore stack */ - setx client_stack, %g6, %g7 - ldx [%g7], %sp - - /* Restore client trap table */ - setx client_tba, %g6, %g7 - ldx [%g7], %g6 - wrpr %g6, %tba - - /* Restore globals */ - ldx [%sp + 2047 + 192], %g1 - ldx [%sp + 2047 + 200], %g2 - ldx [%sp + 2047 + 208], %g3 - ldx [%sp + 2047 + 216], %g4 - ldx [%sp + 2047 + 224], %g5 - ldx [%sp + 2047 + 232], %g6 - ldx [%sp + 2047 + 240], %g7 - - add %sp, 248, %sp - - jmp %o7+8 - nop +#define RESTORE_CPU_TRAP_STATE(type) \ + /* Restore trap state from context at %g1 */ \ + add %g1, 0x490, %g5; \ + mov 4, %g6; \ + \ +restore_trap_state_##type: \ + deccc %g6; \ + wrpr %g6, %tl; \ + ldx [%g5], %g7; \ + wrpr %g7, %tpc; \ + ldx [%g5 + 0x8], %g7; \ + wrpr %g7, %tnpc; \ + ldx [%g5 + 0x10], %g7; \ + wrpr %g7, %tstate; \ + ldx [%g5 + 0x18], %g7; \ + wrpr %g7, %tt; \ + bne restore_trap_state_##type; \ + add %g5, 0x20, %g5; \ + \ + ldx [%g1 + 0x88], %g7; \ + wrpr %g7, %tl + +/* Restore all state from context at %g1 */ +#define RESTORE_CPU_STATE(type) \ + RESTORE_CPU_WINDOW_STATE(type); \ + RESTORE_CPU_TRAP_STATE(type); Modified: trunk/openbios-devel/arch/sparc64/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S Tue Dec 29 16:50:39 2015 (r1364) +++ trunk/openbios-devel/arch/sparc64/vectors.S Tue Dec 29 16:50:41 2015 (r1365) @@ -24,6 +24,7 @@ */ #define __ASSEMBLY__ +#include "cpustate.h" #include "pstate.h" #include <asm/asi.h> #define ASI_BP ASI_PHYS_BYPASS_EC_E @@ -327,206 +328,6 @@ restored retry -/* - * SAVE_CPU_STATE and RESTORE_CPU_STATE are macros used to enable a context switch - * to C to occur within the MMU I/D TLB miss handlers. - * - * Because these handlers are called on a TLB miss, we cannot use flushw to store - * processor window state on the stack, as the memory areas used by each window's - * stack pointer may not be in the TLB, causing recursive TLB miss traps. - * - * For this reason, we save window state by manually rotating the window registers - * and saving their contents (along with other vital registers) into a special - * tlb_handler_stack defined above which is guaranteed to be locked in the TLB, and - * so won't cause issues with trap recursion. - * - * Once this process is complete, we remain in a TL=0, CWP=0 state (with IE=1 to allow - * window fill/spill traps if required), switch to our safe tlb_handler_stack and - * invoke the miss handler. - */ - -#define SAVE_CPU_STATE(type) \ - /* First save the various state registers */ \ - rdpr %cwp, %g7; \ - stx %g7, [%g1]; \ - rdpr %cansave, %g7; \ - stx %g7, [%g1 + 0x8]; \ - rdpr %canrestore, %g7; \ - stx %g7, [%g1 + 0x10]; \ - rdpr %otherwin, %g7; \ - stx %g7, [%g1 + 0x18]; \ - rdpr %wstate, %g7; \ - stx %g7, [%g1 + 0x20]; \ - rdpr %cleanwin, %g7; \ - stx %g7, [%g1 + 0x28]; \ - rdpr %pstate, %g7; \ - stx %g7, [%g1 + 0x30]; \ - \ - rd %y, %g7; \ - stx %g7, [%g1 + 0x38]; \ - rd %fprs, %g7; \ - stx %g7, [%g1 + 0x40]; \ - \ - rdpr %tl, %g7; \ - stx %g7, [%g1 + 0x48]; \ - \ - /* Trap state */ \ - add %g1, 0x50, %g5; \ - mov 4, %g6; \ - \ -save_trap_state_##type: \ - deccc %g6; \ - wrpr %g6, %tl; \ - rdpr %tpc, %g7; \ - stx %g7, [%g5]; \ - rdpr %tnpc, %g7; \ - stx %g7, [%g5 + 0x8]; \ - rdpr %tstate, %g7; \ - stx %g7, [%g5 + 0x10]; \ - rdpr %tt, %g7; \ - stx %g7, [%g5 + 0x18]; \ - bne save_trap_state_##type; \ - add %g5, 0x20, %g5; \ - \ - /* For 4 trap levels with 4 registers, memory required is - 4*8*4 = 0x80 bytes */ \ - \ - /* Save the o registers */ \ - stx %o0, [%g1 + 0xd0]; \ - stx %o1, [%g1 + 0xd8]; \ - stx %o2, [%g1 + 0xe0]; \ - stx %o3, [%g1 + 0xe8]; \ - stx %o4, [%g1 + 0xf0]; \ - stx %o5, [%g1 + 0xf8]; \ - stx %o6, [%g1 + 0x100]; \ - stx %o7, [%g1 + 0x108]; \ - \ - /* Now iterate through all of the windows saving all l and i registers */ \ - add %g1, 0x110, %g5; \ - \ - /* Get the number of windows in %g6 */ \ - rdpr %ver, %g6; \ - and %g6, 0xf, %g6; \ - inc %g6; \ - \ -save_cpu_window_##type: \ - deccc %g6; \ - wrpr %g6, %cwp; \ - stx %l0, [%g5]; \ - stx %l1, [%g5 + 0x8]; \ - stx %l2, [%g5 + 0x10]; \ - stx %l3, [%g5 + 0x18]; \ - stx %l4, [%g5 + 0x20]; \ - stx %l5, [%g5 + 0x28]; \ - stx %l6, [%g5 + 0x30]; \ - stx %l7, [%g5 + 0x38]; \ - stx %i0, [%g5 + 0x40]; \ - stx %i1, [%g5 + 0x48]; \ - stx %i2, [%g5 + 0x50]; \ - stx %i3, [%g5 + 0x58]; \ - stx %i4, [%g5 + 0x60]; \ - stx %i5, [%g5 + 0x68]; \ - stx %i6, [%g5 + 0x70]; \ - stx %i7, [%g5 + 0x78]; \ - bne save_cpu_window_##type; \ - add %g5, 0x80, %g5; \ - \ - /* For 8 windows with 16 registers to save in the window, memory required - is 16*8*8 = 0x400 bytes */ \ - \ - /* Now we should be in window 0 so update the other window registers */ \ - rdpr %ver, %g6; \ - and %g6, 0xf, %g6; \ - dec %g6; \ - wrpr %g6, %cansave; \ - \ - wrpr %g0, %cleanwin; \ - wrpr %g0, %canrestore; \ - wrpr %g0, %otherwin - - -#define RESTORE_CPU_STATE(type) \ - /* Get the number of windows in %g6 */ \ - rdpr %ver, %g6; \ - and %g6, 0xf, %g6; \ - inc %g6; \ - \ - /* Now iterate through all of the windows restoring all l and i registers */ \ - add %g1, 0x110, %g5; \ - \ -restore_cpu_window_##type: \ - deccc %g6; \ - wrpr %g6, %cwp; \ - ldx [%g5], %l0; \ - ldx [%g5 + 0x8], %l1; \ - ldx [%g5 + 0x10], %l2; \ - ldx [%g5 + 0x18], %l3; \ - ldx [%g5 + 0x20], %l4; \ - ldx [%g5 + 0x28], %l5; \ - ldx [%g5 + 0x30], %l6; \ - ldx [%g5 + 0x38], %l7; \ - ldx [%g5 + 0x40], %i0; \ - ldx [%g5 + 0x48], %i1; \ - ldx [%g5 + 0x50], %i2; \ - ldx [%g5 + 0x58], %i3; \ - ldx [%g5 + 0x60], %i4; \ - ldx [%g5 + 0x68], %i5; \ - ldx [%g5 + 0x70], %i6; \ - ldx [%g5 + 0x78], %i7; \ - bne restore_cpu_window_##type; \ - add %g5, 0x80, %g5; \ - \ - /* Restore the window registers to their original value */ \ - ldx [%g1], %g7; \ - wrpr %g7, %cwp; \ - ldx [%g1 + 0x8], %g7; \ - wrpr %g7, %cansave; \ - ldx [%g1 + 0x10], %g7; \ - wrpr %g7, %canrestore; \ - ldx [%g1 + 0x18], %g7; \ - wrpr %g7, %otherwin; \ - ldx [%g1 + 0x20], %g7; \ - wrpr %g7, %wstate; \ - ldx [%g1 + 0x28], %g7; \ - wrpr %g7, %cleanwin; \ - ldx [%g1 + 0x30], %g7; \ - wrpr %g7, %pstate; \ - \ - /* Restore the o registers */ \ - ldx [%g1 + 0xd0], %o0; \ - ldx [%g1 + 0xd8], %o1; \ - ldx [%g1 + 0xe0], %o2; \ - ldx [%g1 + 0xe8], %o3; \ - ldx [%g1 + 0xf0], %o4; \ - ldx [%g1 + 0xf8], %o5; \ - ldx [%g1 + 0x100], %o6; \ - ldx [%g1 + 0x108], %o7; \ - \ - /* Restore the trap state */ \ - add %g1, 0x50, %g5; \ - mov 4, %g6; \ - \ -restore_trap_state_##type: \ - deccc %g6; \ - wrpr %g6, %tl; \ - ldx [%g5], %g7; \ - wrpr %g7, %tpc; \ - ldx [%g5 + 0x8], %g7; \ - wrpr %g7, %tnpc; \ - ldx [%g5 + 0x10], %g7; \ - wrpr %g7, %tstate; \ - ldx [%g5 + 0x18], %g7; \ - wrpr %g7, %tt; \ - bne restore_trap_state_##type; \ - add %g5, 0x20, %g5; \ - \ - ldx [%g1 + 0x38], %g7; \ - wr %g7, 0, %y; \ - ldx [%g1 + 0x40], %g7; \ - wr %g7, 0, %fprs; \ - ldx [%g1 + 0x48], %g7; \ - wrpr %g7, %tl - .globl reload_DMMU_tlb, reload_IMMU_tlb, bug @@ -535,7 +336,7 @@ /* Save CPU state to stack */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 - add %g1, -0x510, %g1 + add %g1, -CONTEXT_STATE_SIZE, %g1 stx %g1, [%g7] SAVE_CPU_STATE(dtlb) @@ -544,7 +345,7 @@ gcc to save its arguments when building with -O0) */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g6 - setx 0x2000, %g4, %g5 + setx CONTEXT_STACK_SIZE, %g4, %g5 sub %g6, %g5, %g6 stx %g6, [%g7] @@ -568,7 +369,7 @@ /* Restore CPU state from stack */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 - setx 0x2000, %g4, %g5 + setx CONTEXT_STACK_SIZE, %g4, %g5 add %g1, %g5, %g1 stx %g1, [%g7] @@ -576,7 +377,7 @@ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 - add %g1, 0x510, %g1 + add %g1, CONTEXT_STATE_SIZE, %g1 stx %g1, [%g7] retry @@ -586,7 +387,7 @@ /* Save CPU state to stack */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 - add %g1, -0x510, %g1 + add %g1, -CONTEXT_STATE_SIZE, %g1 stx %g1, [%g7] SAVE_CPU_STATE(itlb) @@ -595,7 +396,7 @@ gcc to save its arguments when building with -O0) */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g6 - setx 0x2000, %g4, %g5 + setx CONTEXT_STACK_SIZE, %g4, %g5 sub %g6, %g5, %g6 stx %g6, [%g7] @@ -619,7 +420,7 @@ /* Restore CPU state from stack */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 - setx 0x2000, %g4, %g5 + setx CONTEXT_STACK_SIZE, %g4, %g5 add %g1, %g5, %g1 stx %g1, [%g7] @@ -627,7 +428,7 @@ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 - add %g1, 0x510, %g1 + add %g1, CONTEXT_STATE_SIZE, %g1 stx %g1, [%g7] retry

1 0

[commit] r1364 - trunk/openbios-devel/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:39 2015 New Revision: 1364 URL: http://tracker.coreboot.org/trac/openbios/changeset/1364 Log: SPARC64: move IMMU/DMMU miss handler stacks inline to the new Forth context stack Rather than having a separate OpenBIOS stack for IMMU/DMMU miss handlers, reuse the Forth context stack by reserving 8K extra beneath the CPU save state area and using that instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/vectors.S Modified: trunk/openbios-devel/arch/sparc64/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S Tue Dec 29 16:50:36 2015 (r1363) +++ trunk/openbios-devel/arch/sparc64/vectors.S Tue Dec 29 16:50:39 2015 (r1364) @@ -276,17 +276,8 @@ .section ".data" .align 8 - .globl tlb_handler_stack_top, tlb_handler_stack_pointer, obp_ticks_pointer + .globl obp_ticks_pointer - ! Stack for the tlb MMU trap handlers -tlb_handler_stack_bottom: - .skip 8192 -tlb_handler_stack_top: - .skip 8 - - ! MMU trap handler stack pointer -tlb_handler_stack_pointer: - .xword tlb_handler_stack_top ! Pointer to current tick value obp_ticks_pointer: @@ -549,10 +540,17 @@ SAVE_CPU_STATE(dtlb) - /* Switch to TLB locked stack space (note we add an additional 192 bytes required for + /* Switch to 8K TLB locked OpenBIOS stack (note we add an additional 192 bytes required for gcc to save its arguments when building with -O0) */ - setx tlb_handler_stack_top, %g6, %g1 - add %g1, -STACK_BIAS - 192, %sp + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g6 + setx 0x2000, %g4, %g5 + sub %g6, %g5, %g6 + stx %g6, [%g7] + + setx - 2047 - 192, %g6, %g7 + add %g1, %g7, %g7 + mov %g7, %sp /* Enable interrupts for window spill/fill traps */ rdpr %pstate, %g7 @@ -570,6 +568,9 @@ /* Restore CPU state from stack */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 + setx 0x2000, %g4, %g5 + add %g1, %g5, %g1 + stx %g1, [%g7] RESTORE_CPU_STATE(dtlb) @@ -590,10 +591,17 @@ SAVE_CPU_STATE(itlb) - /* Switch to TLB locked stack space (note we add an additional 192 bytes required for + /* Switch to 8K TLB locked OpenBIOS stack (note we add an additional 192 bytes required for gcc to save its arguments when building with -O0) */ - setx tlb_handler_stack_top, %g6, %g1 - add %g1, -STACK_BIAS - 192, %sp + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g6 + setx 0x2000, %g4, %g5 + sub %g6, %g5, %g6 + stx %g6, [%g7] + + setx - 2047 - 192, %g6, %g7 + add %g1, %g7, %g7 + mov %g7, %sp /* Enable interrupts for window spill/fill traps */ rdpr %pstate, %g7 @@ -611,6 +619,9 @@ /* Restore CPU state from stack */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 + setx 0x2000, %g4, %g5 + add %g1, %g5, %g1 + stx %g1, [%g7] RESTORE_CPU_STATE(itlb)

1 0

[commit] r1363 - trunk/openbios-devel/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:36 2015 New Revision: 1363 URL: http://tracker.coreboot.org/trac/openbios/changeset/1363 Log: SPARC64: move client interface stack inline to the new Forth context stack Rather than having a separate OpenBIOS stack for client interface calls, reuse the Forth stack by reserving 8K extra beneath the CPU save state area and using that instead. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/call-client.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:34 2015 (r1362) +++ trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:36 2015 (r1363) @@ -148,9 +148,6 @@ .data .align 8 - .skip 16384 -openbios_stack: - client_stack: .xword 0 client_tba: @@ -200,8 +197,15 @@ SAVE_WINDOW_STATE(cif) - /* Move to OpenBIOS stack */ - setx openbios_stack - 2047 - 192, %g6, %g7 + /* Move to OpenBIOS context stack */ + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g6 + setx 0x2000, %g4, %g5 + sub %g6, %g5, %g6 + stx %g6, [%g7] + + setx - 2047 - 192, %g6, %g7 + add %g1, %g7, %g7 mov %g7, %sp /* Call client inteface */ @@ -211,6 +215,9 @@ /* Restore windows */ setx _fcstack_ptr, %g6, %g7 ldx [%g7], %g1 + setx 0x2000, %g4, %g5 + add %g1, %g5, %g1 + stx %g1, [%g7] /* Return value */ stx %o0, [%g1 + 0x30]

1 0

[commit] r1362 - trunk/openbios-devel/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:34 2015 New Revision: 1362 URL: http://tracker.coreboot.org/trac/openbios/changeset/1362 Log: SPARC64: switch IMMU/DMMU miss handlers over to use new Forth context stack Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/vectors.S Modified: trunk/openbios-devel/arch/sparc64/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S Tue Dec 29 16:50:31 2015 (r1361) +++ trunk/openbios-devel/arch/sparc64/vectors.S Tue Dec 29 16:50:34 2015 (r1362) @@ -355,11 +355,6 @@ */ #define SAVE_CPU_STATE(type) \ - /* Set up our exception stack pointer in %g1 */ \ - setx tlb_handler_stack_pointer, %g7, %g6; \ - ldx [%g6], %g1; \ - add %g1, -0x510, %g1; \ - \ /* First save the various state registers */ \ rdpr %cwp, %g7; \ stx %g7, [%g1]; \ @@ -456,18 +451,10 @@ \ wrpr %g0, %cleanwin; \ wrpr %g0, %canrestore; \ - wrpr %g0, %otherwin; \ - \ - /* Update our exception stack pointer */ \ - setx tlb_handler_stack_pointer, %g7, %g6; \ - stx %g1, [%g6]; + wrpr %g0, %otherwin #define RESTORE_CPU_STATE(type) \ - /* Set up our exception stack pointer in %g1 */ \ - setx tlb_handler_stack_pointer, %g7, %g6; \ - ldx [%g6], %g1; \ - \ /* Get the number of windows in %g6 */ \ rdpr %ver, %g6; \ and %g6, 0xf, %g6; \ @@ -547,22 +534,24 @@ ldx [%g1 + 0x40], %g7; \ wr %g7, 0, %fprs; \ ldx [%g1 + 0x48], %g7; \ - wrpr %g7, %tl; \ - \ - /* Restore exception stack pointer to previous value */ \ - setx tlb_handler_stack_pointer, %g7, %g6; \ - add %g1, 0x510, %g1; \ - stx %g1, [%g6]; + wrpr %g7, %tl .globl reload_DMMU_tlb, reload_IMMU_tlb, bug reload_DMMU_tlb: - + + /* Save CPU state to stack */ + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g1 + add %g1, -0x510, %g1 + stx %g1, [%g7] + SAVE_CPU_STATE(dtlb) /* Switch to TLB locked stack space (note we add an additional 192 bytes required for gcc to save its arguments when building with -O0) */ + setx tlb_handler_stack_top, %g6, %g1 add %g1, -STACK_BIAS - 192, %sp /* Enable interrupts for window spill/fill traps */ @@ -577,17 +566,33 @@ rdpr %pstate, %g7 andn %g7, PSTATE_IE, %g7 wrpr %g7, %pstate - + + /* Restore CPU state from stack */ + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g1 + RESTORE_CPU_STATE(dtlb) - + + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g1 + add %g1, 0x510, %g1 + stx %g1, [%g7] + retry reload_IMMU_tlb: - + + /* Save CPU state to stack */ + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g1 + add %g1, -0x510, %g1 + stx %g1, [%g7] + SAVE_CPU_STATE(itlb) /* Switch to TLB locked stack space (note we add an additional 192 bytes required for gcc to save its arguments when building with -O0) */ + setx tlb_handler_stack_top, %g6, %g1 add %g1, -STACK_BIAS - 192, %sp /* Enable interrupts for window spill/fill traps */ @@ -602,8 +607,17 @@ rdpr %pstate, %g7 andn %g7, PSTATE_IE, %g7 wrpr %g7, %pstate - + + /* Restore CPU state from stack */ + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g1 + RESTORE_CPU_STATE(itlb) + + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g1 + add %g1, 0x510, %g1 + stx %g1, [%g7] retry

1 0

[commit] r1361 - trunk/openbios-devel/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:31 2015 New Revision: 1361 URL: http://tracker.coreboot.org/trac/openbios/changeset/1361 Log: SPARC64: switch client interface over to use new Forth context stack Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/call-client.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:29 2015 (r1360) +++ trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:31 2015 (r1361) @@ -10,7 +10,6 @@ */ #define SAVE_WINDOW_STATE(type) \ - setx client_window, %g6, %g1; \ rdpr %cwp, %g7; \ stx %g7, [%g1]; \ rdpr %cansave, %g7; \ @@ -85,8 +84,6 @@ #define RESTORE_WINDOW_STATE(type) \ - setx client_window, %g6, %g1; \ - \ /* Get the number of windows in %g6 */ \ rdpr %ver, %g6; \ and %g6, 0xf, %g6; \ @@ -196,6 +193,11 @@ stx %sp, [%g7] /* Save windows */ + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g1 + add %g1, -0x510, %g1 + stx %g1, [%g7] + SAVE_WINDOW_STATE(cif) /* Move to OpenBIOS stack */ @@ -206,12 +208,19 @@ call of_client_interface ldx [%g1 + 0x30], %o0 - setx client_window, %g6, %g1 - stx %o0, [%g1 + 0x30] - /* Restore windows */ + setx _fcstack_ptr, %g6, %g7 + ldx [%g7], %g1 + + /* Return value */ + stx %o0, [%g1 + 0x30] + RESTORE_WINDOW_STATE(cif) - + + add %g1, 0x510, %g1 + setx _fcstack_ptr, %g6, %g7 + stx %g1, [%g7] + /* Restore stack */ setx client_stack, %g6, %g7 ldx [%g7], %sp

1 0

[commit] r1360 - in trunk/openbios-devel: arch/sparc64 include/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:29 2015 New Revision: 1360 URL: http://tracker.coreboot.org/trac/openbios/changeset/1360 Log: SPARC64: introduce new Forth context stack (fcstack) for CPU contexts The fcstack holds a stack of complete CPU states which can be used to enable re-entrant calls into Forth (e.g. when processing interrupts). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/context.c trunk/openbios-devel/arch/sparc64/ldscript trunk/openbios-devel/include/arch/sparc64/io.h Modified: trunk/openbios-devel/arch/sparc64/context.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/context.c Tue Dec 29 16:50:24 2015 (r1359) +++ trunk/openbios-devel/arch/sparc64/context.c Tue Dec 29 16:50:29 2015 (r1360) @@ -40,6 +40,10 @@ /* Pointer to startup context (physical address) */ unsigned long __boot_ctx; +/* Pointer to Forth context stack */ +void *_fcstack_ptr = &_efcstack; + + /* * Main starter * This is the C function that runs first. Modified: trunk/openbios-devel/arch/sparc64/ldscript ============================================================================== --- trunk/openbios-devel/arch/sparc64/ldscript Tue Dec 29 16:50:24 2015 (r1359) +++ trunk/openbios-devel/arch/sparc64/ldscript Tue Dec 29 16:50:29 2015 (r1360) @@ -50,6 +50,11 @@ *(.bss.*) *(COMMON) + _fcstack = .; + . += 32768; + . = ALIGN(16); + _efcstack = .; + _stack = .; . += STACK_SIZE; . = ALIGN(16); Modified: trunk/openbios-devel/include/arch/sparc64/io.h ============================================================================== --- trunk/openbios-devel/include/arch/sparc64/io.h Tue Dec 29 16:50:24 2015 (r1359) +++ trunk/openbios-devel/include/arch/sparc64/io.h Tue Dec 29 16:50:29 2015 (r1360) @@ -9,7 +9,7 @@ extern unsigned long va_shift; // Set in entry.S // Defined in ldscript -extern char _start, _data, _stack, _estack, _end, _iomem; +extern char _start, _data, _stack, _estack, _fcstack, _efcstack, _end, _iomem; // XXX check use and merge #define phys_to_virt(phys) ((void *) ((unsigned long) (phys)))

1 0

[commit] r1359 - trunk/openbios-devel/arch/sparc64
by repository service 29 Dec '15

29 Dec '15

Author: mcayland Date: Tue Dec 29 16:50:24 2015 New Revision: 1359 URL: http://tracker.coreboot.org/trac/openbios/changeset/1359 Log: SPARC64: create proper stack frame when entering client interface The original motivation behind reducing the stack frame size was in order to keep the stack usage low enough to boot OpenBSD/NetBSD. Since the final solution now is to save and restore the entire CPU state around CIF calls then this no longer matters. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/arch/sparc64/call-client.S Modified: trunk/openbios-devel/arch/sparc64/call-client.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/call-client.S Fri Nov 6 16:06:36 2015 (r1358) +++ trunk/openbios-devel/arch/sparc64/call-client.S Tue Dec 29 16:50:24 2015 (r1359) @@ -176,15 +176,15 @@ sparc64_of_client_interface: /* Save globals on callers stack */ - add %sp, -56, %sp + add %sp, -248, %sp - stx %g1, [%sp + 2047 + 0] - stx %g2, [%sp + 2047 + 8] - stx %g3, [%sp + 2047 + 16] - stx %g4, [%sp + 2047 + 24] - stx %g5, [%sp + 2047 + 32] - stx %g6, [%sp + 2047 + 40] - stx %g7, [%sp + 2047 + 48] + stx %g1, [%sp + 2047 + 192] + stx %g2, [%sp + 2047 + 200] + stx %g3, [%sp + 2047 + 208] + stx %g4, [%sp + 2047 + 216] + stx %g5, [%sp + 2047 + 224] + stx %g6, [%sp + 2047 + 232] + stx %g7, [%sp + 2047 + 240] /* Save client trap table */ setx client_tba, %g6, %g7 @@ -222,15 +222,15 @@ wrpr %g6, %tba /* Restore globals */ - ldx [%sp + 2047 + 0], %g1 - ldx [%sp + 2047 + 8], %g2 - ldx [%sp + 2047 + 16], %g3 - ldx [%sp + 2047 + 24], %g4 - ldx [%sp + 2047 + 32], %g5 - ldx [%sp + 2047 + 40], %g6 - ldx [%sp + 2047 + 48], %g7 + ldx [%sp + 2047 + 192], %g1 + ldx [%sp + 2047 + 200], %g2 + ldx [%sp + 2047 + 208], %g3 + ldx [%sp + 2047 + 216], %g4 + ldx [%sp + 2047 + 224], %g5 + ldx [%sp + 2047 + 232], %g6 + ldx [%sp + 2047 + 240], %g7 - add %sp, 56, %sp + add %sp, 248, %sp jmp %o7+8 nop

1 0

Re: [OpenBIOS] patch that causes a regression with Mac OS X booting
by Programmingkid 14 Dec '15

14 Dec '15

On Dec 11, 2015, at 6:28 AM, Mark Cave-Ayland wrote: > On 10/12/15 15:02, Programmingkid wrote: > >> https://lists.gnu.org/archive/html/qemu-devel/2015-10/msg05556.html >> >> From the message in the link, you said there was a patch that is needed to boot Mac OS 9, but can't be applied because it causes a regression with Mac OS X. Could you send me the patch. I would like to fix it so that all the patches needed to boot Mac OS 9 can be applied to OpenBIOS. Thanks. > > The outstanding OpenBIOS patch is this one: > > http://www.openfirmware.info/pipermail/openbios/2015-August/008763.html > > The reason it can't be applied is a little complicated. The MacOS 9 > bootloader alters the call stack using >r and r> which is illegal > outside of a word in Forth - it's like a function changing it's stack > pointing and hoping the caller can cope upon return. Apple really made something that does that? What were they thinking? I can only guess that they didn't like Forth. > I suspect the above patch only works through chance because OpenBIOS > uses a trampoline to execute words and so the trampoline is corrupted on > exit. It also causes yaboot to throw errors in my tests here, as found > on a Fedora PPC Linux for example which isn't a good solution either :( Given the info about how Mac OS 9 corrupts the call stack, maybe we could make it so that this patch only works when booting Mac OS 9. So that leads to the question - How do we know when Mac OS 9 is booting? There are several tags in the bootx and yaboot files that can be used to help. The <DESCRIPTION> tag looks like this in yaboot (Used by Linux): <DESCRIPTION> PowerPC GNU/Linux First Stage Bootstrap </DESCRIPTION> It looks like this in Mac OS 9's boot script: <DESCRIPTION> MacROM for NewWorld. </DESCRIPTION> It looks like this in Mac OS X's bootx: <DESCRIPTION> Boot Loader for Mac OS X. </DESCRIPTION> Maybe something like this can be added to OpenBIOS: if(strcmp(descriptionString, "MacROM for NewWorld.") == 0) // Mac OS 9 { using_Mac_OS_9 = true; } Given that the patch looks like this: - i c@ 0a = if + i c@ dup 0a = swap 0d = or if This might be the solution: i c@ /* common to both conditions, so always execute it */ if(using_Mac_OS_9 == true) { 0a = if } else { dup 0a = swap 0d = or if } The if/else code would probably be in forth. Setting the using_Mac_OS_9 variable can be done in C. Does this solution sound good? I know you are not convinced the code added in the patch is the right way to do things, do you have an idea what might be a better solution? Something that isn't so hacky?

2 2

Re: [OpenBIOS] patch that causes a regression with Mac OS X booting
by Programmingkid 13 Dec '15

13 Dec '15

On Dec 11, 2015, at 6:28 AM, Mark Cave-Ayland wrote: > On 10/12/15 15:02, Programmingkid wrote: > >> https://lists.gnu.org/archive/html/qemu-devel/2015-10/msg05556.html >> >> From the message in the link, you said there was a patch that is needed to boot Mac OS 9, but can't be applied because it causes a regression with Mac OS X. Could you send me the patch. I would like to fix it so that all the patches needed to boot Mac OS 9 can be applied to OpenBIOS. Thanks. > > The outstanding OpenBIOS patch is this one: > > http://www.openfirmware.info/pipermail/openbios/2015-August/008763.html > > The reason it can't be applied is a little complicated. The MacOS 9 > bootloader alters the call stack using >r and r> which is illegal > outside of a word in Forth - it's like a function changing it's stack > pointing and hoping the caller can cope upon return. > > I suspect the above patch only works through chance because OpenBIOS > uses a trampoline to execute words and so the trampoline is corrupted on > exit. It also causes yaboot to throw errors in my tests here, as found > on a Fedora PPC Linux for example which isn't a good solution either :( I was able to boot Debian Linux using the same OpenBIOS binary that is used to boot Mac OS 9. Debian uses the Quik loader. Is Fedora PPC the only operating system with the problem? Do you have a link to the image file you use for testing?

1 0

[PATCH v3] Add revision number to banner
by Programmingkid 05 Dec '15

05 Dec '15

The banner is displayed at the start of openbios with the version and build time. This patch adds the revision number for easier identification of binary version. It would look like this: Welcome to OpenBIOS v1.1 (Revision 1358) built on Nov 28 2015 18:22 If the user doesn't have the svn command, git command, or an svn repo, the word "unknown" is used instead of the number. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> New in revision 3: Added support for a variable length repo number. New in revision 2: Added support for git if the repo is being managed by it. Index: Makefile.target =================================================================== --- Makefile.target (revision 1358) +++ Makefile.target (working copy) @@ -52,11 +52,21 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs +# Set the REVISION variable to the current svn revision or to "unknown" +REVISION := $(shell svn info .. | grep "Revision: " | cut -d ' ' -f 2) +ifeq ($(REVISION),) # Try using git to find the revision number + REVISION := $(shell git svn log --oneline -1 | cut -d '|' -f1 | cut -d 'r' -f2 | cut -d ' ' -f 1) +endif +ifeq ($(REVISION),) # if both svn and git failed to find a revision number + REVISION = "unknown" +endif + $(ODIR)/forth/version.fs: $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ + echo ": version \" $(VERSION)\" ; " ; \ + echo ": revision \" $(REVISION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: @@ -63,7 +73,8 @@ $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ - echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_REVISION \"$(REVISION)\"" ; ) \ > $(dir $(a))/openbios-version.h info: Index: forth/admin/banner.fs =================================================================== --- forth/admin/banner.fs (revision 1358) +++ forth/admin/banner.fs (working copy) @@ -9,8 +9,8 @@ ; to builtin-logo :noname - builddate s" built on " version s" Welcome to OpenBIOS v" pocket - tmpstrcat tmpstrcat tmpstrcat drop + builddate s" ) built on " revision s" (Revision " version s" Welcome to OpenBIOS v" pocket + tmpstrcat tmpstrcat tmpstrcat tmpstrcat tmpstrcat drop ; to builtin-banner : suppress-banner ( -- )

4 11

[PATCH] Add revision number to banner
by Programmingkid 04 Dec '15

04 Dec '15

The banner is displayed at the start of openbios with the version and build time. This patch adds the revision number for easier identification of binary version. It would look like this: Welcome to OpenBIOS v1.1 (Revision 1358) built on Nov 28 2015 18:22 If the user doesn't have the svn command or an svn repo, the word "unknown" is used instead of the number. signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: Makefile.target =================================================================== --- Makefile.target (revision 1358) +++ Makefile.target (working copy) @@ -52,11 +52,18 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs +# Set the REVISION variable to the current svn revision or to "unknown" +REVISION := $(shell svn info .. | grep "Revision: " | cut -c11-16) +ifeq ($(REVISION),) +REVISION = "unknown" +endif + $(ODIR)/forth/version.fs: $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ + echo ": version \" $(VERSION)\" ; " ; \ + echo ": revision \" $(REVISION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: @@ -63,7 +70,8 @@ $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ - echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_REVISION \"$(REVISION)\"" ; ) \ > $(dir $(a))/openbios-version.h info: Index: forth/admin/banner.fs =================================================================== --- forth/admin/banner.fs (revision 1358) +++ forth/admin/banner.fs (working copy) @@ -9,8 +9,8 @@ ; to builtin-logo :noname - builddate s" built on " version s" Welcome to OpenBIOS v" pocket - tmpstrcat tmpstrcat tmpstrcat drop + builddate s" ) built on " revision s" (Revision " version s" Welcome to OpenBIOS v" pocket + tmpstrcat tmpstrcat tmpstrcat tmpstrcat tmpstrcat drop ; to builtin-banner : suppress-banner ( -- )

3 6

Re: [OpenBIOS] (no subject)
by Mark Cave-Ayland 03 Dec '15

03 Dec '15

On 03/12/15 03:16, Inon Fefer wrote: > Please remove me from this list > > > -- > OpenBIOS http://openbios.org/ > Mailinglist: http://lists.openbios.org/mailman/listinfo > Free your System - May the Forth be with you Hi Inon, As per the mailing list footer, you can use the link above to manage your subscription including unsubscribing from the mailing list. If after this you are still experiencing problems, please contact me off-list. ATB, Mark.

1 0

(no subject)
by Inon Fefer 03 Dec '15

03 Dec '15

Please remove me from this list

1 0

[PATCH v2] Add revision number to banner
by Programmingkid 02 Dec '15

02 Dec '15

The banner is displayed at the start of openbios with the version and build time. This patch adds the revision number for easier identification of binary version. It would look like this: Welcome to OpenBIOS v1.1 (Revision 1358) built on Nov 28 2015 18:22 If the user doesn't have the svn command or an svn repo, the word "unknown" is used instead of the number. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> New in revision 2: Added support for git if the repo is being managed by it. Index: Makefile.target =================================================================== --- Makefile.target (revision 1358) +++ Makefile.target (working copy) @@ -52,11 +52,21 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs +# Set the REVISION variable to the current svn revision or to "unknown" +REVISION := $(shell svn info .. | grep "Revision: " | cut -c11-16) +ifeq ($(REVISION),) # Try using git to find the revision number + REVISION := $(shell git svn log --oneline -1 | cut -d '|' -f1 | cut -c2-5) +endif +ifeq ($(REVISION),) # if both svn and git failed to find a revision number + REVISION = "unknown" +endif + $(ODIR)/forth/version.fs: $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ - echo ": version \" $(VERSION)\" ; " ; ) \ + echo ": version \" $(VERSION)\" ; " ; \ + echo ": revision \" $(REVISION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: @@ -63,7 +73,8 @@ $(call quiet-command,true, " GEN $(TARGET_DIR)$@") @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ - echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; ) \ + echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ + echo "#define OPENBIOS_REVISION \"$(REVISION)\"" ; ) \ > $(dir $(a))/openbios-version.h info: Index: forth/admin/banner.fs =================================================================== --- forth/admin/banner.fs (revision 1358) +++ forth/admin/banner.fs (working copy) @@ -9,8 +9,8 @@ ; to builtin-logo :noname - builddate s" built on " version s" Welcome to OpenBIOS v" pocket - tmpstrcat tmpstrcat tmpstrcat drop + builddate s" ) built on " revision s" (Revision " version s" Welcome to OpenBIOS v" pocket + tmpstrcat tmpstrcat tmpstrcat tmpstrcat tmpstrcat drop ; to builtin-banner : suppress-banner ( -- )

2 2

Re: [OpenBIOS] [Qemu-devel] [Qemu-ppc] CUDA has problems with Mac OS 10.4
by Mark Cave-Ayland 25 Nov '15

25 Nov '15

On 24/11/15 09:01, Alfonso Gamboa wrote: > These images are definitely helpful, however what would be really useful > to know is exactly what the modules in question do: > > - Multiprocessing (maybe uses a currently unimplemented CPU instruction > to facilitate faster multitasking?) > > - Open Transport ASLM Modules (no idea what these do) > > - Apple Audio Extension Module (is this just a standard sound driver or > other? I did get a backtrace once suggesting that it was trying to > access digital CDROM audio which is why it crashed. Then again if it > thinks that the CDROM is a HD then that's not going to help too much > here either). > > The "Multiprocessing" folder contains a file named "Apple CPU Plugins" > of type cpup. Looking at the resource "cpups", it seems to contain code > to supplement the OS to support various newer CPUs and architectures. > The resources in the file are named (and contain): > > PowerSurge2PPlugin: > "hammerhead" (old clone computers based off multiple PPC 604I believe) > > G3Plugin: > Powerbook1,1 > > Core99Plugin: > uni-north > keylargo > PowerMac2,1 > PowerMac2,2 > PowerMac3,4 > PowerMac3,5 > PowerMac4,1 > PowerBook3,3 > PowerBook3,4 Now the mac99 machine defines itself as "PowerMac3,1" so that might suggest that it is something in the keylargo/uni-north code that is causing the problem. Is there a way to somehow disable the individual resources in the Core99Plugin in order to determine which one is the culprit? > The "Open Transport ASLM Modules" file seem to be a collection of shared > libraries, since many programs, once this file is removed from the > extensions folder, refuses to run, for example Apple System Profiler. > OTLib$NBPScnr, OTLib$SerIAB are some examples of shared libraries > contained within this file. This is verified from the book "Sad Macs, > Bombs, and Other Disasters: And what to Do about Them By Ted Landau > , see https://goo.gl/TVm9Tt" > > I will do more research. A good starting point is the "Apple Audio Extension Module" since that seems to cause havoc on load. Do you know any good tutorials on how to debug an extension module on load i.e. how to step through its initialisation? Unfortunately there doesn't seem to be much related documentation around these days. ATB, Mark.

1 0

Re: [OpenBIOS] [Qemu-devel] [Qemu-ppc] CUDA has problems with Mac OS 10.4
by Mark Cave-Ayland 24 Nov '15

24 Nov '15

On 24/11/15 05:23, Alfonso Gamboa wrote: > Here are some links I packaged for the emaculation forum, included is an > image with macsbug installed already. I had success booting to desktop. > > Note: it seems as time goes by, booting several times using the ISO > images corrupts them, resulting in failed boots with crashes at the boot > splash screen. Crashes will continue until you replace them with fresh > ones from the zip files. Reasons as to why are unknown at this time. Yeah I noticed when booting from a CDROM that my open windows are remembered across sessions(!). This makes me think that OS 9 thinks the HFS volume is a HD rather than a CDROM and so mounts it read/write on boot. How would I find this out in OS9? > Resedit, Stuffit, Toast, Disk Copy, utilities in an ISO to mount within > QEMU: > http://bebop.gtxent.com/qemu_os9_utilities.iso.zip > > MacOS 9.2.2 bootable image(extensions all removed): > http://bebop.gtxent.com/os922_uni.iso.zip > > MacOS 9.2.1 bootable image(extensions all removed): > http://bebop.gtxent.com/os92_test.iso.zip > > MacOS 9.2.1 bootable image with macsbug (extensions all removed): > http://bebop.gtxent.com/os92_test_macsbug.iso.zip These images are definitely helpful, however what would be really useful to know is exactly what the modules in question do: - Multiprocessing (maybe uses a currently unimplemented CPU instruction to facilitate faster multitasking?) - Open Transport ASLM Modules (no idea what these do) - Apple Audio Extension Module (is this just a standard sound driver or other? I did get a backtrace once suggesting that it was trying to access digital CDROM audio which is why it crashed. Then again if it thinks that the CDROM is a HD then that's not going to help too much here either). ATB, Mark.

2 2

Re: [OpenBIOS] [Qemu-devel] [Qemu-ppc] CUDA has problems with Mac OS 10.4
by Mark Cave-Ayland 24 Nov '15

24 Nov '15

On 20/11/15 17:06, Alfonso Gamboa wrote: > booting into MacOS9 with qemu to the Desktop is now possible, see: > > http://www.emaculation.com/forum/viewtopic.php?f=34&t=7047&start=250 > > Some issues, remain, certain extensions crash on boot. Hi Alfonso, Has there been any progress at all as to which extensions may be causing the crashes? ATB, Mark.

3 10

openbios cross compile fails with gcc 5.2
by Cole Robinson 21 Nov '15

21 Nov '15

Hi all, openbios fails to build with gcc 5.2 cross compilers. This is using fedora 23 packages. There's a bug here with complete info: https://bugzilla.redhat.com/show_bug.cgi?id=1282890 The error is: powerpc64-linux-gnu-gcc $EXTRACFLAGS -m32 -msoft-float -fno-builtin-bcopy -fno-builtin-log2 -Os -g -DNATIVE_BITWIDTH_EQUALS_HOST_BITWIDTH -USWAP_ENDIANNESS -Wall -Wredundant-decls -Wshadow -Wpointer-arith -Wstrict-prototypes -Wmissing-declarations -Wundef -Wendif-labels -Wstrict-aliasing -Wwrite-strings -Wmissing-prototypes -Wnested-externs -Werror -MMD -MP -MT target/arch/ppc/qemu/ofmem.o -MF 'target/arch/ppc/qemu/ofmem.d' -I/root/openbios/openbios-1.1/include -I/root/openbios/openbios-1.1/kernel/include -I./target/include -c -o target/arch/ppc/qemu/ofmem.o /root/openbios/openbios-1.1/arch/ppc/qemu/ofmem.c /tmp/ccznzzOd.s: Assembler messages: /tmp/ccznzzOd.s:551: Error: missing operand rules.mak:309: recipe for target 'target/arch/ppc/qemu/ofmem.o' failed make[1]: *** [target/arch/ppc/qemu/ofmem.o] Error 1 make[1]: *** Waiting for unfinished jobs.... make[1]: Leaving directory '/root/openbios/openbios-1.1/obj-ppc' Makefile:32: recipe for target 'subdir-ppc' failed make: *** [subdir-ppc] Error 2 error: Bad exit status from /var/tmp/rpm-tmp.DSB86j (%build) David Howells' commented in the bug with a suggested fix... but I don't even have a setup to test openbios so I'd prefer if someone else cooks up the patch :) Thanks, Cole

4 3