Commit 11439a6f authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Len Brown

PNP: don't check for conflicts with bridge windows

With fa35b492, I broke a lot of PNP resource assignment.  That commit made
PNPACPI include bridge windows as PNP resources, and PNP resource assignment
treats any enabled overlapping PNP resources as conflicts.  Since PCI host
bridge windows typically include most of the I/O port space, this makes PNP
port assigments fail.

The PCI host bridge driver will eventually use those PNP window resources,
so we should make PNP ignore them when checking for conflicts.

This fixes default avatarPavel Kysilka <>
Signed-off-by: default avatarBjorn Helgaas <>
Signed-off-by: default avatarLen Brown <>
parent 722154e4
......@@ -211,6 +211,8 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res)
if (tres->flags & IORESOURCE_IO) {
if (cannot_compare(tres->flags))
if (tres->flags & IORESOURCE_WINDOW)
tport = &tres->start;
tend = &tres->end;
if (ranged_conflict(port, end, tport, tend))
......@@ -271,6 +273,8 @@ int pnp_check_mem(struct pnp_dev *dev, struct resource *res)
if (tres->flags & IORESOURCE_MEM) {
if (cannot_compare(tres->flags))
if (tres->flags & IORESOURCE_WINDOW)
taddr = &tres->start;
tend = &tres->end;
if (ranged_conflict(addr, end, taddr, tend))
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment