Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
x86/PCI: for host bridge address space collisions, show conflicting resource
With insert_resource_conflict(), we can learn what the actual conflict is,
so print that info for debugging purposes.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
authored by Bjorn Helgaas and committed by Jesse Barnes eb9fc8ef 99f4692e
+6
-3
arch/x86/pci/acpi.c
+6
-3
arch/x86/pci/acpi.c
···
122
struct acpi_resource_address64 addr;
123
acpi_status status;
124
unsigned long flags;
125
-
struct resource *root;
126
u64 start, end;
127
128
status = resource_to_addr(acpi_res, &addr);
···
157
return AE_OK;
158
}
159
160
-
if (insert_resource(root, res)) {
161
dev_err(&info->bridge->dev,
162
-
"can't allocate host bridge window %pR\n", res);
163
} else {
164
pci_bus_add_resource(info->bus, res, 0);
165
info->res_num++;
···
122
struct acpi_resource_address64 addr;
123
acpi_status status;
124
unsigned long flags;
125
+
struct resource *root, *conflict;
126
u64 start, end;
127
128
status = resource_to_addr(acpi_res, &addr);
···
157
return AE_OK;
158
}
159
160
+
conflict = insert_resource_conflict(root, res);
161
+
if (conflict) {
162
dev_err(&info->bridge->dev,
163
+
"address space collision: host bridge window %pR "
164
+
"conflicts with %s %pR\n",
165
+
res, conflict->name, conflict);
166
} else {
167
pci_bus_add_resource(info->bus, res, 0);
168
info->res_num++;