[mlx4] Add support for Yatir (more device ids)

git-svn-id: svn://openib.tc.cornell.edu/gen1@1511 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 0af597598f7563443bca131d9e801e718a2bf0e5..bd008fe0782b15f578f77c33ae78e181b64386aa 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
+++ b/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
@@ -71,31 +71,34 @@ wdfcoinstaller01007.dll = 1,,
 [MLX4BUS.DeviceSection.ntx86]\r
 %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
+%MT25458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6372\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
+%MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DeviceSection.ntamd64]\r
 %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
-%MT26418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6732\r
 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368\r
+%MT25458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6372\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
+%MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DeviceSection.ntia64]\r
 %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
+%MT25458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6372\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
+%MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A\r
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191\r
 \r
 [MLX4BUS.DDInstall.ntx86]\r
@@ -209,12 +212,13 @@ MTL="Mellanox Technologies Ltd."
 MLX4BUS.ServiceDesc = "Mellanox ConnectX Bus Enumerator"\r
 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
-MT26448.DeviceDesc="ConnectX (MT26448) - Mellanox ConnectX Condor_G2 Ethernet Adapter"\r
-MT00401.DeviceDesc="ConnectX (MT00401) - Mellanox ConnectX Channel Adapter in Burning Mode"\r
+MT25448.DeviceDesc="ConnectX (MT25448) - Mellanox ConnectX Ethernet Adapter"\r
+MT25458.DeviceDesc="ConnectX (MT25458) - Mellanox ConnectX Ethernet Adapter"\r
+MT26418.DeviceDesc="ConnectX (MT26418) - Mellanox ConnectX DDR PCI Gen2 Channel Adapter"\r
+MT26428.DeviceDesc="ConnectX (MT26428) - Mellanox ConnectX QDR PCI Gen2 Channel Adapter"\r
+MT26448.DeviceDesc="ConnectX (MT26448) - Mellanox ConnectX Ethernet PCI Gen2 Adapter"\r
+MT26458.DeviceDesc="ConnectX (MT26458) - Mellanox ConnectX Ethernet PCI Gen2 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
 SPSVCINST_ASSOCSERVICE = 0x00000002\r

diff --git a/trunk/hw/mlx4/kernel/bus/net/main.c b/trunk/hw/mlx4/kernel/bus/net/main.c
index fbaf2605d8d2ba04742249ecc3472160f77daf7f..6ed31cbf3dad3641a518aa4dfedd705ae5888e0e 100644 (file)
--- a/trunk/hw/mlx4/kernel/bus/net/main.c
+++ b/trunk/hw/mlx4/kernel/bus/net/main.c
@@ -95,13 +95,14 @@ 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, ETH_CONDOR_G2,    HERMON),
+       HCA(MELLANOX, ETH,              HERMON),
+       HCA(MELLANOX, ETH_YATIR,                HERMON),
+       HCA(MELLANOX, DDR_G2,           HERMON),
+       HCA(MELLANOX, QDR_G2,           HERMON),
+       HCA(MELLANOX, ETH_G2,           HERMON),
+       HCA(MELLANOX, ETH_YATIR_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 0d943451718a8ece1f6fd5095b5c206bf2f0ae82..0a42ee5570b08bd85abd37d2acd5a51604f758a9 100644 (file)
--- a/trunk/hw/mlx4/kernel/inc/l2w_pci.h
+++ b/trunk/hw/mlx4/kernel/inc/l2w_pci.h
@@ -6,13 +6,14 @@
 
 #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_ETH               0x6368  /* 25448 */
+#define DEVID_HERMON_ETH_YATIR         0x6372  /* 25458 */
 #define DEVID_HERMON_DDR_G2            0x6732  /* 26418 */
 #define DEVID_HERMON_QDR_G2            0x673c  /* 26428 */
-#define DEVID_HERMON_ETH_CONDOR_G2     0x6750  /* 26448 */
+#define DEVID_HERMON_ETH_G2            0x6750  /* 26448 */
+#define DEVID_HERMON_ETH_YATIR_G2              0x675A  /* 26458 */
 /* livefish */
-#define DEVID_HERMON_BD                        0x0191  /* 401 */
+#define DEVID_HERMON_BD                0x0191  /* 401 */
 
 /* Types of supported HCA */
 typedef enum __hca_type {