From a22660b6ad751af9fab9c3643405b1d78f703abe Mon Sep 17 00:00:00 2001 From: tzachid Date: Tue, 26 Aug 2008 12:32:12 +0000 Subject: [PATCH] [mlx4] Add support for Yatir (more device ids) git-svn-id: svn://openib.tc.cornell.edu/gen1@1511 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx | 24 +++++++++++++---------- trunk/hw/mlx4/kernel/bus/net/main.c | 13 ++++++------ trunk/hw/mlx4/kernel/inc/l2w_pci.h | 9 +++++---- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx b/trunk/hw/mlx4/kernel/bus/drv/mlx4_bus.inx index 0af59759..bd008fe0 100644 --- 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] %MT25408.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6340 %MT25418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_634A -%MT25428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6354 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368 +%MT25458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6372 %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 +%MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191 [MLX4BUS.DeviceSection.ntamd64] %MT25408.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6340 %MT25418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_634A -%MT25428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6354 -%MT26418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6732 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368 +%MT25458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6372 +%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 +%MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191 [MLX4BUS.DeviceSection.ntia64] %MT25408.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6340 %MT25418.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_634A -%MT25428.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6354 %MT25448.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6368 +%MT25458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_6372 %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 +%MT26458.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_675A %MT00401.DeviceDesc%=MLX4BUS.DDInstall, PCI\VEN_15B3&DEV_0191 [MLX4BUS.DDInstall.ntx86] @@ -209,12 +212,13 @@ MTL="Mellanox Technologies Ltd." MLX4BUS.ServiceDesc = "Mellanox ConnectX Bus Enumerator" MT25408.DeviceDesc="ConnectX (MT25408) - Mellanox ConnectX SDR Channel Adapter" MT25418.DeviceDesc="ConnectX (MT25418) - Mellanox ConnectX DDR Channel Adapter" -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" +MT25448.DeviceDesc="ConnectX (MT25448) - Mellanox ConnectX Ethernet Adapter" +MT25458.DeviceDesc="ConnectX (MT25458) - Mellanox ConnectX Ethernet Adapter" +MT26418.DeviceDesc="ConnectX (MT26418) - Mellanox ConnectX DDR PCI Gen2 Channel Adapter" +MT26428.DeviceDesc="ConnectX (MT26428) - Mellanox ConnectX QDR PCI Gen2 Channel Adapter" +MT26448.DeviceDesc="ConnectX (MT26448) - Mellanox ConnectX Ethernet PCI Gen2 Adapter" +MT26458.DeviceDesc="ConnectX (MT26458) - Mellanox ConnectX Ethernet PCI Gen2 Adapter" +MT00401.DeviceDesc="ConnectX (MT00401) - Mellanox ConnectX Channel Adapter in Flash Recovery Mode" DiskId = "Mellanox Mlx4 Bus installation disk" SPSVCINST_NULL = 0x0 SPSVCINST_ASSOCSERVICE = 0x00000002 diff --git a/trunk/hw/mlx4/kernel/bus/net/main.c b/trunk/hw/mlx4/kernel/bus/net/main.c index fbaf2605..6ed31cbf 100644 --- 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 0d943451..0a42ee55 100644 --- 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 { -- 2.46.0