D32784.id103348.diff
No OneTemporary
Actions

Size

811 B

Referenced Files

None

Subscribers

None

D32784.id103348.diff
View Options

	diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
	--- a/sys/dev/pci/pci.c
	+++ b/sys/dev/pci/pci.c
	@@ -4541,6 +4541,7 @@
	char me1[24], me2[32];
	uint8_t b, s, f;
	uint32_t d;
	+ device_location_cache_t *cache;

	d = pci_get_domain(child);
	b = pci_get_bus(child);
	@@ -4549,13 +4550,19 @@
	snprintf(me1, sizeof(me1), "pci%u:%u:%u", b, s, f);
	snprintf(me2, sizeof(me2), "pci%u:%u:%u:%u", d, b, s, f);
	line = 0;
	+ cache = dev_wired_cache_init();
	while (resource_find_dev(&line, name, &unit, "at", NULL) == 0) {
	resource_string_value(name, unit, "at", &at);
	if (strcmp(at, me1) == 0 \|\| strcmp(at, me2) == 0) {
	*unitp = unit;
	- return;
	+ break;
	+ }
	+ if (dev_wired_cache_match(cache, child, at)) {
	+ *unitp = unit;
	+ break;
	}
	}
	+ dev_wired_cache_fini(cache);
	}

	static void