diff options
| author | Christoph Hellwig <hch@lst.de> | 2019-06-28 09:17:48 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2019-07-09 13:44:44 -0700 |
| commit | 4fe06923f5181d57178e01add4ba54e269c59e9e (patch) | |
| tree | 9ca3f1291fb7360dd1d05acc46a9fbe6535fe87c | |
| parent | 21774222324e018f064d4fbb661e3c09c2bcaad0 (diff) | |
| download | linux-4fe06923f5181d57178e01add4ba54e269c59e9e.tar.gz linux-4fe06923f5181d57178e01add4ba54e269c59e9e.tar.bz2 linux-4fe06923f5181d57178e01add4ba54e269c59e9e.zip | |
nvme-pci: don't fall back to a 32-bit DMA mask
Since Linux 5.0 drivers can safely set the largest DMA mask supported
by the device, and don't need fallbacks to work around the dma mapping
implementations.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
| -rw-r--r-- | drivers/nvme/host/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index f50013369cc5..49c1fc9907a6 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -2289,8 +2289,7 @@ static int nvme_pci_enable(struct nvme_dev *dev) pci_set_master(pdev); - if (dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(64)) && - dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(32))) + if (dma_set_mask_and_coherent(dev->dev, DMA_BIT_MASK(64))) goto disable; if (readl(dev->bar + NVME_REG_CSTS) == -1) { |