Page MenuHomeFreeBSD
Files F156858121

D44207.id135371.diff
No OneTemporary
Actions

D44207.id135371.diff
View Options

diff --git a/sys/dev/pci/pci_host_generic.c b/sys/dev/pci/pci_host_generic.c
--- a/sys/dev/pci/pci_host_generic.c
+++ b/sys/dev/pci/pci_host_generic.c
@@ -86,7 +86,7 @@
const char *range_descr;
char buf[64];
int domain, error;
- int flags, rid, tuple, type;
+ int flags, rid, tuple;
sc = device_get_softc(dev);
sc->dev = dev;
@@ -182,21 +182,18 @@
sc->has_pmem = true;
range_descr = "prefetch";
flags = RF_PREFETCHABLE;
- type = SYS_RES_MEMORY;
error = rman_manage_region(&sc->pmem_rman,
pci_base, pci_base + size - 1);
break;
case FLAG_TYPE_MEM:
range_descr = "memory";
flags = 0;
- type = SYS_RES_MEMORY;
error = rman_manage_region(&sc->mem_rman,
pci_base, pci_base + size - 1);
break;
case FLAG_TYPE_IO:
range_descr = "I/O port";
flags = 0;
- type = SYS_RES_IOPORT;
error = rman_manage_region(&sc->io_rman,
pci_base, pci_base + size - 1);
break;
@@ -208,15 +205,16 @@
"error = %d\n", error);
goto err_rman_manage;
}
- error = bus_set_resource(dev, type, rid, phys_base, size);
+ error = bus_set_resource(dev, SYS_RES_MEMORY, rid, phys_base,
+ size);
if (error != 0) {
device_printf(dev,
"failed to set resource for range %d: %d\n", tuple,
error);
goto err_rman_manage;
}
- sc->ranges[tuple].res = bus_alloc_resource_any(dev, type, &rid,
- RF_ACTIVE | RF_UNMAPPED | flags);
+ sc->ranges[tuple].res = bus_alloc_resource_any(dev,
+ SYS_RES_MEMORY, &rid, RF_ACTIVE | RF_UNMAPPED | flags);
if (sc->ranges[tuple].res == NULL) {
device_printf(dev,
"failed to allocate resource for range %d\n", tuple);
@@ -238,18 +236,15 @@
switch (FLAG_TYPE(sc->ranges[tuple].flags)) {
case FLAG_TYPE_PMEM:
case FLAG_TYPE_MEM:
- type = SYS_RES_MEMORY;
- break;
case FLAG_TYPE_IO:
- type = SYS_RES_IOPORT;
break;
default:
continue;
}
if (sc->ranges[tuple].res != NULL)
- bus_release_resource(dev, type, tuple + 1,
+ bus_release_resource(dev, SYS_RES_MEMORY, tuple + 1,
sc->ranges[tuple].res);
- bus_delete_resource(dev, type, tuple + 1);
+ bus_delete_resource(dev, SYS_RES_MEMORY, tuple + 1);
}
rman_fini(&sc->io_rman);
err_io_rman:
@@ -271,7 +266,7 @@
pci_host_generic_core_detach(device_t dev)
{
struct generic_pcie_core_softc *sc;
- int error, tuple, type;
+ int error, tuple;
sc = device_get_softc(dev);
@@ -285,18 +280,15 @@
switch (FLAG_TYPE(sc->ranges[tuple].flags)) {
case FLAG_TYPE_PMEM:
case FLAG_TYPE_MEM:
- type = SYS_RES_MEMORY;
- break;
case FLAG_TYPE_IO:
- type = SYS_RES_IOPORT;
break;
default:
continue;
}
if (sc->ranges[tuple].res != NULL)
- bus_release_resource(dev, type, tuple + 1,
+ bus_release_resource(dev, SYS_RES_MEMORY, tuple + 1,
sc->ranges[tuple].res);
- bus_delete_resource(dev, type, tuple + 1);
+ bus_delete_resource(dev, SYS_RES_MEMORY, tuple + 1);
}
rman_fini(&sc->io_rman);
rman_fini(&sc->mem_rman);

File Metadata

Mime Type
text/plain
Expires
Sun, May 17, 10:51 PM (7 h, 11 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33215724
Default Alt Text
D44207.id135371.diff (2 KB)

Event Timeline