ioatdma: skip silicon bug workaround for pq_align for cb3.3
authorDave Jiang <dave.jiang@intel.com>
Tue, 26 Mar 2013 22:43:15 +0000 (15:43 -0700)
committerVinod Koul <vinod.koul@intel.com>
Mon, 15 Apr 2013 04:21:20 +0000 (09:51 +0530)
The alignment workaround is only necessary for cb3.2 or earlier platforms.

Signed-off-by: Dave Jiang <dave.jiang@intel.com>
Acked-by: Dan Williams <djbw@fb.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/ioat/dma_v3.c

index 9628ba2..cf97e3f 100644 (file)
@@ -1521,10 +1521,14 @@ int ioat3_dma_probe(struct ioatdma_device *device, int dca)
                dma_cap_set(DMA_XOR_VAL, dma->cap_mask);
                dma->device_prep_dma_xor_val = ioat3_prep_xor_val;
        }
+
        if (cap & IOAT_CAP_PQ) {
                is_raid_device = true;
                dma_set_maxpq(dma, 8, 0);
-               dma->pq_align = 6;
+               if (is_xeon_cb32(pdev))
+                       dma->pq_align = 6;
+               else
+                       dma->pq_align = 0;
 
                dma_cap_set(DMA_PQ, dma->cap_mask);
                dma->device_prep_dma_pq = ioat3_prep_pq;
@@ -1534,7 +1538,10 @@ int ioat3_dma_probe(struct ioatdma_device *device, int dca)
 
                if (!(cap & IOAT_CAP_XOR)) {
                        dma->max_xor = 8;
-                       dma->xor_align = 6;
+                       if (is_xeon_cb32(pdev))
+                               dma->xor_align = 6;
+                       else
+                               dma->xor_align = 0;
 
                        dma_cap_set(DMA_XOR, dma->cap_mask);
                        dma->device_prep_dma_xor = ioat3_prep_pqxor;
@@ -1543,6 +1550,7 @@ int ioat3_dma_probe(struct ioatdma_device *device, int dca)
                        dma->device_prep_dma_xor_val = ioat3_prep_pqxor_val;
                }
        }
+
        if (is_raid_device && (cap & IOAT_CAP_FILL_BLOCK)) {
                dma_cap_set(DMA_MEMSET, dma->cap_mask);
                dma->device_prep_dma_memset = ioat3_prep_memset_lock;