Unverified Commit e6bec4e4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3093 backport adding GNR support for Intel PCIe gen5 NTB 

Merge Pull Request from: @wuzheng_e61f 
 
This patch is to add GNR support for Intel PCIe gen5 NTB.

Intel-kernel issue:
#I8KPHC

Test:
1.Using NTB hardware cards for connecting two GNRs.
2.set the right NTB port for matching the pcie port in BIOS.
3.Afer Intel NTB hardware is ready, please check the following link to test NTB in Linux.
https://github.com/davejiang/linux/wiki/Intel-NTB-Startup-Guide

Known issue:
N/A

If user want to enable this feature, please set the following items of config:
CONFIG_NTB_NETDEV=m
CONFIG_NTB=m
CONFIG_NTB_INTEL=m
CONFIG_NTB_PINGPONG=m
CONFIG_NTB_TOOL=m
CONFIG_NTB_PERF=m
CONFIG_NTB_TRANSPORT=m
 
 
Link:https://gitee.com/openeuler/kernel/pulls/3093

 

Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parents d4a9cbed 211ec660

drivers/ntb/hw/intel/ntb_hw_gen1.c

+8 −4
Original line number Diff line number Diff line
@@ -763,7 +763,7 @@ 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))

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

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



	return -ENXIO;
@@ -1882,7 +1882,7 @@ 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)) {

	} else if (pdev_is_gen4(pdev) || pdev_is_gen5(pdev)) {

		ndev->ntb.ops = &intel_ntb4_ops;

		rc = intel_ntb_init_pci(ndev, pdev);

		if (rc)
@@ -1912,7 +1912,8 @@ 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) || pdev_is_gen4(pdev))

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

	    pdev_is_gen4(pdev) || pdev_is_gen5(pdev))

		xeon_deinit_dev(ndev);

err_init_dev:

	intel_ntb_deinit_pci(ndev);
@@ -1928,7 +1929,8 @@ 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) || pdev_is_gen4(pdev))

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

	    pdev_is_gen4(pdev) || pdev_is_gen5(pdev))

		xeon_deinit_dev(ndev);

	intel_ntb_deinit_pci(ndev);

	kfree(ndev);
@@ -2055,6 +2057,8 @@ static const struct pci_device_id intel_ntb_pci_tbl[] = { 


	/* GEN4 */

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_ICX)},

	/* GEN5 PCIe */

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_GNR)},

	{0}

};

MODULE_DEVICE_TABLE(pci, intel_ntb_pci_tbl);

drivers/ntb/hw/intel/ntb_hw_gen4.c

+1 −1
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int gen4_init_dev(struct intel_ntb_dev *ndev) 
	ppd1 = ioread32(ndev->self_mmio + GEN4_PPD1_OFFSET);

	if (pdev_is_ICX(pdev))

		ndev->ntb.topo = gen4_ppd_topo(ndev, ppd1);

	else if (pdev_is_SPR(pdev))

	else if (pdev_is_SPR(pdev) || pdev_is_gen5(pdev))

		ndev->ntb.topo = spr_ppd_topo(ndev, ppd1);

	dev_dbg(&pdev->dev, "ppd %#x topo %s\n", ppd1,

		ntb_topo_string(ndev->ntb.topo));

drivers/ntb/hw/intel/ntb_hw_intel.h

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#define PCI_DEVICE_ID_INTEL_NTB_SS_BDX	0x6F0F

#define PCI_DEVICE_ID_INTEL_NTB_B2B_SKX	0x201C

#define PCI_DEVICE_ID_INTEL_NTB_B2B_ICX	0x347e

#define PCI_DEVICE_ID_INTEL_NTB_B2B_GNR	0x0db4



/* Ntb control and link status */

#define NTB_CTL_CFG_LOCK		BIT(0)
@@ -231,4 +232,10 @@ static inline int pdev_is_gen4(struct pci_dev *pdev) 


	return 0;

}



static inline int pdev_is_gen5(struct pci_dev *pdev)

{

	return pdev->device == PCI_DEVICE_ID_INTEL_NTB_B2B_GNR;

}



#endif