Commit f80fe894 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Jon Mason
Browse files

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: 7f46c8b3 ("NTB: ntb_tool: Add full multi-port NTB API support")
Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Tested-by: default avatarAlexander Fomichev <fomichev.ru@gmail.com>
Signed-off-by: default avatarSanjay R Mehta <sanju.mehta@amd.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent 46f21af8

drivers/ntb/hw/amd/ntb_hw_amd.c

+0 −4
Original line number Diff line number Diff line
@@ -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) {

drivers/ntb/hw/idt/ntb_hw_idt.c

+0 −6
Original line number Diff line number Diff line
@@ -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

drivers/ntb/hw/intel/ntb_hw_gen1.c

+0 −4
Original line number Diff line number Diff line
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE