Commit 1735715e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ntb-5.15' of git://github.com/jonmason/ntb 

Pull NTB updates from Jon Mason:
 "Bug fixes and clean-ups for Linux v5.15"

* tag 'ntb-5.15' of git://github.com/jonmason/ntb:
  NTB: switch from 'pci_' to 'dma_' API
  ntb: ntb_pingpong: remove redundant initialization of variables msg_data and spad_data
  NTB: perf: Fix an error code in perf_setup_inbuf()
  NTB: Fix an error code in ntb_msit_probe()
  ntb: intel: remove invalid email address in header comment
parents 21f577b0 38de3aff

drivers/ntb/hw/amd/ntb_hw_amd.c

+2 −10
Original line number Diff line number Diff line
@@ -1176,22 +1176,14 @@ static int amd_ntb_init_pci(struct amd_ntb_dev *ndev, 


	pci_set_master(pdev);



	rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));

	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (rc) {

		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (rc)

			goto err_dma_mask;

		dev_warn(&pdev->dev, "Cannot DMA highmem\n");

	}



	rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	if (rc) {

		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		if (rc)

			goto err_dma_mask;

		dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");

	}



	ndev->self_mmio = pci_iomap(pdev, 0, 0);

	if (!ndev->self_mmio) {

		rc = -EIO;

drivers/ntb/hw/idt/ntb_hw_idt.c

+2 −13
Original line number Diff line number Diff line
@@ -2640,26 +2640,15 @@ static int idt_init_pci(struct idt_ntb_dev *ndev) 
	int ret;



	/* Initialize the bit mask of PCI/NTB DMA */

	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));

	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (ret != 0) {

		ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (ret != 0) {

			dev_err(&pdev->dev, "Failed to set DMA bit mask\n");

			return ret;

		}

		dev_warn(&pdev->dev, "Cannot set DMA highmem bit mask\n");

	}

	ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	if (ret != 0) {

		ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		if (ret != 0) {

			dev_err(&pdev->dev,

				"Failed to set consistent DMA bit mask\n");

			return ret;

		}

		dev_warn(&pdev->dev,

			"Cannot set consistent DMA highmem bit mask\n");

	}



	/*

	 * Enable the device advanced error reporting. It's not critical to

drivers/ntb/hw/intel/ntb_hw_gen1.c

+2 −10
Original line number Diff line number Diff line
@@ -1771,22 +1771,14 @@ static int intel_ntb_init_pci(struct intel_ntb_dev *ndev, struct pci_dev *pdev) 


	pci_set_master(pdev);



	rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));

	rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (rc) {

		rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

		if (rc)

			goto err_dma_mask;

		dev_warn(&pdev->dev, "Cannot DMA highmem\n");

	}



	rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));

	if (rc) {

		rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));

		if (rc)

			goto err_dma_mask;

		dev_warn(&pdev->dev, "Cannot DMA consistent highmem\n");

	}



	ndev->self_mmio = pci_iomap(pdev, 0, 0);

	if (!ndev->self_mmio) {

		rc = -EIO;

drivers/ntb/hw/intel/ntb_hw_intel.h

+0 −3
Original line number Diff line number Diff line
@@ -43,9 +43,6 @@ 
 *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *

 * Intel PCIe NTB Linux driver

 *

 * Contact Information:

 * Jon Mason <jon.mason@intel.com>

 */



#ifndef NTB_HW_INTEL_H

drivers/ntb/test/ntb_msi_test.c

+3 −1
Original line number Diff line number Diff line
@@ -369,8 +369,10 @@ static int ntb_msit_probe(struct ntb_client *client, struct ntb_dev *ntb) 
	if (ret)

		goto remove_dbgfs;



	if (!nm->isr_ctx)

	if (!nm->isr_ctx) {

		ret = -ENOMEM;

		goto remove_dbgfs;

	}



	ntb_link_enable(ntb, NTB_SPEED_AUTO, NTB_WIDTH_AUTO);