summaryrefslogtreecommitdiffstats
path: root/drivers/block/nvme.c
diff options
context:
space:
mode:
authorMatthew Wilcox2011-02-01 22:23:39 +0100
committerMatthew Wilcox2011-11-04 20:52:53 +0100
commit2930353f9f2b9e4629e935acd970cb73c1171229 (patch)
tree907563f0245bd488935cbd922f665759e4ccd68a /drivers/block/nvme.c
parentNVMe: Enable device DMA (diff)
downloadkernel-qcow2-linux-2930353f9f2b9e4629e935acd970cb73c1171229.tar.gz
kernel-qcow2-linux-2930353f9f2b9e4629e935acd970cb73c1171229.tar.xz
kernel-qcow2-linux-2930353f9f2b9e4629e935acd970cb73c1171229.zip
NVMe: Allow queues to be allocated above 4GB
Need to call dma_set_coherent_mask() to allow queues to be allocated above 4GB. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block/nvme.c')
-rw-r--r--drivers/block/nvme.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 128fd70031a9..46f872021369 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -1110,7 +1110,8 @@ static int __devinit nvme_probe(struct pci_dev *pdev,
INIT_LIST_HEAD(&dev->namespaces);
dev->pci_dev = pdev;
pci_set_drvdata(pdev, dev);
- dma_set_mask(&dev->pci_dev->dev, DMA_BIT_MASK(64));
+ dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
+ dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
nvme_set_instance(dev);
dev->entry[0].vector = pdev->irq;