diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-06-02 18:40:59 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2019-06-02 18:40:59 +0000 |
| commit | 75dceccfa6e847f7e69b8cbf3c465a6a2d36779f (patch) | |
| tree | 45bc38e7518ef6f9edd32494315d14bf40900c5f /sys/arch/arm64/include/pci_machdep.h | |
| parent | 9a23cf5c5422ad9d903f79f5ba93bff952e6b7b2 (diff) | |
Change pci_intr_handle_t into a struct and replace duplicated code that
implements mapping of MSI and MSI-X interrupts with new generic functions.
Fixes a use-after-free in sone PCI device drivers that call pci_intr_string(9)
after pci_intr_establish(9).
ok deraadt@
Diffstat (limited to 'sys/arch/arm64/include/pci_machdep.h')
| -rw-r--r-- | sys/arch/arm64/include/pci_machdep.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/sys/arch/arm64/include/pci_machdep.h b/sys/arch/arm64/include/pci_machdep.h index 884e91889d6..5507cb98446 100644 --- a/sys/arch/arm64/include/pci_machdep.h +++ b/sys/arch/arm64/include/pci_machdep.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pci_machdep.h,v 1.4 2019/05/31 08:02:04 kettenis Exp $ */ +/* $OpenBSD: pci_machdep.h,v 1.5 2019/06/02 18:40:58 kettenis Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -28,7 +28,19 @@ typedef struct arm64_pci_chipset *pci_chipset_tag_t; typedef u_long pcitag_t; -typedef u_long pci_intr_handle_t; + +/* Supported interrupt types. */ +#define PCI_NONE 0 +#define PCI_INTX 1 +#define PCI_MSI 2 +#define PCI_MSIX 3 + +typedef struct { + pci_chipset_tag_t ih_pc; + pcitag_t ih_tag; + int ih_intrpin; + int ih_type; +} pci_intr_handle_t; struct pci_attach_args; @@ -103,3 +115,5 @@ pci_chipset_tag_t pci_lookup_segment(int); void pci_msi_enable(pci_chipset_tag_t, pcitag_t, bus_addr_t, uint32_t); void pci_msix_enable(pci_chipset_tag_t, pcitag_t, bus_space_tag_t, int, bus_addr_t, uint32_t); +int _pci_intr_map_msi(struct pci_attach_args *, pci_intr_handle_t *); +int _pci_intr_map_msix(struct pci_attach_args *, int, pci_intr_handle_t *); |