summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Miller <mike.miller@hp.com>2006-12-06 20:35:04 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-07 08:39:29 -0800
commitf92e2f5f889803306e50c06e17ee330403e91b8d (patch)
tree0971abf513da37eba31de1aa8d7753aa2e5fa8b7
parentde9239167158c0210c5b9a709d67cea1b6f8ae56 (diff)
downloadop-kernel-dev-f92e2f5f889803306e50c06e17ee330403e91b8d.zip
op-kernel-dev-f92e2f5f889803306e50c06e17ee330403e91b8d.tar.gz
[PATCH] cciss: disable DMA prefetch on P600
Unconditionally disable DMA prefetch on the P600 controller. An ASIC bug may result in prefetching beyond the end of physical memory. Signed-off-by: Mike Miller <mike.miller@hp.com> Acked-by: Jens Axboe <jens.axboe@oracle.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/block/cciss.c11
-rw-r--r--drivers/block/cciss_cmd.h1
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 4899ab2..a17223c 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3003,6 +3003,17 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev)
}
#endif
+ /* Disabling DMA prefetch for the P600
+ * An ASIC bug may result in a prefetch beyond
+ * physical memory.
+ */
+ if(board_id == 0x3225103C) {
+ __u32 dma_prefetch;
+ dma_prefetch = readl(c->vaddr + I2O_DMA1_CFG);
+ dma_prefetch |= 0x8000;
+ writel(dma_prefetch, c->vaddr + I2O_DMA1_CFG);
+ }
+
#ifdef CCISS_DEBUG
printk("Trying to put board into Simple mode\n");
#endif /* CCISS_DEBUG */
diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h
index 4af7c4c..b2147cc 100644
--- a/drivers/block/cciss_cmd.h
+++ b/drivers/block/cciss_cmd.h
@@ -55,6 +55,7 @@
#define I2O_INT_MASK 0x34
#define I2O_IBPOST_Q 0x40
#define I2O_OBPOST_Q 0x44
+#define I2O_DMA1_CFG 0x214
//Configuration Table
#define CFGTBL_ChangeReq 0x00000001l
OpenPOWER on IntegriCloud