Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  [SCSI] Remove full sg table memset()
  [SCSI] ide-scsi: remove usage of sg_last()
  Fix loop terminating conditions in fill_sg().
  [BLOCK] Clear sg entry before filling in blk_rq_map_sg()
  IA64: iommu uses sg_next with an invalid sg element
  cciss: disable DMA refetch on Smart Array P600
  swiotlb: fix map_sg failure handling
  SPARC64: fix iommu sg chaining
  [SCSI] ide-scsi: use scsi_sg_count() instead of ->use_sg

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index ca56a0e5cd5e..7c2cfde08f18 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -3076,15 +3076,20 @@ 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.
+        /* Disabling DMA prefetch and refetch for the P600.
+         * An ASIC bug may result in accesses to invalid memory addresses.
+         * We've disabled prefetch for some time now. Testing with XEN
+         * kernels revealed a bug in the refetch if dom0 resides on a P600.
          */
         if(board_id == 0x3225103C) {
                 __u32 dma_prefetch;
+                __u32 dma_refetch;
                 dma_prefetch = readl(c->vaddr + I2O_DMA1_CFG);
                 dma_prefetch |= 0x8000;
                 writel(dma_prefetch, c->vaddr + I2O_DMA1_CFG);
+                pci_read_config_dword(pdev, PCI_COMMAND_PARITY, &dma_refetch);
+                dma_refetch |= 0x1;
+                pci_write_config_dword(pdev, PCI_COMMAND_PARITY, dma_refetch);
         }
 
 #ifdef CCISS_DEBUG