PNP: increase the maximum number of resources

On some systems the number of resources(IO,MEM) returnedy by PNP device is
greater than the PNP constant, for example motherboard devices.  It brings
that some resources can't be reserved and resource confilicts.  This will
cause PCI resources are assigned wrongly in some systems, and cause hang.
This is a regression since we deleted ACPI motherboard driver and use PNP
system driver.

[akpm@linux-foundation.org: fix text and coding-style a bit]
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Cc: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Thomas Renninger <trenn@suse.de>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 15 insertions, 4 deletions

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 11adab13f2b7..3c5eb374adf8 100644
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -83,9 +83,11 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_resource_table *res,
         while (!(res->irq_resource[i].flags & IORESOURCE_UNSET) &&
                i < PNP_MAX_IRQ)
                 i++;
-        if (i >= PNP_MAX_IRQ)
+        if (i >= PNP_MAX_IRQ) {
+                printk(KERN_ERR "pnpacpi: exceeded the max number of IRQ "
+                                "resources: %d \n", PNP_MAX_IRQ);
                 return;
-
+        }
         /*
          * in IO-APIC mode, use overrided attribute. Two reasons:
          * 1. BIOS bug in DSDT
@@ -181,6 +183,9 @@ static void pnpacpi_parse_allocated_dmaresource(struct pnp_resource_table *res,
                 }
                 res->dma_resource[i].start = dma;
                 res->dma_resource[i].end = dma;
+        } else {
+                printk(KERN_ERR "pnpacpi: exceeded the max number of DMA "
+                                "resources: %d \n", PNP_MAX_DMA);
         }
 }
 
@@ -202,6 +207,9 @@ static void pnpacpi_parse_allocated_ioresource(struct pnp_resource_table *res,
                 }
                 res->port_resource[i].start = io;
                 res->port_resource[i].end = io + len - 1;
+        } else {
+                printk(KERN_ERR "pnpacpi: exceeded the max number of IO "
+                                "resources: %d \n", PNP_MAX_PORT);
         }
 }
 
@@ -225,6 +233,9 @@ static void pnpacpi_parse_allocated_memresource(struct pnp_resource_table *res,
 
                 res->mem_resource[i].start = mem;
                 res->mem_resource[i].end = mem + len - 1;
+        } else {
+                printk(KERN_ERR "pnpacpi: exceeded the max number of mem "
+                                "resources: %d\n", PNP_MAX_MEM);
         }
 }
 
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 664d68cb1fbd..0a0426c2867d 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -13,8 +13,8 @@
 #include <linux/errno.h>
 #include <linux/mod_devicetable.h>
 
-#define PNP_MAX_PORT            8
-#define PNP_MAX_MEM             4
+#define PNP_MAX_PORT            24
+#define PNP_MAX_MEM             12
 #define PNP_MAX_IRQ             2
 #define PNP_MAX_DMA             2
 #define PNP_NAME_LEN            50