Commit a7839e96 authored by Zhao Yakui's avatar Zhao Yakui Committed by Linus Torvalds
Browse files

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: default avatarLi Shaohua <shaohua.li@intel.com>
Signed-off-by: default avatarZhao 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2c80b01b

drivers/pnp/pnpacpi/rsparser.c

+13 −2
Original line number Diff line number Diff line
@@ -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);

	}

}

include/linux/pnp.h

+2 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE