aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pnp/isapnp
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2008-04-28 16:34:32 -0600
committerLen Brown <len.brown@intel.com>2008-04-29 03:22:28 -0400
commit21855d69d1e3ace3efdb8159a4a7ab1ab98a6f19 (patch)
treebfa5bc70ab7dabe5e4117fde96199df6c05cd261 /drivers/pnp/isapnp
parent0a977f15469457d9a19eed992caf71995c674064 (diff)
downloadkernel_samsung_smdk4412-21855d69d1e3ace3efdb8159a4a7ab1ab98a6f19.zip
kernel_samsung_smdk4412-21855d69d1e3ace3efdb8159a4a7ab1ab98a6f19.tar.gz
kernel_samsung_smdk4412-21855d69d1e3ace3efdb8159a4a7ab1ab98a6f19.tar.bz2
PNP: add pnp_resource index for ISAPNP
Save the ISAPNP config register index in the struct pnp_resource. We need this because it is important to write ISAPNP configuration back to the same registers we read it from. For example, if we read valid regions from memory descriptors 0, 1, and 3, we'd better write them back to the same registers, without compressing them to descriptors 0, 1, and 2. This was previously guaranteed by using the index into the pnp_resource_table array as the ISAPNP config register index. However, I am removing those fixed-size arrays, so we need to save the ISAPNP register index elsewhere. Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/isapnp')
-rw-r--r--drivers/pnp/isapnp/core.c63
1 files changed, 46 insertions, 17 deletions
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index a62ecc6..f949a53 100644
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -931,6 +931,7 @@ EXPORT_SYMBOL(isapnp_write_byte);
static int isapnp_read_resources(struct pnp_dev *dev)
{
+ struct pnp_resource *pnp_res;
struct resource *res;
int tmp, ret;
@@ -940,7 +941,9 @@ static int isapnp_read_resources(struct pnp_dev *dev)
ret = isapnp_read_word(ISAPNP_CFG_PORT + (tmp << 1));
if (!ret)
continue;
- res = pnp_get_resource(dev, IORESOURCE_IO, tmp);
+ pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IO, tmp);
+ pnp_res->index = tmp;
+ res = &pnp_res->res;
res->start = ret;
res->flags = IORESOURCE_IO;
}
@@ -949,7 +952,10 @@ static int isapnp_read_resources(struct pnp_dev *dev)
isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
if (!ret)
continue;
- res = pnp_get_resource(dev, IORESOURCE_MEM, tmp);
+ pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_MEM,
+ tmp);
+ pnp_res->index = tmp;
+ res = &pnp_res->res;
res->start = ret;
res->flags = IORESOURCE_MEM;
}
@@ -959,7 +965,10 @@ static int isapnp_read_resources(struct pnp_dev *dev)
8);
if (!ret)
continue;
- res = pnp_get_resource(dev, IORESOURCE_IRQ, tmp);
+ pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IRQ,
+ tmp);
+ pnp_res->index = tmp;
+ res = &pnp_res->res;
res->start = res->end = ret;
res->flags = IORESOURCE_IRQ;
}
@@ -967,7 +976,10 @@ static int isapnp_read_resources(struct pnp_dev *dev)
ret = isapnp_read_byte(ISAPNP_CFG_DMA + tmp);
if (ret == 4)
continue;
- res = pnp_get_resource(dev, IORESOURCE_DMA, tmp);
+ pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA,
+ tmp);
+ pnp_res->index = tmp;
+ res = &pnp_res->res;
res->start = res->end = ret;
res->flags = IORESOURCE_DMA;
}
@@ -989,45 +1001,62 @@ static int isapnp_get_resources(struct pnp_dev *dev)
static int isapnp_set_resources(struct pnp_dev *dev)
{
+ struct pnp_resource *pnp_res;
struct resource *res;
- int tmp;
+ int tmp, index;
dev_dbg(&dev->dev, "set resources\n");
isapnp_cfg_begin(dev->card->number, dev->number);
dev->active = 1;
for (tmp = 0; tmp < ISAPNP_MAX_PORT; tmp++) {
- res = pnp_get_resource(dev, IORESOURCE_IO, tmp);
+ pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IO, tmp);
+ if (!pnp_res)
+ continue;
+ res = &pnp_res->res;
if (pnp_resource_valid(res)) {
+ index = pnp_res->index;
dev_dbg(&dev->dev, " set io %d to %#llx\n",
- tmp, (unsigned long long) res->start);
- isapnp_write_word(ISAPNP_CFG_PORT + (tmp << 1),
+ index, (unsigned long long) res->start);
+ isapnp_write_word(ISAPNP_CFG_PORT + (index << 1),
res->start);
}
}
for (tmp = 0; tmp < ISAPNP_MAX_IRQ; tmp++) {
- res = pnp_get_resource(dev, IORESOURCE_IRQ, tmp);
+ pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_IRQ, tmp);
+ if (!pnp_res)
+ continue;
+ res = &pnp_res->res;
if (pnp_resource_valid(res)) {
int irq = res->start;
if (irq == 2)
irq = 9;
- dev_dbg(&dev->dev, " set irq %d to %d\n", tmp, irq);
- isapnp_write_byte(ISAPNP_CFG_IRQ + (tmp << 1), irq);
+ index = pnp_res->index;
+ dev_dbg(&dev->dev, " set irq %d to %d\n", index, irq);
+ isapnp_write_byte(ISAPNP_CFG_IRQ + (index << 1), irq);
}
}
for (tmp = 0; tmp < ISAPNP_MAX_DMA; tmp++) {
- res = pnp_get_resource(dev, IORESOURCE_DMA, tmp);
+ pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_DMA, tmp);
+ if (!pnp_res)
+ continue;
+ res = &pnp_res->res;
if (pnp_resource_valid(res)) {
+ index = pnp_res->index;
dev_dbg(&dev->dev, " set dma %d to %lld\n",
- tmp, (unsigned long long) res->start);
- isapnp_write_byte(ISAPNP_CFG_DMA + tmp, res->start);
+ index, (unsigned long long) res->start);
+ isapnp_write_byte(ISAPNP_CFG_DMA + index, res->start);
}
}
for (tmp = 0; tmp < ISAPNP_MAX_MEM; tmp++) {
- res = pnp_get_resource(dev, IORESOURCE_MEM, tmp);
+ pnp_res = pnp_get_pnp_resource(dev, IORESOURCE_MEM, tmp);
+ if (!pnp_res)
+ continue;
+ res = &pnp_res->res;
if (pnp_resource_valid(res)) {
+ index = pnp_res->index;
dev_dbg(&dev->dev, " set mem %d to %#llx\n",
- tmp, (unsigned long long) res->start);
- isapnp_write_word(ISAPNP_CFG_MEM + (tmp << 3),
+ index, (unsigned long long) res->start);
+ isapnp_write_word(ISAPNP_CFG_MEM + (index << 3),
(res->start >> 8) & 0xffff);
}
}