OpenBIOS November 2014

openbios@openbios.org

4 participants
8 discussions

[PATCH] package.fs: fix "child" word being called with a NULL phandle
by Mark Cave-Ayland 23 Nov '14

23 Nov '14

Solaris 9 relies on an undocumented feature that calling "child" with a NULL phandle is equivalent to using the phandle of the device tree root node. Make sure that we emulate the same behaviour to avoid a crash when dereferencing a NULL pointer. This patch fixes Solaris 9 boot on SPARC32 and is based upon a proof-of-concept patch submitted by Artyom Tarasenko <atar4qemu(a)gmail.com>. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- openbios-devel/forth/device/package.fs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/openbios-devel/forth/device/package.fs b/openbios-devel/forth/device/package.fs index eb17551..d5b52c3 100644 --- a/openbios-devel/forth/device/package.fs +++ b/openbios-devel/forth/device/package.fs @@ -49,6 +49,10 @@ ; : child ( phandle.parent -- phandle.child ) + \ Assume phandle == 0 indicates root node (not documented but similar + \ behaviour to "peer"). Used by some versions of Solaris (e.g. 9). + ?dup if else device-tree @ then + >dn.child @ ; -- 1.7.10.4

2 1

[PATCH 0/4] Move interrupt mapping routines to post-PCI bus scan
by Mark Cave-Ayland 14 Nov '14

14 Nov '14

