From 60537b282621f4824ddfed8a7e0fbc43dd235c80 Mon Sep 17 00:00:00 2001
From: leonidk <leonidk@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
Date: Mon, 11 Aug 2008 14:31:22 +0000
Subject: [PATCH] [MLX4] added support for Condor_G2 device

git-svn-id: svn://openib.tc.cornell.edu/gen1@1474 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
---
 trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx | 4 ++++
 trunk/hw/mlx4/kernel/bus/net/main.c       | 3 ++-
 trunk/hw/mlx4/kernel/inc/l2w_pci.h        | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx b/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx
index be5495d5..0af59759 100644
--- 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
 %MT26418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6732
 %MT26428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_673c
+%MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191
 
 [MLX4BUS.DeviceSection.ntamd64]
@@ -84,6 +85,7 @@ wdfcoinstaller01007.dll = 1,,
 %MT26418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6732
 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368
 %MT26428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_673c
+%MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191
 
 [MLX4BUS.DeviceSection.ntia64]
@@ -93,6 +95,7 @@ wdfcoinstaller01007.dll = 1,,
 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368
 %MT26418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6732
 %MT26428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_673c
+%MT26448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6750
 %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191
 
 [MLX4BUS.DDInstall.ntx86]
@@ -210,6 +213,7 @@ MT25428.DeviceDesc="ConnectX (MT25428) - Mellanox ConnectX QDR Channel Adapter"
 MT25448.DeviceDesc="ConnectX (MT25448) - Mellanox ConnectX Condor Ethernet Adapter"
 MT26418.DeviceDesc="ConnectX (MT26418) - Mellanox ConnectX DDR_G2 Channel Adapter"
 MT26428.DeviceDesc="ConnectX (MT26428) - Mellanox ConnectX QDR_G2 Channel Adapter"
+MT26448.DeviceDesc="ConnectX (MT26448) - Mellanox ConnectX Condor_G2 Ethernet Adapter"
 MT00401.DeviceDesc="ConnectX (MT00401) - Mellanox ConnectX Channel Adapter in Burning Mode"
 DiskId = "Mellanox Mlx4 Bus installation disk"
 SPSVCINST_NULL = 0x0
diff --git a/trunk/hw/mlx4/kernel/bus/net/main.c b/trunk/hw/mlx4/kernel/bus/net/main.c
index af2c0b8e..dbd377c1 100644
--- 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 38d986ba..0d943451 100644
--- 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 */
 
-- 
2.46.0