[MLX4] added support for 26478 device. [mlnx: 4766]

git-svn-id: svn://openib.tc.cornell.edu/gen1/trunk@2508 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/hw/mlx4/kernel/bus/drv/mlx4_bus.inx b/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
index d557fec..d827edd 100644 (file)
--- a/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
+++ b/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
@@ -80,6 +80,7 @@ wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 %MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750\r
 %MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A\r
 %MT26468.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6764\r
+%MT26478.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_676E\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DeviceSection.ntamd64]\r
@@ -92,6 +93,7 @@ wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 %MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750\r
 %MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A\r
 %MT26468.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6764\r
+%MT26478.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_676E\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DeviceSection.ntia64]\r
@@ -104,6 +106,7 @@ wdfcoinstaller$KMDFCOINSTALLERVERSION$.dll = 1,,
 %MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750\r
 %MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A\r
 %MT26468.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6764\r
+%MT26478.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_676E\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DDInstall.ntx86.hw]\r
@@ -275,6 +278,7 @@ MT26428.DeviceDesc="ConnectX (MT26428) - Mellanox ConnectX QDR PCI Gen2 Channel
 MT26448.DeviceDesc="ConnectX (MT26448) - Mellanox ConnectX Ethernet PCI Gen2 Adapter"\r
 MT26458.DeviceDesc="ConnectX (MT26458) - Mellanox ConnectX Ethernet PCI Gen2 Adapter"\r
 MT26468.DeviceDesc="ConnectX (MT26468) - Mellanox ConnectX B0 Ethernet PCI Gen2 Adapter"\r
+MT26478.DeviceDesc="ConnectX EN (MT26478) - Mellanox PCIe 2.0 5GT/s, 40GigE Ethernet Adapter"\r
 MT00401.DeviceDesc="ConnectX (MT00401) - Mellanox ConnectX Channel Adapter in Flash Recovery Mode"\r
 DiskId = "Mellanox Mlx4 Bus installation disk"\r
 SPSVCINST_NULL = 0x0\r

diff --git a/hw/mlx4/kernel/bus/net/main.c b/hw/mlx4/kernel/bus/net/main.c
index 61215ee..92bce0d 100644 (file)
--- a/hw/mlx4/kernel/bus/net/main.c
+++ b/hw/mlx4/kernel/bus/net/main.c
@@ -94,7 +94,8 @@ mlx4_pci_table[] = {
        HCA(MELLANOX, QDR_G2,           HERMON),
        HCA(MELLANOX, ETH_G2,           HERMON),
        HCA(MELLANOX, ETH_YATIR_G2,     HERMON),
-       HCA(MELLANOX, ETH_B0_G2,        HERMON),
+       HCA(MELLANOX, ETH_B0_G2,        HERMON),
+       HCA(MELLANOX, ETH_B0_40Gb_G2,   HERMON),
        HCA(MELLANOX, BD,               LIVEFISH),
 };
 #define MLX4_PCI_TABLE_SIZE (sizeof(mlx4_pci_table)/sizeof(struct pci_device_id))

diff --git a/hw/mlx4/kernel/inc/l2w_pci.h b/hw/mlx4/kernel/inc/l2w_pci.h
index 8acd9f5..3326cad 100644 (file)
--- a/hw/mlx4/kernel/inc/l2w_pci.h
+++ b/hw/mlx4/kernel/inc/l2w_pci.h
@@ -13,6 +13,7 @@
 #define DEVID_HERMON_ETH_G2            0x6750  /* 26448 */
 #define DEVID_HERMON_ETH_YATIR_G2              0x675A  /* 26458 */
 #define DEVID_HERMON_ETH_B0_G2         0x6764  /* 26468 */
+#define DEVID_HERMON_ETH_B0_40Gb_G2            0x676E  /* 26478 */
 /* livefish */
 #define DEVID_HERMON_BD                0x0191  /* 401 */
 

diff --git a/hw/mlx4/user/hca/mlx4.c b/hw/mlx4/user/hca/mlx4.c
index 068eae9..10b044a 100644 (file)
--- a/hw/mlx4/user/hca/mlx4.c
+++ b/hw/mlx4/user/hca/mlx4.c
@@ -56,6 +56,7 @@ struct {
        HCA(MELLANOX, 0x6750),  /* MT26448 "Hermon" Ethernet PCIe gen2 */\r
        HCA(MELLANOX, 0x675A),  /* MT26458 "Hermon" Ethernet Yatir PCIe gen2*/\r
        HCA(MELLANOX, 0x6764),  /* MT26468 "Hermon" B0 Ethernet PCIe gen2*/\r
+       HCA(MELLANOX, 0x676E),  /* MT26478 "Hermon" B0 40Gb Ethernet PCIe gen2*/\r
 \r
        HCA(MELLANOX, 0x0191),  /* MT25408 "Hermon" livefish mode */ \r
 };\r