This patch fixes up a regression with virtio not working under the latest OpenBIOS SPARC64. The error was introduced by the new interrupt routing code which needs to generate interrupt-map properties based upon the current active PCI slot (previously the OS would determine this automatically as the properties weren't present in the device tree). In its current form, the code works by hard-coding the slots for the network and disk devices; however this fails to map the interrupt for devices added at QEMU runtime via device such as virtio. This patchset fixes this problem in the following way: 1) Move the PCI host interrupt setup from out of the per-device host bridge callback (called generally towards the start of the PCI bus scan) and into a separate function called after the entire PCI bus has been scanned 2) Add code to dynamically generate the interrupt-map property for slots containing devices with an interrupt pin once the PCI bus scan is complete 3) As a bonus: tidy up the openpic interrupt mapping into the same routine I believe there is a strong case for getting this patchset into the upcoming QEMU 2.2 release, so please let me know if there are any great objections. Mark Cave-Ayland (4): pci.c: remove unneeded CONFIG_PPC define pci.c: rework pci_host_set_interrupt_map() to use phandle_t rather than pci_config_t macio.c: move openpic interrupt map initialisation to after PCI bus scan pci.c: move openpic interrupt mapping to post-PCI-bus scan openbios-devel/drivers/macio.c | 40 --------- openbios-devel/drivers/pci.c | 185 +++++++++++++++++++++++++--------------- 2 files changed, 116 insertions(+), 109 deletions(-) -- 1.7.10.4

2 6

[commit] r1327 - trunk/openbios-devel/drivers
by repository service 14 Nov '14

14 Nov '14

Author: mcayland Date: Fri Nov 14 20:17:48 2014 New Revision: 1327 URL: http://tracker.coreboot.org/trac/openbios/changeset/1327 Log: SPARC64: fix interrupt mapping for PCI slots Instead of using hard-coded interrupt mappings for the NE2000 (slot 4) and CMD646 (slot 5) devices, we can now interrogate the device tree after the PCI scan to locate any devices with interrupt pins and map them accordingly. This fixes the regression with PCI devices added with QEMU's -device syntax not having their interrupt pins mapped (particularly virtio devices). 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 Nov 14 20:17:45 2014 (r1326) +++ trunk/openbios-devel/drivers/pci.c Fri Nov 14 20:17:48 2014 (r1327) @@ -417,10 +417,6 @@ set_property(dev, "bus-range", (char *)props, 2 * sizeof(props[0])); } -/* Convert device/irq pin to interrupt property */ -#define SUN4U_INTERRUPT(dev, irq_pin) \ - ((((dev >> 11) << 2) + irq_pin - 1) & 0x1f) - static void pci_host_set_reg(phandle_t phandle) { phandle_t dev = phandle; @@ -1375,14 +1371,19 @@ set_property(host, "available", (char *)props, ncells * sizeof(props[0])); } +/* Convert device/irq pin to interrupt property */ +#define SUN4U_INTERRUPT(dev, irq_pin) \ + ((((dev >> 11) << 2) + irq_pin - 1) & 0x1f) + static void ob_pci_host_set_interrupt_map(phandle_t host) { -#if defined(CONFIG_PPC) phandle_t dnode = 0; - u32 props[56]; - phandle_t target_node; + u32 props[128]; int i; +#if defined(CONFIG_PPC) + phandle_t target_node; + /* Oldworld macs do interrupt maps differently */ if (!is_newworld()) return; @@ -1437,20 +1438,40 @@ set_property(host, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); } #elif defined(CONFIG_SPARC64) - uint32_t props[12]; - int ncells, device, i; + int ncells, len; + u32 *val, addr; + char *reg; - /* Set interrupt-map for devices 4 (NE2000) and 5 (CMD646) */ + /* Set interrupt-map for PCI devices with an interrupt pin present */ ncells = 0; - for (i = 4; i <= 5; i++) { - device = i << 11; - ncells += pci_encode_phys_addr(props + ncells, 0, 0, device, 0, 0); - props[ncells++] = 1; - props[ncells++] = host; - props[ncells++] = SUN4U_INTERRUPT(device, 1); - } + PUSH(host); + fword("child"); + dnode = POP(); + while (dnode) { + if (get_int_property(dnode, "interrupts", &len)) { + reg = get_property(dnode, "reg", &len); + if (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)) { + 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); + } + } + } + } + PUSH(dnode); + fword("peer"); + dnode = POP(); + } set_property(host, "interrupt-map", (char *)props, ncells * sizeof(props[0])); props[0] = 0x0000f800;

1 0

[commit] r1326 - trunk/openbios-devel/drivers
by repository service 14 Nov '14

14 Nov '14

Author: mcayland Date: Fri Nov 14 20:17:45 2014 New Revision: 1326 URL: http://tracker.coreboot.org/trac/openbios/changeset/1326 Log: pci.c: move SPARC64 PCI interrupt mapping to post-PCI-bus scan Move the PCI interrupt mapping from the pre-scan pci_host_set_interrupt_map() to the post-scan ob_pci_host_set_interrupt_map() function. As a consequence of this we can remove pci_host_set_interrupt_map() since it is now now longer used. 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 Nov 14 20:17:43 2014 (r1325) +++ trunk/openbios-devel/drivers/pci.c Fri Nov 14 20:17:45 2014 (r1326) @@ -421,41 +421,6 @@ #define SUN4U_INTERRUPT(dev, irq_pin) \ ((((dev >> 11) << 2) + irq_pin - 1) & 0x1f) -static void pci_host_set_interrupt_map(phandle_t dev) -{ -/* XXX We currently have a hook in the MPIC init code to fill in its handle. - * If you want to have interrupt maps for your PCI host bus, add your - * architecture to the #if and make your bridge detect code fill in its - * handle too. - * - * It would be great if someone clever could come up with a more universal - * mechanism here. - */ -#if defined(CONFIG_SPARC64) - uint32_t props[12]; - int ncells, device, i; - - /* Set interrupt-map for devices 4 (NE2000) and 5 (CMD646) */ - ncells = 0; - for (i = 4; i <= 5; i++) { - device = i << 11; - - ncells += pci_encode_phys_addr(props + ncells, 0, 0, device, 0, 0); - props[ncells++] = 1; - props[ncells++] = dev; - props[ncells++] = SUN4U_INTERRUPT(device, 1); - } - - set_property(dev, "interrupt-map", (char *)props, ncells * sizeof(props[0])); - - props[0] = 0x0000f800; - props[1] = 0x0; - props[2] = 0x0; - props[3] = 7; - set_property(dev, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); -#endif -} - static void pci_host_set_reg(phandle_t phandle) { phandle_t dev = phandle; @@ -522,7 +487,6 @@ //XXX this overrides "reg" property pci_host_set_reg(get_cur_dev()); pci_host_set_ranges(config); - pci_host_set_interrupt_map(get_cur_dev()); return 0; } @@ -1472,6 +1436,28 @@ set_property(host, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); } +#elif defined(CONFIG_SPARC64) + uint32_t props[12]; + int ncells, device, i; + + /* Set interrupt-map for devices 4 (NE2000) and 5 (CMD646) */ + ncells = 0; + for (i = 4; i <= 5; i++) { + device = i << 11; + + ncells += pci_encode_phys_addr(props + ncells, 0, 0, device, 0, 0); + props[ncells++] = 1; + props[ncells++] = host; + props[ncells++] = SUN4U_INTERRUPT(device, 1); + } + + set_property(host, "interrupt-map", (char *)props, ncells * sizeof(props[0])); + + props[0] = 0x0000f800; + props[1] = 0x0; + props[2] = 0x0; + props[3] = 7; + set_property(host, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); #endif }

1 0

[commit] r1325 - trunk/openbios-devel/drivers
by repository service 14 Nov '14

14 Nov '14

Author: mcayland Date: Fri Nov 14 20:17:43 2014 New Revision: 1325 URL: http://tracker.coreboot.org/trac/openbios/changeset/1325 Log: pci.c: move PPC openpic interrupt mapping to post-PCI-bus scan Move the openpic interrupt mapping from the pre-scan pci_host_set_interrupt_map() to the post-scan ob_pci_host_set_interrupt_map() function. 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 Nov 14 20:17:40 2014 (r1324) +++ trunk/openbios-devel/drivers/pci.c Fri Nov 14 20:17:43 2014 (r1325) @@ -431,32 +431,7 @@ * It would be great if someone clever could come up with a more universal * mechanism here. */ -#if defined(CONFIG_PPC) - u32 props[7 * 8]; - int i; - - /* Oldworld macs do interrupt maps differently */ - if(!is_newworld()) - return; - - 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] = 0; // gets patched in later - props[i+PCI_INT_MAP_PIC_INT] = arch->irqs[i / 7]; - props[i+PCI_INT_MAP_PIC_POL] = 3; - } - set_property(dev, "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(dev, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); -#elif defined(CONFIG_SPARC64) +#if defined(CONFIG_SPARC64) uint32_t props[12]; int ncells, device, i; @@ -1440,9 +1415,9 @@ { #if defined(CONFIG_PPC) phandle_t dnode = 0; + u32 props[56]; phandle_t target_node; - u32 *interrupt_map; - int len, i; + int i; /* Oldworld macs do interrupt maps differently */ if (!is_newworld()) @@ -1478,11 +1453,24 @@ target_node = find_dev("/pci"); set_int_property(target_node, "interrupt-parent", dnode); - interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len); - for (i = 0; i < 8; i++) { - interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)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(target_node, "interrupt-map", (char *)interrupt_map, len); + 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])); } #endif }

1 0

[commit] r1324 - trunk/openbios-devel/drivers
by repository service 14 Nov '14

14 Nov '14

Author: mcayland Date: Fri Nov 14 20:17:40 2014 New Revision: 1324 URL: http://tracker.coreboot.org/trac/openbios/changeset/1324 Log: macio.c: move openpic interrupt map initialisation to after PCI bus scan Here we move the interrupt initialisation from openpic_init to a new post-bus scan function called ob_pci_host_set_interrupt_map(). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/drivers/macio.c trunk/openbios-devel/drivers/pci.c Modified: trunk/openbios-devel/drivers/macio.c ============================================================================== --- trunk/openbios-devel/drivers/macio.c Fri Nov 14 20:17:38 2014 (r1323) +++ trunk/openbios-devel/drivers/macio.c Fri Nov 14 20:17:40 2014 (r1324) @@ -162,7 +162,6 @@ static void openpic_init(const char *path, phys_addr_t addr) { - phandle_t target_node; phandle_t dnode; int props[2]; char buf[128]; @@ -187,45 +186,6 @@ set_int_property(dnode, "clock-frequency", 4166666); fword("finish-device"); - - u32 *interrupt_map; - int len, i; - - /* patch in interrupt parent */ - dnode = find_dev(buf); - - target_node = find_dev("/pci/mac-io"); - set_int_property(target_node, "interrupt-parent", dnode); - - target_node = find_dev("/pci/mac-io/escc/ch-a"); - set_int_property(target_node, "interrupt-parent", dnode); - - target_node = find_dev("/pci/mac-io/escc/ch-b"); - set_int_property(target_node, "interrupt-parent", dnode); - - /* QEMU only emulates 2 of the 3 ata buses currently */ - /* 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"); - set_int_property(target_node, "interrupt-parent", dnode); - - target_node = find_dev("/pci/mac-io/ata-4"); - set_int_property(target_node, "interrupt-parent", dnode); - - target_node = find_dev("/pci/mac-io/via-cuda"); - set_int_property(target_node, "interrupt-parent", dnode); - - target_node = find_dev("/pci"); - set_int_property(target_node, "interrupt-parent", dnode); - - interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len); - for (i = 0; i < 8; i++) { - interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode; - } - set_property(target_node, "interrupt-map", (char *)interrupt_map, len); } DECLARE_NODE(ob_macio, INSTALL_OPEN, sizeof(int), "Tmac-io"); Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Fri Nov 14 20:17:38 2014 (r1323) +++ trunk/openbios-devel/drivers/pci.c Fri Nov 14 20:17:40 2014 (r1324) @@ -1436,6 +1436,57 @@ set_property(host, "available", (char *)props, ncells * sizeof(props[0])); } +static void ob_pci_host_set_interrupt_map(phandle_t host) +{ +#if defined(CONFIG_PPC) + phandle_t dnode = 0; + phandle_t target_node; + u32 *interrupt_map; + int len, i; + + /* Oldworld macs do interrupt maps differently */ + if (!is_newworld()) + return; + + dnode = dt_iterate_type(0, "open-pic"); + if (dnode) { + /* patch in openpic interrupt-parent properties */ + target_node = find_dev("/pci/mac-io"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-a"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/escc/ch-b"); + set_int_property(target_node, "interrupt-parent", dnode); + + /* QEMU only emulates 2 of the 3 ata buses currently */ + /* 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"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/ata-4"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci/mac-io/via-cuda"); + set_int_property(target_node, "interrupt-parent", dnode); + + target_node = find_dev("/pci"); + set_int_property(target_node, "interrupt-parent", dnode); + + interrupt_map = (u32 *)get_property(target_node, "interrupt-map", &len); + for (i = 0; i < 8; i++) { + interrupt_map[(i * 7) + PCI_INT_MAP_PIC_HANDLE] = (u32)dnode; + } + set_property(target_node, "interrupt-map", (char *)interrupt_map, len); + } +#endif +} + int ob_pci_init(void) { int bus, devnum, fn; @@ -1494,6 +1545,9 @@ /* create available attributes for the PCI bridge */ ob_pci_set_available(phandle_host, mem_base, io_base); + /* configure the host bridge interrupt map */ + ob_pci_host_set_interrupt_map(phandle_host); + device_end(); return 0;

1 0

[commit] r1323 - trunk/openbios-devel/drivers
by repository service 14 Nov '14

14 Nov '14

Author: mcayland Date: Fri Nov 14 20:17:38 2014 New Revision: 1323 URL: http://tracker.coreboot.org/trac/openbios/changeset/1323 Log: pci.c: rework pci_host_set_interrupt_map() to use phandle_t rather than pci_config_t This is in preparation for some further work to set the interrupt map after the PCI bus has been enumerated. 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 Nov 14 20:17:35 2014 (r1322) +++ trunk/openbios-devel/drivers/pci.c Fri Nov 14 20:17:38 2014 (r1323) @@ -421,7 +421,7 @@ #define SUN4U_INTERRUPT(dev, irq_pin) \ ((((dev >> 11) << 2) + irq_pin - 1) & 0x1f) -static void pci_host_set_interrupt_map(const pci_config_t *config) +static void pci_host_set_interrupt_map(phandle_t dev) { /* XXX We currently have a hook in the MPIC init code to fill in its handle. * If you want to have interrupt maps for your PCI host bus, add your @@ -432,7 +432,6 @@ * mechanism here. */ #if defined(CONFIG_PPC) - phandle_t dev = get_cur_dev(); u32 props[7 * 8]; int i; @@ -458,7 +457,6 @@ set_property(dev, "interrupt-map-mask", (char *)props, 4 * sizeof(props[0])); #elif defined(CONFIG_SPARC64) - phandle_t dev = get_cur_dev(); uint32_t props[12]; int ncells, device, i; @@ -469,7 +467,7 @@ ncells += pci_encode_phys_addr(props + ncells, 0, 0, device, 0, 0); props[ncells++] = 1; - props[ncells++] = get_cur_dev(); + props[ncells++] = dev; props[ncells++] = SUN4U_INTERRUPT(device, 1); } @@ -549,7 +547,7 @@ //XXX this overrides "reg" property pci_host_set_reg(get_cur_dev()); pci_host_set_ranges(config); - pci_host_set_interrupt_map(config); + pci_host_set_interrupt_map(get_cur_dev()); return 0; }

1 0

[commit] r1322 - trunk/openbios-devel/drivers
by repository service 14 Nov '14

14 Nov '14

Author: mcayland Date: Fri Nov 14 20:17:35 2014 New Revision: 1322 URL: http://tracker.coreboot.org/trac/openbios/changeset/1322 Log: pci.c: remove unneeded CONFIG_PPC define This is already covered by the surrounding define. 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 Tue Oct 21 21:47:33 2014 (r1321) +++ trunk/openbios-devel/drivers/pci.c Fri Nov 14 20:17:35 2014 (r1322) @@ -436,11 +436,9 @@ u32 props[7 * 8]; int i; -#if defined(CONFIG_PPC) /* Oldworld macs do interrupt maps differently */ if(!is_newworld()) return; -#endif for (i = 0; i < (7*8); i+=7) { props[i+PCI_INT_MAP_PCI0] = 0;

1 0