OpenBIOS

openbios@openbios.org

4289 discussions

[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

Jump to page: