Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a5d19d9 authored by Dave Jiang's avatar Dave Jiang Committed by Jon Mason
Browse files

NTB: Add PCI Device IDs for Broadwell Xeon 



Adding PCI Device IDs for B2B (back to back), RP (root port, primary),
and TB (transparent bridge, secondary) devices.

Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
Signed-off-by: default avatarJon Mason <jdmason@kudzu.us>
parent e74bfeed

drivers/ntb/hw/intel/ntb_hw_intel.c

+15 −0
Original line number Diff line number Diff line
@@ -190,14 +190,17 @@ static inline int pdev_is_xeon(struct pci_dev *pdev) 
	case PCI_DEVICE_ID_INTEL_NTB_SS_SNB:

	case PCI_DEVICE_ID_INTEL_NTB_SS_IVT:

	case PCI_DEVICE_ID_INTEL_NTB_SS_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_SS_BDX:

	case PCI_DEVICE_ID_INTEL_NTB_PS_JSF:

	case PCI_DEVICE_ID_INTEL_NTB_PS_SNB:

	case PCI_DEVICE_ID_INTEL_NTB_PS_IVT:

	case PCI_DEVICE_ID_INTEL_NTB_PS_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_PS_BDX:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_JSF:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_SNB:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_IVT:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_BDX:

		return 1;

	}

	return 0;
@@ -1843,6 +1846,9 @@ static int xeon_init_dev(struct intel_ntb_dev *ndev) 
	case PCI_DEVICE_ID_INTEL_NTB_SS_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_PS_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_SS_BDX:

	case PCI_DEVICE_ID_INTEL_NTB_PS_BDX:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_BDX:

		ndev->hwerr_flags |= NTB_HWERR_SDOORBELL_LOCKUP;

		break;

	}
@@ -1857,6 +1863,9 @@ static int xeon_init_dev(struct intel_ntb_dev *ndev) 
	case PCI_DEVICE_ID_INTEL_NTB_SS_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_PS_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_SS_BDX:

	case PCI_DEVICE_ID_INTEL_NTB_PS_BDX:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_BDX:

		ndev->hwerr_flags |= NTB_HWERR_SB01BASE_LOCKUP;

		break;

	}
@@ -1878,6 +1887,9 @@ static int xeon_init_dev(struct intel_ntb_dev *ndev) 
	case PCI_DEVICE_ID_INTEL_NTB_SS_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_PS_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_HSX:

	case PCI_DEVICE_ID_INTEL_NTB_SS_BDX:

	case PCI_DEVICE_ID_INTEL_NTB_PS_BDX:

	case PCI_DEVICE_ID_INTEL_NTB_B2B_BDX:

		ndev->hwerr_flags |= NTB_HWERR_B2BDOORBELL_BIT14;

		break;

	}
@@ -2234,14 +2246,17 @@ static const struct pci_device_id intel_ntb_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SNB)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_IVT)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_HSX)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_BDX)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_PS_JSF)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_PS_SNB)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_PS_IVT)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_PS_HSX)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_PS_BDX)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_SS_JSF)},

	{PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_SS_SNB)},

	{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)},

	{0}

};

MODULE_DEVICE_TABLE(pci, intel_ntb_pci_tbl);

drivers/ntb/hw/intel/ntb_hw_intel.h

+3 −0
Original line number Diff line number Diff line
@@ -67,6 +67,9 @@ 
#define PCI_DEVICE_ID_INTEL_NTB_PS_HSX	0x2F0E

#define PCI_DEVICE_ID_INTEL_NTB_SS_HSX	0x2F0F

#define PCI_DEVICE_ID_INTEL_NTB_B2B_BWD	0x0C4E

#define PCI_DEVICE_ID_INTEL_NTB_B2B_BDX	0x6F0D

#define PCI_DEVICE_ID_INTEL_NTB_PS_BDX	0x6F0E

#define PCI_DEVICE_ID_INTEL_NTB_SS_BDX	0x6F0F



/* Intel Xeon hardware */