diff options
| author |   kettenis <kettenis@openbsd.org> | 2019-07-26 11:33:05 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2019-07-26 11:33:05 +0000 |
| commit | 840a6881aa40194fe38ca261f948542458d3c552 (patch) | |
| tree | a9e1cb12e045c03c7654ed495954e9e552972c3b | |
| parent | The strncat test is passing, do not add it to expected failures. (diff) | |
| download | wireguard-openbsd-840a6881aa40194fe38ca261f948542458d3c552.tar.xz wireguard-openbsd-840a6881aa40194fe38ca261f948542458d3c552.zip | |
Recognize PCI busses that don't support INTx and refuse to map legacy on
such busses.
| -rw-r--r-- | sys/arch/sparc64/dev/vpci.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/sys/arch/sparc64/dev/vpci.c b/sys/arch/sparc64/dev/vpci.c index 6d3c88ef18c..069622c41bc 100644 --- a/sys/arch/sparc64/dev/vpci.c +++ b/sys/arch/sparc64/dev/vpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vpci.c,v 1.28 2019/07/25 22:45:53 kettenis Exp $ */ +/* $OpenBSD: vpci.c,v 1.29 2019/07/26 11:33:05 kettenis Exp $ */ /* * Copyright (c) 2008 Mark Kettenis <kettenis@openbsd.org> * @@ -111,6 +111,7 @@ pcireg_t vpci_conf_read(pci_chipset_tag_t, pcitag_t, int); void vpci_conf_write(pci_chipset_tag_t, pcitag_t, int, pcireg_t); int vpci_intr_map(struct pci_attach_args *, pci_intr_handle_t *); +int vpci_intr_nomap(struct pci_attach_args *, pci_intr_handle_t *); int vpci_bus_map(bus_space_tag_t, bus_space_tag_t, bus_addr_t, bus_size_t, int, bus_space_handle_t *); paddr_t vpci_bus_mmap(bus_space_tag_t, bus_space_tag_t, bus_addr_t, off_t, @@ -154,7 +155,7 @@ vpci_attach(struct device *parent, struct device *self, void *aux) struct pcibus_attach_args pba; struct vpci_pbm *pbm; int *busranges = NULL, nranges; - int virtual; + int virtual, intx; sc->sc_dmat = ma->ma_dmatag; sc->sc_bust = ma->ma_bustag; @@ -177,6 +178,9 @@ vpci_attach(struct device *parent, struct device *self, void *aux) printf(": bus %d to %d, ", busranges[0], busranges[1]); + virtual = (OF_getproplen(ma->ma_node, "virtual-root-complex") == 0); + intx = (OF_getproplen(ma->ma_node, "pci-intx-not-supported") != 0); + pbm->vp_memt = vpci_alloc_mem_tag(pbm); pbm->vp_iot = vpci_alloc_io_tag(pbm); pbm->vp_dmat = vpci_alloc_dma_tag(pbm); @@ -199,7 +203,7 @@ vpci_attach(struct device *parent, struct device *self, void *aux) pba.pba_pc->conf_size = vpci_conf_size; pba.pba_pc->conf_read = vpci_conf_read; pba.pba_pc->conf_write = vpci_conf_write; - pba.pba_pc->intr_map = vpci_intr_map; + pba.pba_pc->intr_map = (intx ? vpci_intr_map : vpci_intr_nomap); free(busranges, M_DEVBUF, 0); @@ -209,7 +213,6 @@ vpci_attach(struct device *parent, struct device *self, void *aux) * Signal that we're ready to share this root complex with our * guests. */ - virtual = (OF_getproplen(ma->ma_node, "virtual-root-complex") == 0); if (sun4v_group_sdio_major > 0 && !virtual) { int err; @@ -371,6 +374,12 @@ vpci_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp) return (-1); } +int +vpci_intr_nomap(struct pci_attach_args *pa, pci_intr_handle_t *ihp) +{ + return (-1); +} + bus_space_tag_t vpci_alloc_mem_tag(struct vpci_pbm *pp) { |