Commit 787f74fc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull NTB updates from Jon Mason:
 "Intel Icelake NTB support, Intel driver bug fixes, and lots of bug
  fixes for ntb tests"

* tag 'ntb-5.8' of git://github.com/jonmason/ntb:
  NTB: ntb_test: Fix bug when counting remote files
  NTB: perf: Fix race condition when run with ntb_test
  NTB: perf: Fix support for hardware that doesn't have port numbers
  NTB: perf: Don't require one more memory window than number of peers
  NTB: ntb_pingpong: Choose doorbells based on port number
  NTB: Fix the default port and peer numbers for legacy drivers
  NTB: Revert the change to use the NTB device dev for DMA allocations
  NTB: ntb_tool: reading the link file should not end in a NULL byte
  ntb_perf: avoid false dma unmap of destination address
  ntb_perf: increase sleep time from one milli sec to one sec
  ntb_tool: pass correct struct device to dma_alloc_coherent
  ntb_perf: pass correct struct device to dma_alloc_coherent
  ntb: hw: remove the code that sets the DMA mask
  NTB: correct ntb_peer_spad_addr and ntb_peer_spad_read comment typos
  ntb: intel: fix static declaration
  ntb: intel: add hw workaround for NTB BAR alignment
  ntb: intel: Add Icelake (gen4) support for Intel NTB
  NTB: Fix static check warning in perf_clear_test
  include/ntb: Fix typo in ntb_unregister_device description
parents a2b44706 2130c0ba

drivers/ntb/core.c

+2 −7
Original line number Diff line number Diff line
@@ -214,10 +214,8 @@ int ntb_default_port_number(struct ntb_dev *ntb) 
	case NTB_TOPO_B2B_DSD:

		return NTB_PORT_SEC_DSD;

	default:

		break;

		return 0;

	}



	return -EINVAL;

}

EXPORT_SYMBOL(ntb_default_port_number);
@@ -240,10 +238,8 @@ int ntb_default_peer_port_number(struct ntb_dev *ntb, int pidx) 
	case NTB_TOPO_B2B_DSD:

		return NTB_PORT_PRI_USD;

	default:

		break;

		return 0;

	}



	return -EINVAL;

}

EXPORT_SYMBOL(ntb_default_peer_port_number);
@@ -315,4 +311,3 @@ static void __exit ntb_driver_exit(void) 
	bus_unregister(&ntb_bus);

}

module_exit(ntb_driver_exit);

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/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_NTB_INTEL) += ntb_hw_intel.o

ntb_hw_intel-y := ntb_hw_gen1.o ntb_hw_gen3.o
 
ntb_hw_intel-y := ntb_hw_gen1.o ntb_hw_gen3.o ntb_hw_gen4.o

drivers/ntb/hw/intel/ntb_hw_gen1.c

+26 −23
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "ntb_hw_intel.h"

#include "ntb_hw_gen1.h"

#include "ntb_hw_gen3.h"

#include "ntb_hw_gen4.h"



#define NTB_NAME	"ntb_hw_intel"

#define NTB_DESC	"Intel(R) PCI-E Non-Transparent Bridge Driver"
@@ -762,6 +763,8 @@ static ssize_t ndev_debugfs_read(struct file *filp, char __user *ubuf, 
		return ndev_ntb_debugfs_read(filp, ubuf, count, offp);

	else if (pdev_is_gen3(ndev->ntb.pdev))

		return ndev_ntb3_debugfs_read(filp, ubuf, count, offp);

	else if (pdev_is_gen4(ndev->ntb.pdev))

		return ndev_ntb4_debugfs_read(filp, ubuf, count, offp);



	return -ENXIO;

}
@@ -1783,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) {
@@ -1858,8 +1857,6 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev, 
	int rc, node;



	node = dev_to_node(&pdev->dev);



	if (pdev_is_gen1(pdev)) {

	ndev = kzalloc_node(sizeof(*ndev), GFP_KERNEL, node);

	if (!ndev) {

		rc = -ENOMEM;
@@ -1868,6 +1865,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev, 


	ndev_init_struct(ndev, pdev);



	if (pdev_is_gen1(pdev)) {

		rc = intel_ntb_init_pci(ndev, pdev);

		if (rc)

			goto err_init_pci;
@@ -1875,17 +1873,8 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev, 
		rc = xeon_init_dev(ndev);

		if (rc)

			goto err_init_dev;



	} else if (pdev_is_gen3(pdev)) {

		ndev = kzalloc_node(sizeof(*ndev), GFP_KERNEL, node);

		if (!ndev) {

			rc = -ENOMEM;

			goto err_ndev;

		}



		ndev_init_struct(ndev, pdev);

		ndev->ntb.ops = &intel_ntb3_ops;



		rc = intel_ntb_init_pci(ndev, pdev);

		if (rc)

			goto err_init_pci;
@@ -1893,7 +1882,15 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev, 
		rc = gen3_init_dev(ndev);

		if (rc)

			goto err_init_dev;

	} else if (pdev_is_gen4(pdev)) {

		ndev->ntb.ops = &intel_ntb4_ops;

		rc = intel_ntb_init_pci(ndev, pdev);

		if (rc)

			goto err_init_pci;



		rc = gen4_init_dev(ndev);

		if (rc)

			goto err_init_dev;

	} else {

		rc = -EINVAL;

		goto err_ndev;
@@ -1915,7 +1912,7 @@ static int intel_ntb_pci_probe(struct pci_dev *pdev, 


err_register:

	ndev_deinit_debugfs(ndev);

	if (pdev_is_gen1(pdev) || pdev_is_gen3(pdev))

	if (pdev_is_gen1(pdev) || pdev_is_gen3(pdev) || pdev_is_gen4(pdev))

		xeon_deinit_dev(ndev);

err_init_dev:

	intel_ntb_deinit_pci(ndev);
@@ -1931,7 +1928,7 @@ static void intel_ntb_pci_remove(struct pci_dev *pdev) 


	ntb_unregister_device(&ndev->ntb);

	ndev_deinit_debugfs(ndev);

	if (pdev_is_gen1(pdev) || pdev_is_gen3(pdev))

	if (pdev_is_gen1(pdev) || pdev_is_gen3(pdev) || pdev_is_gen4(pdev))

		xeon_deinit_dev(ndev);

	intel_ntb_deinit_pci(ndev);

	kfree(ndev);
@@ -2036,6 +2033,7 @@ static const struct file_operations intel_ntb_debugfs_info = { 
};



static const struct pci_device_id intel_ntb_pci_tbl[] = {

	/* GEN1 */

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_JSF)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SNB)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_IVT)},
@@ -2051,7 +2049,12 @@ static const struct pci_device_id intel_ntb_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_SS_IVT)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_SS_HSX)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_SS_BDX)},



	/* GEN3 */

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SKX)},



	/* GEN4 */

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_ICX)},

	{0}

};

MODULE_DEVICE_TABLE(pci, intel_ntb_pci_tbl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE