From: Zhao Yakui <yakui.zhao@intel.com>
To: linux-kernel@vger.kernel.org
Cc: akpm@linux-foundation.org, shaohua.li@intel.com
Subject: [PATCH]: PNP: Increase the value of PNP constant
Date: Fri, 16 Nov 2007 15:39:58 +0800 [thread overview]
Message-ID: <1195198798.2460.18.camel@yakui_zhao.sh.intel.com> (raw)
Subject: PNP: Increase the value of PNP constant
From: Zhao Yakui <yakui.zhao@intel.com>
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.
Andrew, I thought this is an urgent issue and should be fixed ASAP, and
this is a good candidate for -stable tree
Signed-off-by: Li Shaohua <shaohua.li@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
---
drivers/pnp/pnpacpi/rsparser.c | 18 ++++++++++++++++--
include/linux/pnp.h | 4 ++--
2 files changed, 18 insertions(+), 4 deletions(-)
Index: linux-2.6.24-rc2/include/linux/pnp.h
===================================================================
--- linux-2.6.24-rc2.orig/include/linux/pnp.h
+++ linux-2.6.24-rc2/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
Index: linux-2.6.24-rc2/drivers/pnp/pnpacpi/rsparser.c
===================================================================
--- linux-2.6.24-rc2.orig/drivers/pnp/pnpacpi/rsparser.c
+++ linux-2.6.24-rc2/drivers/pnp/pnpacpi/rsparser.c
@@ -82,9 +82,11 @@ static void pnpacpi_parse_allocated_irqr
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 "Exceed the max number of IRQ resource: "
+ "%d \n",PNP_MAX_IRQ);
return;
-
+ }
#ifdef CONFIG_X86
if (gsi < 16 && (triggering != ACPI_EDGE_SENSITIVE ||
polarity != ACPI_ACTIVE_HIGH)) {
@@ -173,6 +175,10 @@ static void pnpacpi_parse_allocated_dmar
}
res->dma_resource[i].start = dma;
res->dma_resource[i].end = dma;
+ } else {
+ printk(KERN_ERR "Exceed the max number of DMA resource: "
+ "%d \n",PNP_MAX_DMA);
+ return;
}
}
@@ -194,6 +200,10 @@ static void pnpacpi_parse_allocated_iore
}
res->port_resource[i].start = io;
res->port_resource[i].end = io + len - 1;
+ } else {
+ printk(KERN_ERR "Exceed the max number of IO Resource: "
+ "%d \n",PNP_MAX_PORT);
+ return;
}
}
@@ -217,6 +227,10 @@ static void pnpacpi_parse_allocated_memr
res->mem_resource[i].start = mem;
res->mem_resource[i].end = mem + len - 1;
+ } else {
+ printk(KERN_ERR "Exceed the max number of Mem Resource: "
+ "%d \n",PNP_MAX_MEM);
+ return;
}
}
next reply other threads:[~2007-11-16 7:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-16 7:39 Zhao Yakui [this message]
2007-11-16 16:52 ` Rene Herman
2007-11-16 20:46 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1195198798.2460.18.camel@yakui_zhao.sh.intel.com \
--to=yakui.zhao@intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=shaohua.li@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®