diff options
| author |   kettenis <kettenis@openbsd.org> | 2020-06-10 19:00:02 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2020-06-10 19:00:02 +0000 |
| commit | 314265fd31f61e514c5be6e99f045c7a986a8d3b (patch) | |
| tree | 98848c5b0325c82b0e6bc56d3901cd482b66eb40 | |
| parent | Avoid out-of-bounds access when dumping (faulty) edid info; as seen (diff) | |
| download | wireguard-openbsd-314265fd31f61e514c5be6e99f045c7a986a8d3b.tar.xz wireguard-openbsd-314265fd31f61e514c5be6e99f045c7a986a8d3b.zip | |
Another OPAL API that we need.
| -rw-r--r-- | sys/arch/powerpc64/include/opal.h | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc64/powerpc64/locore.S | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/sys/arch/powerpc64/include/opal.h b/sys/arch/powerpc64/include/opal.h index 5e999e10591..1fb16fc8159 100644 --- a/sys/arch/powerpc64/include/opal.h +++ b/sys/arch/powerpc64/include/opal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: opal.h,v 1.7 2020/06/10 16:30:02 kettenis Exp $ */ +/* $OpenBSD: opal.h,v 1.8 2020/06/10 19:00:02 kettenis Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> @@ -36,6 +36,7 @@ #define OPAL_PCI_SET_PHB_MEM_WINDOW 28 #define OPAL_PCI_MAP_PE_MMIO_WINDOW 29 #define OPAL_PCI_SET_PE 31 +#define OPAL_PCI_SET_XIVE_PE 37 #define OPAL_GET_MSI_32 39 #define OPAL_GET_MSI_64 40 #define OPAL_PCI_MAP_PE_DMA_WINDOW_REAL 45 @@ -112,6 +113,7 @@ int64_t opal_pci_map_pe_mmio_window(uint64_t, uint64_t, uint16_t, uint16_t, uint16_t); int64_t opal_pci_set_pe(uint64_t, uint64_t, uint64_t, uint8_t, uint8_t, uint8_t, uint8_t); +int64_t opal_pci_set_xive_pe(uint64_t, uint64_t, uint32_t); int64_t opal_get_msi_32(uint64_t, uint32_t, uint32_t, uint8_t, uint32_t *, uint32_t *); int64_t opal_get_msi_64(uint64_t, uint32_t, uint32_t, uint8_t, diff --git a/sys/arch/powerpc64/powerpc64/locore.S b/sys/arch/powerpc64/powerpc64/locore.S index 19ac859aeef..74c53dfc057 100644 --- a/sys/arch/powerpc64/powerpc64/locore.S +++ b/sys/arch/powerpc64/powerpc64/locore.S @@ -1,4 +1,4 @@ -/* $OpenBSD: locore.S,v 1.9 2020/06/10 16:30:02 kettenis Exp $ */ +/* $OpenBSD: locore.S,v 1.10 2020/06/10 19:00:02 kettenis Exp $ */ /* * Copyright (c) 2020 Mark Kettenis <kettenis@openbsd.org> @@ -94,6 +94,7 @@ OPAL_CALL(OPAL_PCI_PHB_MMIO_ENABLE, opal_pci_phb_mmio_enable) OPAL_CALL(OPAL_PCI_SET_PHB_MEM_WINDOW, opal_pci_set_phb_mem_window) OPAL_CALL(OPAL_PCI_MAP_PE_MMIO_WINDOW, opal_pci_map_pe_mmio_window) OPAL_CALL(OPAL_PCI_SET_PE, opal_pci_set_pe) +OPAL_CALL(OPAL_PCI_SET_XIVE_PE, opal_pci_set_xive_pe) OPAL_CALL(OPAL_GET_MSI_32, opal_get_msi_32) OPAL_CALL(OPAL_GET_MSI_64, opal_get_msi_64) OPAL_CALL(OPAL_PCI_MAP_PE_DMA_WINDOW_REAL, opal_pci_map_pe_dma_window_real) |