From a7437a3e9dcea7a493680f43a3fee2239bcfb33d Mon Sep 17 00:00:00 2001 From: Andriy Gapon Date: Mon, 4 Dec 2017 17:10:52 +0000 Subject: [PATCH] amd-vi: set iommu msi configuration using pci_enable_msi method This is better than directly changing PCI configuration space of the device because it makes the PCI bus aware of the configuration. Also, the change allows to drop a bunch of code that duplicated pci_enable_msi() functionality. I wonder if it's possible to further simplify the code by using pci_alloc_msi(). --- sys/amd64/vmm/amd/amdvi_hw.c | 72 ++++++++---------------------------- 1 file changed, 16 insertions(+), 56 deletions(-) diff --git a/sys/amd64/vmm/amd/amdvi_hw.c b/sys/amd64/vmm/amd/amdvi_hw.c index 6f085882f9f6..2392eb491b91 100644 --- a/sys/amd64/vmm/amd/amdvi_hw.c +++ b/sys/amd64/vmm/amd/amdvi_hw.c @@ -119,15 +119,6 @@ CTASSERT(sizeof(amdvi_dte) == 0x200000); static SLIST_HEAD (, amdvi_domain) dom_head; -static inline void -amdvi_pci_write(struct amdvi_softc *softc, int off, uint32_t data) -{ - - pci_cfgregwrite(PCI_RID2BUS(softc->pci_rid), - PCI_RID2SLOT(softc->pci_rid), PCI_RID2FUNC(softc->pci_rid), - off, data, 4); -} - static inline uint32_t amdvi_pci_read(struct amdvi_softc *softc, int off) { @@ -137,32 +128,6 @@ amdvi_pci_read(struct amdvi_softc *softc, int off) off, 4)); } -static int -amdvi_find_pci_cap(struct amdvi_softc *softc, uint8_t capability, int *off) -{ - uint32_t read; - uint8_t ptr; - - read = amdvi_pci_read(softc, PCIR_COMMAND); - if (((read >> 16) & PCIM_STATUS_CAPPRESENT) == 0) - return (ENXIO); - - /* Read the starting of capability pointer. */ - read = amdvi_pci_read(softc, PCIR_CAP_PTR); - ptr = read & 0xFF; - - while (ptr != 0) { - read = amdvi_pci_read(softc, ptr); - if ((read & 0xFF) == capability) { - *off = ptr; - return (0); - } - ptr = (read >> 8) & 0xFF; - } - - return (ENOENT); -} - #ifdef AMDVI_ATS_ENABLE /* XXX: Should be in pci.c */ /* @@ -837,36 +802,47 @@ amdvi_free_evt_intr_res(device_t dev) dev, 1, &softc->event_irq); } -static bool +static bool amdvi_alloc_intr_resources(struct amdvi_softc *softc) { struct amdvi_ctrl *ctrl; device_t dev, pcib; + device_t mmio_dev; uint64_t msi_addr; - uint32_t msi_data, temp; - int err, msi_off; + uint32_t msi_data; + int err; dev = softc->dev; pcib = device_get_parent(device_get_parent(dev)); + mmio_dev = pci_find_bsf(PCI_RID2BUS(softc->pci_rid), + PCI_RID2SLOT(softc->pci_rid), PCI_RID2FUNC(softc->pci_rid)); + if (device_is_attached(mmio_dev)) { + device_printf(dev, + "warning: IOMMU device is claimed by another driver %s\n", + device_get_driver(mmio_dev)->name); + } + softc->event_irq = -1; softc->event_rid = 0; + /* * Section 3.7.1 of IOMMU rev 2.0. With MSI, there is only one * interrupt. XXX: Enable MSI/X support. */ - err = PCIB_ALLOC_MSI(pcib, dev, 1, 1, &softc->event_irq); if (err) { device_printf(dev, "Couldn't find event MSI IRQ resource.\n"); return (ENOENT); } + err = bus_set_resource(dev, SYS_RES_IRQ, softc->event_rid, softc->event_irq, 1); if (err) { device_printf(dev, "Couldn't set event MSI resource.\n"); return (ENXIO); } + softc->event_res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &softc->event_rid, RF_ACTIVE); if (!softc->event_res) { @@ -888,13 +864,6 @@ amdvi_alloc_intr_resources(struct amdvi_softc *softc) bus_describe_intr(dev, softc->event_res, softc->event_tag, "fault"); - err = amdvi_find_pci_cap(softc, PCIY_MSI, &msi_off); - if (err) { - device_printf(dev, "Couldn't find MSI capability, err = %d.\n", - err); - return (err); - } - err = PCIB_MAP_MSI(pcib, dev, softc->event_irq, &msi_addr, &msi_data); if (err) { @@ -909,17 +878,8 @@ amdvi_alloc_intr_resources(struct amdvi_softc *softc) ctrl = softc->ctrl; ctrl->status &= AMDVI_STATUS_EV_OF | AMDVI_STATUS_EV_INTR; - /* Configure MSI */ - amdvi_pci_write(softc, msi_off + PCIR_MSI_ADDR, msi_addr); - amdvi_pci_write(softc, msi_off + PCIR_MSI_ADDR_HIGH, - msi_addr >> 32); - amdvi_pci_write(softc, msi_off + PCIR_MSI_DATA_64BIT, msi_data); - /* Now enable MSI interrupt. */ - temp = amdvi_pci_read(softc, msi_off); - temp |= (PCIM_MSICTRL_MSI_ENABLE << 16); /* MSI enable. */ - amdvi_pci_write(softc, msi_off, temp); - + pci_enable_msi(mmio_dev, msi_addr, msi_data); return (0); }