forked from luck/tmp_suning_uos_patched
ntb: hw: remove the code that sets the DMA mask
This patch removes the code that sets the DMA mask as it no longer
makes sense to do this.
Fixes: 7f46c8b3a5
("NTB: ntb_tool: Add full multi-port NTB API support")
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Tested-by: Alexander Fomichev <fomichev.ru@gmail.com>
Signed-off-by: Sanjay R Mehta <sanju.mehta@amd.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
parent
46f21af862
commit
f80fe8944e
|
@ -1191,10 +1191,6 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev,
|
|||
goto err_dma_mask;
|
||||
dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
|
||||
}
|
||||
rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
|
||||
dma_get_mask(&pdev->dev));
|
||||
if (rc)
|
||||
goto err_dma_mask;
|
||||
|
||||
ndev->self_mmio = pci_iomap(pdev, 0, 0);
|
||||
if (!ndev->self_mmio) {
|
||||
|
|
|
@ -2660,12 +2660,6 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
|
|||
dev_warn(&pdev->dev,
|
||||
"Cannot set consistent DMA highmem bit mask\n");
|
||||
}
|
||||
ret = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
|
||||
dma_get_mask(&pdev->dev));
|
||||
if (ret != 0) {
|
||||
dev_err(&pdev->dev, "Failed to set NTB device DMA bit mask\n");
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* Enable the device advanced error reporting. It's not critical to
|
||||
|
|
|
@ -1786,10 +1786,6 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev)
|
|||
goto err_dma_mask;
|
||||
dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");
|
||||
}
|
||||
rc = dma_coerce_mask_and_coherent(&ndev->ntb.dev,
|
||||
dma_get_mask(&pdev->dev));
|
||||
if (rc)
|
||||
goto err_dma_mask;
|
||||
|
||||
ndev->self_mmio = pci_iomap(pdev, 0, 0);
|
||||
if (!ndev->self_mmio) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user