[MLX4] added support for Condor_G2 device

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

diff --git a/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx b/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
index be5495d5f00ea8438ad18333bd5788120079a1f2..0af597598f7563443bca131d9e801e718a2bf0e5 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
+++ b/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
@@ -75,6 +75,7 @@ wdfcoinstaller01007.dll = 1,,
 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368\r
 %MT26418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6732\r
 %MT26428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_673c\r
+%MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DeviceSection.ntamd64]\r
@@ -84,6 +85,7 @@ wdfcoinstaller01007.dll = 1,,
 %MT26418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6732\r
 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368\r
 %MT26428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_673c\r
+%MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DeviceSection.ntia64]\r
@@ -93,6 +95,7 @@ wdfcoinstaller01007.dll = 1,,
 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368\r
 %MT26418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6732\r
 %MT26428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_673c\r
+%MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DDInstall.ntx86]\r
@@ -210,6 +213,7 @@ MT25428.DeviceDesc="ConnectX (MT25428) - Mellanox ConnectX QDR Channel Adapter"
 MT25448.DeviceDesc="ConnectX (MT25448) - Mellanox ConnectX Condor Ethernet Adapter"\r
 MT26418.DeviceDesc="ConnectX (MT26418) - Mellanox ConnectX DDR_G2 Channel Adapter"\r
 MT26428.DeviceDesc="ConnectX (MT26428) - Mellanox ConnectX QDR_G2 Channel Adapter"\r
+MT26448.DeviceDesc="ConnectX (MT26448) - Mellanox ConnectX Condor_G2 Ethernet Adapter"\r
 MT00401.DeviceDesc="ConnectX (MT00401) - Mellanox ConnectX Channel Adapter in Burning Mode"\r
 DiskId = "Mellanox Mlx4 Bus installation disk"\r
 SPSVCINST_NULL = 0x0\r

diff --git a/trunk/hw/mlx4/kernel/bus/net/main.c b/trunk/hw/mlx4/kernel/bus/net/main.c
index af2c0b8e39a7fc304b35e593396c7879d33471a6..dbd377c1b63a218badda833c4344b71b69b74782 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/net/main.c
+++ b/trunk/hw/mlx4/kernel/bus/net/main.c
@@ -100,7 +100,8 @@ mlx4_pci_table[] = {
        HCA(MELLANOX, QDR,              HERMON),
        HCA(MELLANOX, DDR_G2,   HERMON),
        HCA(MELLANOX, QDR_G2,   HERMON),
-       HCA(MELLANOX, ETH_CONDOR, HERMON),
+       HCA(MELLANOX, ETH_CONDOR,               HERMON),
+       HCA(MELLANOX, ETH_CONDOR_G2,    HERMON),
        HCA(MELLANOX, BD,               LIVEFISH),
 };
 #define MLX4_PCI_TABLE_SIZE (sizeof(mlx4_pci_table)/sizeof(struct pci_device_id))

diff --git a/trunk/hw/mlx4/kernel/inc/l2w_pci.h b/trunk/hw/mlx4/kernel/inc/l2w_pci.h
index 38d986baabbe13a95c4b7da98383fd17f0a07595..0d943451718a8ece1f6fd5095b5c206bf2f0ae82 100644 (file)
--- a/trunk/hw/mlx4/kernel/inc/l2w_pci.h
+++ b/trunk/hw/mlx4/kernel/inc/l2w_pci.h
@@ -10,6 +10,7 @@
 #define DEVID_HERMON_ETH_CONDOR        0x6368  /* 25448 */
 #define DEVID_HERMON_DDR_G2            0x6732  /* 26418 */
 #define DEVID_HERMON_QDR_G2            0x673c  /* 26428 */
+#define DEVID_HERMON_ETH_CONDOR_G2     0x6750  /* 26448 */
 /* livefish */
 #define DEVID_HERMON_BD                        0x0191  /* 401 */