Page MenuHomeFreeBSD
Files F132337151

D44132.id135296.diff
No OneTemporary
Actions

D44132.id135296.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
@@ -83,6 +83,7 @@
uint64_t phys_base;
uint64_t pci_base;
uint64_t size;
+ const char *range_descr;
char buf[64];
int domain, error;
int flags, rid, tuple, type;
@@ -179,18 +180,21 @@
switch (FLAG_TYPE(sc->ranges[tuple].flags)) {
case FLAG_TYPE_PMEM:
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,
@@ -219,6 +223,10 @@
error = ENXIO;
goto err_rman_manage;
}
+ if (bootverbose)
+ device_printf(dev,
+ "PCI addr: 0x%jx, CPU addr: 0x%jx, Size: 0x%jx, Type: %s\n",
+ pci_base, phys_base, size, range_descr);
}
return (0);
diff --git a/sys/dev/pci/pci_host_generic_fdt.c b/sys/dev/pci/pci_host_generic_fdt.c
--- a/sys/dev/pci/pci_host_generic_fdt.c
+++ b/sys/dev/pci/pci_host_generic_fdt.c
@@ -183,7 +183,6 @@
int nbase_ranges;
phandle_t node;
int i, j, k;
- int tuple;
node = ofw_bus_get_node(dev);
@@ -239,16 +238,6 @@
sc->ranges[i].size = 0;
}
- if (bootverbose) {
- for (tuple = 0; tuple < MAX_RANGES_TUPLES; tuple++) {
- device_printf(dev,
- "\tPCI addr: 0x%jx, CPU addr: 0x%jx, Size: 0x%jx\n",
- sc->ranges[tuple].pci_base,
- sc->ranges[tuple].phys_base,
- sc->ranges[tuple].size);
- }
- }
-
free(base_ranges, M_DEVBUF);
return (0);
}

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 17, 12:49 AM (12 h, 33 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23794317
Default Alt Text
D44132.id135296.diff (1 KB)

Event Timeline