diff options
Diffstat (limited to 'sys/dev/fdt/mvkpcie.c')
| -rw-r--r-- | sys/dev/fdt/mvkpcie.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/sys/dev/fdt/mvkpcie.c b/sys/dev/fdt/mvkpcie.c index 67a294d7b47..1e3c96b5ae4 100644 --- a/sys/dev/fdt/mvkpcie.c +++ b/sys/dev/fdt/mvkpcie.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mvkpcie.c,v 1.5 2020/07/14 15:34:15 patrick Exp $ */ +/* $OpenBSD: mvkpcie.c,v 1.6 2020/07/14 15:42:19 patrick Exp $ */ /* * Copyright (c) 2018 Mark Kettenis <kettenis@openbsd.org> * Copyright (c) 2020 Patrick Wildt <patrick@blueri.se> @@ -233,12 +233,9 @@ void mvkpcie_conf_write(void *, pcitag_t, int, pcireg_t); int mvkpcie_intr_map(struct pci_attach_args *, pci_intr_handle_t *); const char *mvkpcie_intr_string(void *, pci_intr_handle_t); void *mvkpcie_intr_establish(void *, pci_intr_handle_t, int, - int (*)(void *), void *, char *); + struct cpu_info *, int (*)(void *), void *, char *); void mvkpcie_intr_disestablish(void *, void *); -void *mvkpcie_intr_establish(void *, pci_intr_handle_t, int, - int (*)(void *), void *, char *); - int mvkpcie_bs_iomap(bus_space_tag_t, bus_addr_t, bus_size_t, int, bus_space_handle_t *); int mvkpcie_bs_memmap(bus_space_tag_t, bus_addr_t, bus_size_t, int, @@ -734,7 +731,7 @@ mvkpcie_intr_string(void *v, pci_intr_handle_t ih) void * mvkpcie_intr_establish(void *v, pci_intr_handle_t ih, int level, - int (*func)(void *), void *arg, char *name) + struct cpu_info *ci, int (*func)(void *), void *arg, char *name) { struct mvkpcie_softc *sc = v; void *cookie; @@ -746,8 +743,8 @@ mvkpcie_intr_establish(void *v, pci_intr_handle_t ih, int level, /* Assume hardware passes Requester ID as sideband data. */ data = pci_requester_id(ih.ih_pc, ih.ih_tag); - cookie = fdt_intr_establish_msi(sc->sc_node, &addr, - &data, level, func, arg, (void *)name); + cookie = fdt_intr_establish_msi_cpu(sc->sc_node, &addr, + &data, level, ci, func, arg, (void *)name); if (cookie == NULL) return NULL; @@ -768,8 +765,8 @@ mvkpcie_intr_establish(void *v, pci_intr_handle_t ih, int level, reg[1] = reg[2] = 0; reg[3] = ih.ih_intrpin; - cookie = fdt_intr_establish_imap(sc->sc_node, reg, - sizeof(reg), level, func, arg, name); + cookie = fdt_intr_establish_imap_cpu(sc->sc_node, reg, + sizeof(reg), level, ci, func, arg, name); } return cookie; |