diff options
| author | Roland Dreier <rolandd@cisco.com> | 2007-02-16 13:57:33 -0800 |
|---|---|---|
| committer | Roland Dreier <rolandd@cisco.com> | 2007-02-16 13:57:33 -0800 |
| commit | 11282b32a4ed7bb5fc390c83a1d6b9bc8017882c (patch) | |
| tree | 241e453062f9acae34fc00625097491c3e5f83e5 /drivers/infiniband | |
| parent | fc89afce349a70f73d9c0b6d91a15c4913f071a0 (diff) | |
| download | op-kernel-dev-11282b32a4ed7bb5fc390c83a1d6b9bc8017882c.zip op-kernel-dev-11282b32a4ed7bb5fc390c83a1d6b9bc8017882c.tar.gz | |
IB/mthca: Fix allocation of ICM chunks in coherent memory
The change to allow allocating ICM chunks from coherent memory did not
increment the count of sg entries properly, so a chunk that required
more than allocation would not be mapped properly by the HCA.
Fix this by adding the missing increment of chunk->nsg.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/hw/mthca/mthca_memfree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c index 0b9d053..48f7c65 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c @@ -175,7 +175,9 @@ struct mthca_icm *mthca_alloc_icm(struct mthca_dev *dev, int npages, if (!ret) { ++chunk->npages; - if (!coherent && chunk->npages == MTHCA_ICM_CHUNK_LEN) { + if (coherent) + ++chunk->nsg; + else if (chunk->npages == MTHCA_ICM_CHUNK_LEN) { chunk->nsg = pci_map_sg(dev->pdev, chunk->mem, chunk->npages, PCI_DMA_BIDIRECTIONAL); |
