lkml.org 
[lkml]   [2007]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH]: PNP: Increase the value of PNP constant
    From
    Date
    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;
    }
    }

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2007-11-16 08:31    [W:0.025 / U:0.188 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site