Page MenuHomeFreeBSD
Files F145385974

D28817.id.diff
No OneTemporary
Actions

D28817.id.diff
View Options

diff --git a/sys/dev/virtio/pci/virtio_pci_legacy.c b/sys/dev/virtio/pci/virtio_pci_legacy.c
--- a/sys/dev/virtio/pci/virtio_pci_legacy.c
+++ b/sys/dev/virtio/pci/virtio_pci_legacy.c
@@ -60,7 +60,8 @@
device_t vtpci_dev;
struct vtpci_common vtpci_common;
struct resource *vtpci_res;
- struct resource *vtpci_msix_res;
+ struct resource *vtpci_msix_table_res;
+ struct resource *vtpci_msix_pba_res;
};
static int vtpci_legacy_probe(device_t);
@@ -97,6 +98,8 @@
static void vtpci_legacy_read_dev_config(device_t, bus_size_t, void *, int);
static void vtpci_legacy_write_dev_config(device_t, bus_size_t, void *, int);
+static bool vtpci_legacy_setup_msix(struct vtpci_legacy_softc *sc);
+static void vtpci_legacy_teardown_msix(struct vtpci_legacy_softc *sc);
static int vtpci_legacy_alloc_resources(struct vtpci_legacy_softc *);
static void vtpci_legacy_free_resources(struct vtpci_legacy_softc *);
@@ -232,6 +235,13 @@
return (error);
}
+ if (vtpci_is_msix_available(&sc->vtpci_common) &&
+ !vtpci_legacy_setup_msix(sc)) {
+ device_printf(dev, "cannot setup MSI-x resources\n");
+ error = ENXIO;
+ goto fail;
+ }
+
vtpci_legacy_reset(sc);
/* Tell the host we've noticed this device. */
@@ -265,6 +275,7 @@
return (error);
vtpci_legacy_reset(sc);
+ vtpci_legacy_teardown_msix(sc);
vtpci_legacy_free_resources(sc);
return (0);
@@ -539,6 +550,54 @@
}
}
+static bool
+vtpci_legacy_setup_msix(struct vtpci_legacy_softc *sc)
+{
+ device_t dev;
+ int rid, table_rid;
+
+ dev = sc->vtpci_dev;
+
+ rid = table_rid = pci_msix_table_bar(dev);
+ if (rid != PCIR_BAR(0)) {
+ sc->vtpci_msix_table_res = bus_alloc_resource_any(
+ dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+ if (sc->vtpci_msix_table_res == NULL)
+ return (false);
+ }
+
+ rid = pci_msix_pba_bar(dev);
+ if (rid != table_rid && rid != PCIR_BAR(0)) {
+ sc->vtpci_msix_pba_res = bus_alloc_resource_any(
+ dev, SYS_RES_MEMORY, &rid, RF_ACTIVE);
+ if (sc->vtpci_msix_pba_res == NULL)
+ return (false);
+ }
+
+ return (true);
+}
+
+static void
+vtpci_legacy_teardown_msix(struct vtpci_legacy_softc *sc)
+{
+ device_t dev;
+
+ dev = sc->vtpci_dev;
+
+ if (sc->vtpci_msix_pba_res != NULL) {
+ bus_release_resource(dev, SYS_RES_MEMORY,
+ rman_get_rid(sc->vtpci_msix_pba_res),
+ sc->vtpci_msix_pba_res);
+ sc->vtpci_msix_pba_res = NULL;
+ }
+ if (sc->vtpci_msix_table_res != NULL) {
+ bus_release_resource(dev, SYS_RES_MEMORY,
+ rman_get_rid(sc->vtpci_msix_table_res),
+ sc->vtpci_msix_table_res);
+ sc->vtpci_msix_table_res = NULL;
+ }
+}
+
static int
vtpci_legacy_alloc_resources(struct vtpci_legacy_softc *sc)
{
@@ -552,13 +611,6 @@
&rid, RF_ACTIVE)) == NULL)
return (ENXIO);
- if (vtpci_is_msix_available(&sc->vtpci_common)) {
- rid = PCIR_BAR(1);
- if ((sc->vtpci_msix_res = bus_alloc_resource_any(dev,
- SYS_RES_MEMORY, &rid, RF_ACTIVE)) == NULL)
- return (ENXIO);
- }
-
return (0);
}
@@ -569,12 +621,6 @@
dev = sc->vtpci_dev;
- if (sc->vtpci_msix_res != NULL) {
- bus_release_resource(dev, SYS_RES_MEMORY, PCIR_BAR(1),
- sc->vtpci_msix_res);
- sc->vtpci_msix_res = NULL;
- }
-
if (sc->vtpci_res != NULL) {
bus_release_resource(dev, SYS_RES_IOPORT, PCIR_BAR(0),
sc->vtpci_res);

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 20, 3:47 AM (42 m, 22 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28892357
Default Alt Text
D28817.id.diff (3 KB)

Event Timeline