[mlx4] Add support for 6368 device.

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

diff --git a/hw/mlx4/kernel/bus/drv/mlx4_bus.inf b/hw/mlx4/kernel/bus/drv/mlx4_bus.inf
index 735a4f5..1dd32ed 100644 (file)
--- a/hw/mlx4/kernel/bus/drv/mlx4_bus.inf
+++ b/hw/mlx4/kernel/bus/drv/mlx4_bus.inf
@@ -72,6 +72,7 @@ wdfcoinstaller01007.dll = 1,,
 %MT25408.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6340\r
 %MT25418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_634A\r
 %MT25428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6354\r
+%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
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
@@ -81,6 +82,7 @@ wdfcoinstaller01007.dll = 1,,
 %MT25418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_634A\r
 %MT25428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6354\r
 %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
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
@@ -88,6 +90,7 @@ wdfcoinstaller01007.dll = 1,,
 %MT25408.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6340\r
 %MT25418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_634A\r
 %MT25428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6354\r
+%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
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
@@ -203,6 +206,7 @@ MLX4BUS.ServiceDesc = "Mellanox ConnectX Bus Enumerator"
 MT25408.DeviceDesc="ConnectX (MT25408) - Mellanox ConnectX SDR Channel Adapter"\r
 MT25418.DeviceDesc="ConnectX (MT25418) - Mellanox ConnectX DDR Channel Adapter"\r
 MT25428.DeviceDesc="ConnectX (MT25428) - Mellanox ConnectX QDR Channel Adapter"\r
+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
 MT00401.DeviceDesc="ConnectX (MT00401) - Mellanox ConnectX Channel Adapter in Burning Mode"\r

diff --git a/hw/mlx4/kernel/bus/net/main.c b/hw/mlx4/kernel/bus/net/main.c
index 73b3003..907574e 100644 (file)
--- a/hw/mlx4/kernel/bus/net/main.c
+++ b/hw/mlx4/kernel/bus/net/main.c
@@ -95,11 +95,12 @@ static void process_mod_param_profile(void)
 
 static struct pci_device_id 
 mlx4_pci_table[] = {
-       HCA(MELLANOX, SDR,              HERMON),
+       HCA(MELLANOX, SDR,      HERMON),          
        HCA(MELLANOX, DDR,              HERMON),
        HCA(MELLANOX, QDR,              HERMON),
        HCA(MELLANOX, DDR_G2,   HERMON),
        HCA(MELLANOX, QDR_G2,   HERMON),
+       HCA(MELLANOX, ETH_CONDOR, 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 64d67a1..38d986b 100644 (file)
--- a/hw/mlx4/kernel/inc/l2w_pci.h
+++ b/hw/mlx4/kernel/inc/l2w_pci.h
@@ -7,6 +7,7 @@
 #define DEVID_HERMON_SDR               0x6340  /* 25408 */
 #define DEVID_HERMON_DDR               0x634a  /* 25418 */
 #define DEVID_HERMON_QDR               0x6354  /* 25428 */
+#define DEVID_HERMON_ETH_CONDOR        0x6368  /* 25448 */
 #define DEVID_HERMON_DDR_G2            0x6732  /* 26418 */
 #define DEVID_HERMON_QDR_G2            0x673c  /* 26428 */
 /* livefish */