1 files changed, 20 insertions, 9 deletions

diff --git a/drivers/ntb/ntb_hw.c b/drivers/ntb/ntb_hw.c
index 3493e9516519..784446e1de05 100644
--- a/drivers/ntb/ntb_hw.c
+++ b/drivers/ntb/ntb_hw.c
@@ -94,11 +94,17 @@ static struct dentry *debugfs_dir;
 static DEFINE_PCI_DEVICE_TABLE(ntb_pci_tbl) = {
         {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_BWD)},
         {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_JSF)},
-        {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_CLASSIC_JSF)},
-        {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_RP_JSF)},
-        {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_RP_SNB)},
         {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_B2B_SNB)},
-        {PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_NTB_CLASSIC_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_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_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)},
         {0}
 };
 MODULE_DEVICE_TABLE(pci, ntb_pci_tbl);
@@ -815,13 +821,18 @@ static int ntb_device_setup(struct ntb_device *ndev)
         int rc;
 
         switch (ndev->pdev->device) {
-        case PCI_DEVICE_ID_INTEL_NTB_2ND_SNB:
-        case PCI_DEVICE_ID_INTEL_NTB_RP_JSF:
-        case PCI_DEVICE_ID_INTEL_NTB_RP_SNB:
-        case PCI_DEVICE_ID_INTEL_NTB_CLASSIC_JSF:
-        case PCI_DEVICE_ID_INTEL_NTB_CLASSIC_SNB:
+        case PCI_DEVICE_ID_INTEL_NTB_SS_JSF:
+        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_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_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:
                 rc = ntb_xeon_setup(ndev);
                 break;
         case PCI_DEVICE_ID_INTEL_NTB_B2B_BWD: