From: Dan Williams <dan.j.williams@intel.com>
Date: Wed, 9 Sep 2009 00:53:57 +0000 (-0700)
Subject: Merge branch 'iop-raid6' into async-tx-next
X-Git-Tag: v2.6.32-rc1~60^2^2~14
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=3e48e656903e9fd8bc805c6a2c4264d7808d315b

Merge branch 'iop-raid6' into async-tx-next
---

3e48e656903e9fd8bc805c6a2c4264d7808d315b
diff --cc drivers/dma/iop-adma.c
index cecb6d657d55,f4c59e59f6cb..518f557ef857
--- a/drivers/dma/iop-adma.c
+++ b/drivers/dma/iop-adma.c
@@@ -1255,13 -1589,31 +1589,28 @@@ static int __devinit iop_adma_probe(str
  			goto err_free_iop_chan;
  	}
  
+ 	if (dma_has_cap(DMA_PQ, dma_dev->cap_mask) &&
+ 	    dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask)) {
+ 		#ifdef CONFIG_MD_RAID6_PQ
+ 		ret = iop_adma_pq_zero_sum_self_test(adev);
+ 		dev_dbg(&pdev->dev, "pq self test returned %d\n", ret);
+ 		#else
+ 		/* can not test raid6, so do not publish capability */
+ 		dma_cap_clear(DMA_PQ, dma_dev->cap_mask);
+ 		dma_cap_clear(DMA_PQ_VAL, dma_dev->cap_mask);
+ 		ret = 0;
+ 		#endif
+ 		if (ret)
+ 			goto err_free_iop_chan;
+ 	}
+ 
  	dev_printk(KERN_INFO, &pdev->dev, "Intel(R) IOP: "
 -	  "( %s%s%s%s%s%s%s%s%s%s)\n",
 +	  "( %s%s%s%s%s%s%s)\n",
  	  dma_has_cap(DMA_PQ, dma_dev->cap_mask) ? "pq " : "",
 -	  dma_has_cap(DMA_PQ_UPDATE, dma_dev->cap_mask) ? "pq_update " : "",
  	  dma_has_cap(DMA_PQ_VAL, dma_dev->cap_mask) ? "pq_val " : "",
  	  dma_has_cap(DMA_XOR, dma_dev->cap_mask) ? "xor " : "",
 -	  dma_has_cap(DMA_DUAL_XOR, dma_dev->cap_mask) ? "dual_xor " : "",
  	  dma_has_cap(DMA_XOR_VAL, dma_dev->cap_mask) ? "xor_val " : "",
  	  dma_has_cap(DMA_MEMSET, dma_dev->cap_mask)  ? "fill " : "",
 -	  dma_has_cap(DMA_MEMCPY_CRC32C, dma_dev->cap_mask) ? "cpy+crc " : "",
  	  dma_has_cap(DMA_MEMCPY, dma_dev->cap_mask) ? "cpy " : "",
  	  dma_has_cap(DMA_INTERRUPT, dma_dev->cap_mask) ? "intr " : "");