[WINVERBS/IBBUS] Now working for mlx4 devices.

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

diff --git a/branches/winverbs/core/bus/kernel/README.txt b/branches/winverbs/core/bus/kernel/README.txt
index 2e9da0318c3b769820f51b1271aa1bdaa92a8158..16e804b754aab33477db121155a793a1f87bce93 100644 (file)
--- a/branches/winverbs/core/bus/kernel/README.txt
+++ b/branches/winverbs/core/bus/kernel/README.txt
@@ -1,8 +1,13 @@
-[8-1-08]\r
+[8-18-08]\r
+\r
+ibbus as an upper filter driver for mthca & mlx4.\r
 \r
-ibbus as an upper filter driver for mthca (soon mlx4).\r
 Tested to be functional and working for mthca drivers using etc\mthca.inf on\r
 Server 2003 (multiple mthcas) along with a single mthca for Server 2008 & Vista.\r
+\r
+Tested to be functional and working for mlx4 (ConnectX) drivers using etc\mlx4_hca.inf on\r
+Server 2003 and Server 2008.\r
+\r
 IPoIB has been the test vehicle as I have no IOU accessible; need some help here.\r
 \r
 Since ibbus is a filter driver, the main change is inventing a way for the HCA \r
@@ -18,6 +23,6 @@ the HCA guid with the bus driver. I could use some alternative ideas here.
 \r
 The current folder is a direct replacement for trunk\core\bus\kernel using the head\r
 of the svn tree. There is still much debug code which will be removed once IOU testing\r
-is completed.\r
+has been completed.\r
 \r
 stan.
\ No newline at end of file

diff --git a/branches/winverbs/core/bus/kernel/bus_iou_mgr.c b/branches/winverbs/core/bus/kernel/bus_iou_mgr.c
index 2db2fc78e20adad3fb2b62d3e58d77481baba470..c3a2f3877c784e0239e51a9060de5ae02d1d7fd3 100644 (file)
--- a/branches/winverbs/core/bus/kernel/bus_iou_mgr.c
+++ b/branches/winverbs/core/bus/kernel/bus_iou_mgr.c
@@ -474,7 +474,7 @@ free_iou_mgr(
                BUS_TRACE( BUS_DBG_PNP,("%s(%s) p_ext->h_ca->obj.state %d ref_cnt %d\n",\r
                                        __FUNCTION__, p_bfi->whoami,\r
                                        p_ext->h_ca->obj.state,\r
-                                       p_ext->h_ca->obj.ref_cnt));//XXX\r
+                                       p_ext->h_ca->obj.ref_cnt));\r
 \r
                IoDeleteDevice( p_ext->cl_ext.p_self_do );\r
        }\r

diff --git a/branches/winverbs/core/bus/kernel/bus_pnp.c b/branches/winverbs/core/bus/kernel/bus_pnp.c
index 43c13e7a84d8906cf21e1e55907b0549d4053754..94e5f0ddde97a155070f7747f12edce710addfdf 100644 (file)
--- a/branches/winverbs/core/bus/kernel/bus_pnp.c
+++ b/branches/winverbs/core/bus/kernel/bus_pnp.c
@@ -1286,7 +1286,7 @@ get_bfi_by_ca_guid( IN net64_t ca_guid )
                matched = bus_filters;\r
                BUS_PRINT( BUS_DBG_PNP, ("%s() ERR guid %I64x -> bfi[0] %p\n",\r
                                                                __FUNCTION__, ca_guid, matched) );\r
-               CL_ASSERT( ca_guid ); // XXX\r
+               CL_ASSERT( ca_guid );\r
                return matched;\r
        }\r
 \r
@@ -1340,7 +1340,7 @@ get_set_bfi_by_ca_guid( IN net64_t ca_guid )
                matched = bus_filters;\r
                BUS_PRINT( BUS_DBG_PNP, ("%s() ERR guid 0x%I64x -> bfi[0] %p\n",\r
                                        __FUNCTION__, ca_guid, matched) );\r
-               CL_ASSERT( ca_guid ); // XXX\r
+               CL_ASSERT( ca_guid );\r
                return matched;\r
        }\r
 \r
@@ -1424,7 +1424,7 @@ alloc_bfi( IN DRIVER_OBJECT  *p_driver_obj, OUT int *p_instance_count )
                                                 "bfi-%d",\r
                                                 (bfi_InstanceCount - 1) );\r
 \r
-       p_bfi->magic = BFI_MAGIC; // XXX debug\r
+       p_bfi->magic = BFI_MAGIC;\r
 #endif\r
 \r
        BUS_PRINT( BUS_DBG_PNP, ("%s() %s %p\n",\r

diff --git a/branches/winverbs/core/bus/kernel/bus_port_mgr.c b/branches/winverbs/core/bus/kernel/bus_port_mgr.c
index 19891eeb4b44919b803cac09d000c7540af6dce9..e78d6514302ceb64b594a9ce07b052023518a960 100644 (file)
--- a/branches/winverbs/core/bus/kernel/bus_port_mgr.c
+++ b/branches/winverbs/core/bus/kernel/bus_port_mgr.c
@@ -912,7 +912,9 @@ port_mgr_port_add(
 * output:      none\r
 * return:      cl_status\r
 *************************************************************************************/\r
-cl_status_t port_mgr_pkey_add(pkey_array_t *pkeys)\r
+cl_status_t _port_mgr_pkey_add ( IN    pkey_array_t    *pkeys,\r
+                                                                IN     bus_filter_t    *p_bfi,\r
+                                                                IN     port_mgr_t              *gp_port_mgr )\r
 {\r
        uint16_t                        cnt;\r
        NTSTATUS            status;\r
@@ -921,15 +923,12 @@ cl_status_t port_mgr_pkey_add(pkey_array_t *pkeys)
        DEVICE_OBJECT       *p_pdo[MAX_NUM_PKEY];\r
        bus_pdo_ext_t           *p_pdo_ext = NULL;\r
        cl_qlist_t*                     p_pdo_list;\r
-       bus_filter_t            *p_bfi = &bus_filters[0];// pass in ca_guid? | all CA's?\r
-       port_mgr_t                      *gp_port_mgr;\r
 \r
        BUS_ENTER( BUS_DBG_PNP );\r
 \r
-       gp_port_mgr = p_bfi->p_port_mgr;        \r
-       p_pdo_list = &gp_port_mgr->port_list;\r
        p_port_ext = NULL;\r
        cl_mutex_acquire( &gp_port_mgr->pdo_mutex );\r
+       p_pdo_list = &gp_port_mgr->port_list;\r
        \r
        /* Count the number of child devices. */\r
        for( p_list_item = cl_qlist_head( p_pdo_list );\r
@@ -1010,6 +1009,32 @@ cl_status_t port_mgr_pkey_add(pkey_array_t *pkeys)
 }\r
 \r
 \r
+cl_status_t port_mgr_pkey_add(pkey_array_t *pkeys)\r
+{\r
+       bus_filter_t    *p_bfi;\r
+       cl_status_t             status;\r
+       boolean_t               GO;\r
+       int                             success_cnt=0;\r
+\r
+       for(p_bfi=&bus_filters[0]; p_bfi < &bus_filters[MAX_BUS_FILTERS]; p_bfi++)\r
+       {\r
+               if ( !p_bfi->p_bus_ext )\r
+                       continue;\r
+               GO = FALSE;\r
+               ExAcquireFastMutexUnsafe(&ControlMutex);\r
+               if ( p_bfi->ca_guid && p_bfi->p_port_mgr )\r
+                       GO = TRUE;\r
+               ExReleaseFastMutexUnsafe(&ControlMutex);\r
+               if ( GO == FALSE )\r
+                       continue;\r
+               status = _port_mgr_pkey_add( pkeys, p_bfi, p_bfi->p_port_mgr );\r
+               if ( status == CL_SUCCESS )\r
+                       success_cnt++;\r
+       }\r
+       return ( success_cnt ? CL_SUCCESS : CL_ERROR );\r
+}\r
+\r
+\r
 void\r
 port_mgr_port_remove(\r
        IN                              ib_pnp_port_rec_t*              p_pnp_rec )\r

diff --git a/branches/winverbs/core/bus/kernel/etc/mlx4_hca.inf b/branches/winverbs/core/bus/kernel/etc/mlx4_hca.inf
new file mode 100644 (file)
index 0000000..96ba542
--- /dev/null
+++ b/branches/winverbs/core/bus/kernel/etc/mlx4_hca.inf
@@ -0,0 +1,343 @@
+; Mellanox Technologies InfiniBand HCAs.\r
+; Copyright 2008 Mellanox Technologies all Rights Reserved.\r
+\r
+[Version]\r
+Signature="$WINDOWS NT$"\r
+Class=InfiniBandController\r
+ClassGUID={58517E00-D3CF-40c9-A679-CEE5752F4491}\r
+Provider=%MTL%\r
+; must be synchronized with hca\drv.c\r
+DriverVer=02/01/2008,1.0.0.0\r
+CatalogFile=mlx4_hca.cat\r
+\r
+\r
+;*****************************************\r
+; Destination directory section\r
+;*****************************************\r
+\r
+[DestinationDirs]\r
+DefaultDestDir = %DIRID_DRIVERS%\r
+MLX4HCA.UMCopyFiles = %DIRID_SYSTEM%\r
+MLX4HCA.WOW64CopyFiles = %DIRID_SYSTEM_X86%\r
+;Wdf_CoInstaller_CopyFiles = %DIRID_SYSTEM%\r
+Ibal.UMCopyFiles=%DIRID_SYSTEM%\r
+Ibal.WOW64CopyFiles=%DIRID_SYSTEM_X86%\r
+\r
+\r
+;*****************************************\r
+; Class Install section\r
+;*****************************************\r
+\r
+[ClassInstall32]\r
+AddReg=ClassAddReg\r
+\r
+[ClassAddReg]\r
+HKR,,,,"InfiniBand Channel Adapters"\r
+HKR,,Icon,,-5\r
+HKR,,SilentInstall,,0\r
+HKR,,"UpperFilters",0x00010000,"ibbus" ; enable IBBUS/AL Filter driver loading.\r
+\r
+\r
+;*****************************************\r
+; Device Install section\r
+;*****************************************\r
+\r
+[SourceDisksNames.x86]\r
+1=%DiskId%,,,""\r
+\r
+[SourceDisksNames.amd64]\r
+1=%DiskId%,,,""\r
+\r
+[SourceDisksNames.ia64]\r
+1=%DiskId%,,,""\r
+\r
+[SourceDisksFiles.x86]\r
+mlx4_hca.sys = 1,,\r
+mlx4u.dll = 1,,\r
+mlx4ud.dll = 1,,\r
+;wdfcoinstaller01005.dll = 1,,\r
+ibal.dll=1,,\r
+complib.dll=1,,\r
+ibald.dll=1,,\r
+complibd.dll=1,,\r
+ibbus.sys=1,,\r
+\r
+[SourceDisksFiles.amd64]\r
+mlx4_hca.sys = 1,,\r
+mlx4u.dll = 1,,\r
+mlx4ud.dll = 1,,\r
+mlx4u32.dll = 1,,\r
+mlx4u32d.dll = 1,,\r
+;wdfcoinstaller01005.dll = 1,,\r
+ibal.dll=1,,\r
+ibald.dll=1,,\r
+complib.dll=1,,\r
+complibd.dll=1,,\r
+cl32.dll=1,,\r
+cl32d.dll=1,,\r
+ibal32.dll=1,,\r
+ibal32d.dll=1,,\r
+ibbus.sys=1,,\r
+\r
+[SourceDisksFiles.ia64]\r
+mlx4_hca.sys = 1,,\r
+mlx4u.dll = 1,,\r
+mlx4ud.dll = 1,,\r
+mlx4u32.dll = 1,,\r
+mlx4u32d.dll = 1,,\r
+;wdfcoinstaller01005.dll = 1,,\r
+ibal.dll=1,,\r
+ibald.dll=1,,\r
+complib.dll=1,,\r
+complibd.dll=1,,\r
+cl32.dll=1,,\r
+cl32d.dll=1,,\r
+ibal32.dll=1,,\r
+ibal32d.dll=1,,\r
+ibbus.sys=1,,\r
+\r
+\r
+;*****************************************\r
+; Mlx4Bus  Install Section\r
+;*****************************************\r
+\r
+[Manufacturer]\r
+%MTL% = MLX4HCA.DeviceSection,ntx86,ntamd64,ntia64\r
+\r
+[MLX4HCA.DeviceSection]\r
+; empty since we don't support W9x/Me\r
+\r
+[MLX4HCA.DeviceSection.ntx86]\r
+%Mlx4_Hca.DeviceDesc%=MLX4HCA.DDInstall, MLX4\ConnectX_Hca\r
+\r
+[MLX4HCA.DeviceSection.ntamd64]\r
+%Mlx4_Hca.DeviceDesc%=MLX4HCA.DDInstall, MLX4\ConnectX_Hca\r
+\r
+[MLX4HCA.DeviceSection.ntia64]\r
+%Mlx4_Hca.DeviceDesc%=MLX4HCA.DDInstall, MLX4\ConnectX_Hca\r
+\r
+[MLX4HCA.DDInstall.ntx86]\r
+CopyFiles = MLX4HCA.CopyFiles\r
+CopyFiles = MLX4HCA.UMCopyFiles\r
+CopyFiles = Ibal.UMCopyFiles\r
+CopyFiles = Ibbus.CopyFiles\r
+\r
+[MLX4HCA.DDInstall.ntamd64]\r
+CopyFiles = MLX4HCA.CopyFiles\r
+CopyFiles = MLX4HCA.UMCopyFiles\r
+CopyFiles = MLX4HCA.WOW64CopyFiles\r
+CopyFiles = Ibal.UMCopyFiles\r
+CopyFiles = Ibal.WOW64CopyFiles\r
+CopyFiles = Ibbus.CopyFiles\r
+\r
+[MLX4HCA.DDInstall.ntia64]\r
+CopyFiles = MLX4HCA.CopyFiles\r
+CopyFiles = MLX4HCA.UMCopyFiles\r
+CopyFiles = MLX4HCA.WOW64CopyFiles\r
+CopyFiles = Ibal.UMCopyFiles\r
+CopyFiles = Ibal.WOW64CopyFiles\r
+CopyFiles = Ibbus.CopyFiles\r
+\r
+[MLX4HCA.DDInstall.ntx86.Services]\r
+AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog\r
+AddService = ibbus,,Ibbus.ServiceInstall\r
+\r
+[MLX4HCA.DDInstall.ntamd64.Services]\r
+AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog\r
+AddService = ibbus,,Ibbus.ServiceInstall\r
+\r
+[MLX4HCA.DDInstall.ntia64.Services]\r
+AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog\r
+AddService = ibbus,,Ibbus.ServiceInstall\r
+\r
+\r
+;*****************************************\r
+; File Copy\r
+;*****************************************\r
+\r
+[MLX4HCA.CopyFiles]\r
+mlx4_hca.sys\r
+\r
+[MLX4HCA.UMCopyFiles]\r
+mlx4u.dll,,,2\r
+mlx4ud.dll,,,2\r
+\r
+[MLX4HCA.WOW64CopyFiles]\r
+mlx4u.dll,mlx4u32.dll,,2\r
+mlx4ud.dll,mlx4u32d.dll,,2\r
+\r
+[Ibal.UMCopyFiles]\r
+ibal.dll,,,2\r
+ibald.dll,,,2\r
+complib.dll,,,2\r
+complibd.dll,,,2\r
+\r
+[Ibal.WOW64CopyFiles]\r
+ibal.dll,ibal32.dll,,2\r
+ibald.dll,ibal32d.dll,,2\r
+complib.dll,cl32.dll,,2\r
+complibd.dll,cl32d.dll,,2\r
+\r
+[Ibbus.CopyFiles]\r
+ibbus.sys\r
+\r
+\r
+;*****************************************\r
+; MLX4 Service Install section\r
+;*****************************************\r
+\r
+[MLX4HCA.ServiceInstall]\r
+DisplayName     = %MLX4HCA.ServiceDesc%\r
+ServiceType     = %SERVICE_KERNEL_DRIVER%\r
+StartType       = %SERVICE_DEMAND_START%\r
+ErrorControl    = %SERVICE_ERROR_NORMAL%\r
+ServiceBinary   = %12%\mlx4_hca.sys\r
+LoadOrderGroup  = extended base\r
+AddReg          = MLX4HCA.ParamsReg\r
+\r
+[MLX4HCA.EventLog]\r
+AddReg = MLX4HCA.AddEventLogReg\r
+\r
+[MLX4HCA.AddEventLogReg]\r
+HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\IoLogMsg.dll;%%SystemRoot%%\System32\drivers\mlx4_hca.sys"\r
+HKR, , TypesSupported,   0x00010001, 7\r
+\r
+[MLX4HCA.ParamsReg]\r
+HKR,,DeviceCharacteristics,0x10001,0x0100         ; Use same security checks on relative opens\r
+HKR,,Security,,"D:P(A;;GA;;;BA)(A;;GA;;;SY)"      ; Allow generic-all access to Built-in administrators and Local system \r
+HKR,"Parameters","DebugLevel",%REG_DWORD%,0x00000003\r
+HKR,"Parameters","DebugFlags",%REG_DWORD%,0x0000ffff\r
+HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\F8C96A49-AE22-41e9-8025-D7E416884D89","Flags",%REG_DWORD%,0xffff\r
+HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\F8C96A49-AE22-41e9-8025-D7E416884D89","Level",%REG_DWORD%,0x3\r
+\r
+\r
+;*****************************************\r
+; IBBUS Service Install section\r
+;*****************************************\r
+\r
+[Ibbus.ServiceInstall]\r
+DisplayName     = %Ibbus.ServiceDesc%\r
+ServiceType     = %SERVICE_KERNEL_DRIVER%\r
+StartType       = %SERVICE_DEMAND_START%\r
+ErrorControl    = %SERVICE_ERROR_NORMAL%\r
+ServiceBinary   = %12%\ibbus.sys\r
+LoadOrderGroup  = PnP Filter\r
+AddReg          = Ibbus.ParamsReg\r
+Dependencies   = mlx4_hca\r
+\r
+[Ibbus.ParamsReg]\r
+HKR,"Parameters","IbalDebugLevel",%REG_DWORD%,2\r
+HKR,"Parameters","IbalDebugFlags",%REG_DWORD%,0x00ffffff\r
+HKR,"Parameters","SmiPollInterval",%REG_DWORD_NO_CLOBBER%,20000\r
+HKR,"Parameters","IocQueryTimeout",%REG_DWORD_NO_CLOBBER%,250\r
+HKR,"Parameters","IocQueryRetries",%REG_DWORD_NO_CLOBBER%,4\r
+HKR,"Parameters","IocPollInterval",%REG_DWORD_NO_CLOBBER%,30000\r
+HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000\r
+HKR,"Parameters","ReportPortNIC",%REG_DWORD%,1\r
+\r
+\r
+;*****************************************\r
+; Uninstall section (not used now)\r
+;*****************************************\r
+\r
+[DefaultUninstall.ntx86]\r
+DelFiles   = MLX4HCA.CopyFiles\r
+DelFiles   = MLX4HCA.UMCopyFiles\r
+DelReg     = MLX4HCA.ParamsReg\r
+DelReg     = MLX4HCA.AddEventLogReg\r
+DelReg     = ClassAddReg\r
+DelFiles   = Ibal.UMCopyFiles\r
+\r
+\r
+[DefaultUninstall.ntamd64]\r
+DelFiles   = MLX4HCA.CopyFiles\r
+DelFiles   = MLX4HCA.UMCopyFiles\r
+DelFiles   = MLX4HCA.WOW64CopyFiles\r
+DelReg     = MLX4HCA.ParamsReg\r
+DelReg     = MLX4HCA.AddEventLogReg\r
+DelReg     = ClassAddReg\r
+DelFiles   = Ibal.UMCopyFiles\r
+DelFiles   = Ibal.WOW64CopyFiles\r
+DelFiles   = Ibbus.CopyFiles\r
+DelReg     = Ibbus.ParamsReg\r
+\r
+[DefaultUninstall.ntia64]\r
+DelFiles   = MLX4HCA.CopyFiles\r
+DelFiles   = MLX4HCA.UMCopyFiles\r
+DelFiles   = MLX4HCA.WOW64CopyFiles\r
+DelReg     = MLX4HCA.ParamsReg\r
+DelReg     = MLX4HCA.AddEventLogReg\r
+DelReg     = ClassAddReg\r
+DelFiles   = Ibal.UMCopyFiles\r
+DelFiles   = Ibal.WOW64CopyFiles\r
+DelFiles   = Ibbus.CopyFiles\r
+DelReg     = Ibbus.ParamsReg\r
+\r
+[DefaultUninstall.Services]\r
+DelService = Ibbus,%SPSVCINST_STOPSERVICE%\r
+DelService = mthca,%SPSVCINST_STOPSERVICE%\r
+\r
+\r
+;\r
+; The below section is temporarily disabled.\r
+; It should be uncommented after returning MLX4_HCA to WDF model.\r
+;\r
+\r
+;*****************************************\r
+; WDF Coinstaller installation section\r
+;*****************************************\r
+\r
+;[MLX4HCA.DDInstall.ntx86.CoInstallers]\r
+;AddReg=Wdf_CoInstaller_AddReg\r
+;CopyFiles=Wdf_CoInstaller_CopyFiles\r
+\r
+;[MLX4HCA.DDInstall.ntamd64.CoInstallers]\r
+;AddReg=Wdf_CoInstaller_AddReg\r
+;CopyFiles=Wdf_CoInstaller_CopyFiles\r
+\r
+;[MLX4HCA.DDInstall.ntia64.CoInstallers]\r
+;AddReg=Wdf_CoInstaller_AddReg\r
+;CopyFiles=Wdf_CoInstaller_CopyFiles\r
+\r
+;[Wdf_CoInstaller_AddReg]\r
+;HKR,,CoInstallers32,0x00010000, "wdfcoinstaller01005.dll,WdfCoInstaller"\r
+\r
+;[Wdf_CoInstaller_CopyFiles]\r
+;wdfcoinstaller01005.dll\r
+\r
+;[MLX4HCA.DDInstall.ntx86.Wdf]\r
+;KmdfService = mlx4_hca, mlx4_hca_wdfsect\r
+\r
+;[MLX4HCA.DDInstall.ntamd64.Wdf]\r
+;KmdfService = mlx4_hca, mlx4_hca_wdfsect\r
+\r
+;[MLX4HCA.DDInstall.ntia64.Wdf]\r
+;KmdfService = mlx4_hca, mlx4_hca_wdfsect\r
+\r
+;[mlx4_hca_wdfsect]\r
+;KmdfLibraryVersion = 1.5\r
+\r
+\r
+;*****************************************\r
+; Strings\r
+;*****************************************\r
+\r
+[Strings]\r
+Mlx4HcaClassGuid = "{31B0B28A-26FF-4dca-A6FA-E767C7DFBA20}"\r
+MTL="Mellanox Technologies Ltd."\r
+MLX4HCA.ServiceDesc = "Mellanox ConnectX Virtual Infiband Driver"\r
+Ibbus.ServiceDesc = "InfiniBand Bus/Fabric/AL (Filter Driver)"\r
+Mlx4_Hca.DeviceDesc="Mellanox ConnectX Virtual Channel Adapter"\r
+DiskId = "Mellanox Mlx4 Bus installation disk"\r
+SPSVCINST_NULL = 0x0\r
+SPSVCINST_ASSOCSERVICE = 0x00000002\r
+SPSVCINST_STOPSERVICE  = 0x00000200\r
+SERVICE_KERNEL_DRIVER  = 1\r
+SERVICE_DEMAND_START   = 3\r
+SERVICE_ERROR_NORMAL   = 1\r
+REG_DWORD              = 0x00010001\r
+REG_DWORD_NO_CLOBBER   = 0x00010003\r
+REG_MULTI_SZ_APPEND    = 0x00010008\r
+DIRID_SYSTEM           = 11\r
+DIRID_DRIVERS          = 12\r
+DIRID_SYSTEM_X86       = 16425\r

diff --git a/branches/winverbs/core/bus/kernel/etc/mlx4_hca2.inf b/branches/winverbs/core/bus/kernel/etc/mlx4_hca2.inf
deleted file mode 100644 (file)
index 7c42b7a..0000000
--- a/branches/winverbs/core/bus/kernel/etc/mlx4_hca2.inf
+++ /dev/null
@@ -1,346 +0,0 @@
-; Mellanox Technologies InfiniBand HCAs.\r
-; Copyright 2008 Mellanox Technologies all Rights Reserved.\r
-\r
-[Version]\r
-Signature="$WINDOWS NT$"\r
-Class=InfinibandMlx4Controller\r
-ClassGUID={31B0B28A-26FF-4dca-A6FA-E767C7DFBA20}\r
-Provider=%MTL%\r
-; must be synchronized with hca\drv.c\r
-DriverVer=02/01/2008,1.0.0.0\r
-CatalogFile=mlx4_hca.cat\r
-\r
-\r
-;*****************************************\r
-; Destination directory section\r
-;*****************************************\r
-\r
-[DestinationDirs]\r
-DefaultDestDir = %DIRID_DRIVERS%\r
-MLX4HCA.UMCopyFiles = %DIRID_SYSTEM%\r
-MLX4HCA.WOW64CopyFiles = %DIRID_SYSTEM_X86%\r
-;Wdf_CoInstaller_CopyFiles = %DIRID_SYSTEM%\r
-Ibal.UMCopyFiles=%DIRID_SYSTEM%\r
-Ibal.WOW64CopyFiles=%DIRID_SYSTEM_X86%\r
-\r
-\r
-;*****************************************\r
-; Class Install section\r
-;*****************************************\r
-\r
-[ClassInstall32]\r
-AddReg=ClassAddReg\r
-\r
-[ClassAddReg]\r
-HKR,,,,"Mellanox ConnectX Virtual InfiniBand Adapters"\r
-HKR,,Icon,,-5\r
-HKR,,SilentInstall,,0\r
-HKR,,"UpperFilters",0x00010000,"ibbus" ; enable IBBUS/AL Filter driver loading.\r
-\r
-\r
-;*****************************************\r
-; Device Install section\r
-;*****************************************\r
-\r
-[SourceDisksNames.x86]\r
-1=%DiskId%,,,""\r
-\r
-[SourceDisksNames.amd64]\r
-1=%DiskId%,,,""\r
-\r
-[SourceDisksNames.ia64]\r
-1=%DiskId%,,,""\r
-\r
-[SourceDisksFiles.x86]\r
-IbInstaller.dll = 1,,\r
-mlx4_hca.sys = 1,,\r
-mlx4u.dll = 1,,\r
-mlx4ud.dll = 1,,\r
-;wdfcoinstaller01005.dll = 1,,\r
-ibal.dll=1,,\r
-complib.dll=1,,\r
-ibald.dll=1,,\r
-complibd.dll=1,,\r
-ibbus.sys=1,,\r
-\r
-[SourceDisksFiles.amd64]\r
-IbInstaller.dll = 1,,\r
-mlx4_hca.sys = 1,,\r
-mlx4u.dll = 1,,\r
-mlx4ud.dll = 1,,\r
-mlx4u32.dll = 1,,\r
-mlx4u32d.dll = 1,,\r
-;wdfcoinstaller01005.dll = 1,,\r
-ibal.dll=1,,\r
-ibald.dll=1,,\r
-complib.dll=1,,\r
-complibd.dll=1,,\r
-cl32.dll=1,,\r
-cl32d.dll=1,,\r
-ibal32.dll=1,,\r
-ibal32d.dll=1,,\r
-ibbus.sys=1,,\r
-\r
-[SourceDisksFiles.ia64]\r
-IbInstaller.dll = 1,,\r
-mlx4_hca.sys = 1,,\r
-mlx4u.dll = 1,,\r
-mlx4ud.dll = 1,,\r
-mlx4u32.dll = 1,,\r
-mlx4u32d.dll = 1,,\r
-;wdfcoinstaller01005.dll = 1,,\r
-ibal.dll=1,,\r
-ibald.dll=1,,\r
-complib.dll=1,,\r
-complibd.dll=1,,\r
-cl32.dll=1,,\r
-cl32d.dll=1,,\r
-ibal32.dll=1,,\r
-ibal32d.dll=1,,\r
-ibbus.sys=1,,\r
-\r
-\r
-;*****************************************\r
-; Mlx4Bus  Install Section\r
-;*****************************************\r
-\r
-[Manufacturer]\r
-%MTL% = MLX4HCA.DeviceSection,ntx86,ntamd64,ntia64\r
-\r
-[MLX4HCA.DeviceSection]\r
-; empty since we don't support W9x/Me\r
-\r
-[MLX4HCA.DeviceSection.ntx86]\r
-%Mlx4_Hca.DeviceDesc%=MLX4HCA.DDInstall, MLX4\ConnectX_Hca\r
-\r
-[MLX4HCA.DeviceSection.ntamd64]\r
-%Mlx4_Hca.DeviceDesc%=MLX4HCA.DDInstall, MLX4\ConnectX_Hca\r
-\r
-[MLX4HCA.DeviceSection.ntia64]\r
-%Mlx4_Hca.DeviceDesc%=MLX4HCA.DDInstall, MLX4\ConnectX_Hca\r
-\r
-[MLX4HCA.DDInstall.ntx86]\r
-CopyFiles = MLX4HCA.CopyFiles\r
-CopyFiles = MLX4HCA.UMCopyFiles\r
-CopyFiles = Ibal.UMCopyFiles\r
-CopyFiles = Ibbus.CopyFiles\r
-\r
-[MLX4HCA.DDInstall.ntamd64]\r
-CopyFiles = MLX4HCA.CopyFiles\r
-CopyFiles = MLX4HCA.UMCopyFiles\r
-CopyFiles = MLX4HCA.WOW64CopyFiles\r
-CopyFiles = Ibal.UMCopyFiles\r
-CopyFiles = Ibal.WOW64CopyFiles\r
-CopyFiles = Ibbus.CopyFiles\r
-\r
-[MLX4HCA.DDInstall.ntia64]\r
-CopyFiles = MLX4HCA.CopyFiles\r
-CopyFiles = MLX4HCA.UMCopyFiles\r
-CopyFiles = MLX4HCA.WOW64CopyFiles\r
-CopyFiles = Ibal.UMCopyFiles\r
-CopyFiles = Ibal.WOW64CopyFiles\r
-CopyFiles = Ibbus.CopyFiles\r
-\r
-[MLX4HCA.DDInstall.ntx86.Services]\r
-AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog\r
-AddService = ibbus,,Ibbus.ServiceInstall\r
-\r
-[MLX4HCA.DDInstall.ntamd64.Services]\r
-AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog\r
-AddService = ibbus,,Ibbus.ServiceInstall\r
-\r
-[MLX4HCA.DDInstall.ntia64.Services]\r
-AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog\r
-AddService = ibbus,,Ibbus.ServiceInstall\r
-\r
-\r
-;*****************************************\r
-; File Copy\r
-;*****************************************\r
-\r
-[MLX4HCA.CopyFiles]\r
-mlx4_hca.sys\r
-\r
-[MLX4HCA.UMCopyFiles]\r
-mlx4u.dll,,,2\r
-mlx4ud.dll,,,2\r
-\r
-[MLX4HCA.WOW64CopyFiles]\r
-mlx4u.dll,mlx4u32.dll,,2\r
-mlx4ud.dll,mlx4u32d.dll,,2\r
-\r
-[Ibal.UMCopyFiles]\r
-ibal.dll,,,2\r
-ibald.dll,,,2\r
-complib.dll,,,2\r
-complibd.dll,,,2\r
-\r
-[Ibal.WOW64CopyFiles]\r
-ibal.dll,ibal32.dll,,2\r
-ibald.dll,ibal32d.dll,,2\r
-complib.dll,cl32.dll,,2\r
-complibd.dll,cl32d.dll,,2\r
-\r
-[Ibbus.CopyFiles]\r
-ibbus.sys\r
-\r
-\r
-;*****************************************\r
-; MLX4 Service Install section\r
-;*****************************************\r
-\r
-[MLX4HCA.ServiceInstall]\r
-DisplayName     = %MLX4HCA.ServiceDesc%\r
-ServiceType     = %SERVICE_KERNEL_DRIVER%\r
-StartType       = %SERVICE_DEMAND_START%\r
-ErrorControl    = %SERVICE_ERROR_NORMAL%\r
-ServiceBinary   = %12%\mlx4_hca.sys\r
-LoadOrderGroup  = extended base\r
-AddReg          = MLX4HCA.ParamsReg\r
-\r
-[MLX4HCA.EventLog]\r
-AddReg = MLX4HCA.AddEventLogReg\r
-\r
-[MLX4HCA.AddEventLogReg]\r
-HKR, , EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\IoLogMsg.dll;%%SystemRoot%%\System32\drivers\mlx4_hca.sys"\r
-HKR, , TypesSupported,   0x00010001, 7\r
-\r
-[MLX4HCA.ParamsReg]\r
-HKR,,DeviceCharacteristics,0x10001,0x0100         ; Use same security checks on relative opens\r
-HKR,,Security,,"D:P(A;;GA;;;BA)(A;;GA;;;SY)"      ; Allow generic-all access to Built-in administrators and Local system \r
-HKR,"Parameters","DebugLevel",%REG_DWORD%,0x00000003\r
-HKR,"Parameters","DebugFlags",%REG_DWORD%,0x0000ffff\r
-HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\F8C96A49-AE22-41e9-8025-D7E416884D89","Flags",%REG_DWORD%,0xffff\r
-HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\F8C96A49-AE22-41e9-8025-D7E416884D89","Level",%REG_DWORD%,0x3\r
-\r
-\r
-;*****************************************\r
-; IBBUS Service Install section\r
-;*****************************************\r
-\r
-[Ibbus.ServiceInstall]\r
-DisplayName     = %Ibbus.ServiceDesc%\r
-ServiceType     = %SERVICE_KERNEL_DRIVER%\r
-StartType       = %SERVICE_DEMAND_START%\r
-ErrorControl    = %SERVICE_ERROR_NORMAL%\r
-ServiceBinary   = %12%\ibbus.sys\r
-LoadOrderGroup  = PnP Filter\r
-AddReg          = Ibbus.ParamsReg\r
-Dependencies   = mthca\r
-\r
-[Ibbus.ParamsReg]\r
-HKR,"Parameters","IbalDebugLevel",%REG_DWORD%,2\r
-HKR,"Parameters","IbalDebugFlags",%REG_DWORD%,0x00ffffff\r
-HKR,"Parameters","SmiPollInterval",%REG_DWORD_NO_CLOBBER%,20000\r
-HKR,"Parameters","IocQueryTimeout",%REG_DWORD_NO_CLOBBER%,250\r
-HKR,"Parameters","IocQueryRetries",%REG_DWORD_NO_CLOBBER%,4\r
-HKR,"Parameters","IocPollInterval",%REG_DWORD_NO_CLOBBER%,30000\r
-HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000\r
-HKR,"Parameters","ReportPortNIC",%REG_DWORD%,1\r
-\r
-\r
-;*****************************************\r
-; Uninstall section (not used now)\r
-;*****************************************\r
-\r
-[DefaultUninstall.ntx86]\r
-DelFiles   = MLX4HCA.CopyFiles\r
-DelFiles   = MLX4HCA.UMCopyFiles\r
-DelReg     = MLX4HCA.ParamsReg\r
-DelReg     = MLX4HCA.AddEventLogReg\r
-DelReg     = ClassAddReg\r
-DelFiles   = Ibal.UMCopyFiles\r
-\r
-\r
-[DefaultUninstall.ntamd64]\r
-DelFiles   = MLX4HCA.CopyFiles\r
-DelFiles   = MLX4HCA.UMCopyFiles\r
-DelFiles   = MLX4HCA.WOW64CopyFiles\r
-DelReg     = MLX4HCA.ParamsReg\r
-DelReg     = MLX4HCA.AddEventLogReg\r
-DelReg     = ClassAddReg\r
-DelFiles   = Ibal.UMCopyFiles\r
-DelFiles   = Ibal.WOW64CopyFiles\r
-DelFiles   = Ibbus.CopyFiles\r
-DelReg     = Ibbus.ParamsReg\r
-\r
-[DefaultUninstall.ntia64]\r
-DelFiles   = MLX4HCA.CopyFiles\r
-DelFiles   = MLX4HCA.UMCopyFiles\r
-DelFiles   = MLX4HCA.WOW64CopyFiles\r
-DelReg     = MLX4HCA.ParamsReg\r
-DelReg     = MLX4HCA.AddEventLogReg\r
-DelReg     = ClassAddReg\r
-DelFiles   = Ibal.UMCopyFiles\r
-DelFiles   = Ibal.WOW64CopyFiles\r
-DelFiles   = Ibbus.CopyFiles\r
-DelReg     = Ibbus.ParamsReg\r
-\r
-[DefaultUninstall.Services]\r
-DelService = Ibbus,%SPSVCINST_STOPSERVICE%\r
-DelService = mthca,%SPSVCINST_STOPSERVICE%\r
-\r
-\r
-;\r
-; The below section is temporarily disabled.\r
-; It should be uncommented after returning MLX4_HCA to WDF model.\r
-;\r
-\r
-;*****************************************\r
-; WDF Coinstaller installation section\r
-;*****************************************\r
-\r
-;[MLX4HCA.DDInstall.ntx86.CoInstallers]\r
-;AddReg=Wdf_CoInstaller_AddReg\r
-;CopyFiles=Wdf_CoInstaller_CopyFiles\r
-\r
-;[MLX4HCA.DDInstall.ntamd64.CoInstallers]\r
-;AddReg=Wdf_CoInstaller_AddReg\r
-;CopyFiles=Wdf_CoInstaller_CopyFiles\r
-\r
-;[MLX4HCA.DDInstall.ntia64.CoInstallers]\r
-;AddReg=Wdf_CoInstaller_AddReg\r
-;CopyFiles=Wdf_CoInstaller_CopyFiles\r
-\r
-;[Wdf_CoInstaller_AddReg]\r
-;HKR,,CoInstallers32,0x00010000, "wdfcoinstaller01005.dll,WdfCoInstaller"\r
-\r
-;[Wdf_CoInstaller_CopyFiles]\r
-;wdfcoinstaller01005.dll\r
-\r
-;[MLX4HCA.DDInstall.ntx86.Wdf]\r
-;KmdfService = mlx4_hca, mlx4_hca_wdfsect\r
-\r
-;[MLX4HCA.DDInstall.ntamd64.Wdf]\r
-;KmdfService = mlx4_hca, mlx4_hca_wdfsect\r
-\r
-;[MLX4HCA.DDInstall.ntia64.Wdf]\r
-;KmdfService = mlx4_hca, mlx4_hca_wdfsect\r
-\r
-;[mlx4_hca_wdfsect]\r
-;KmdfLibraryVersion = 1.5\r
-\r
-\r
-;*****************************************\r
-; Strings\r
-;*****************************************\r
-\r
-[Strings]\r
-Mlx4HcaClassGuid = "{31B0B28A-26FF-4dca-A6FA-E767C7DFBA20}"\r
-MTL="Mellanox Technologies Ltd."\r
-MLX4HCA.ServiceDesc = "Mellanox ConnectX Virtual Infiband Driver"\r
-Ibbus.ServiceDesc = "InfiniBand Bus/Fabric/AL (Filter Driver)"\r
-Mlx4_Hca.DeviceDesc="Mellanox ConnectX Virtual Channel Adapter"\r
-DiskId = "Mellanox Mlx4 Bus installation disk"\r
-SPSVCINST_NULL = 0x0\r
-SPSVCINST_ASSOCSERVICE = 0x00000002\r
-SPSVCINST_STOPSERVICE  = 0x00000200\r
-SERVICE_KERNEL_DRIVER  = 1\r
-SERVICE_DEMAND_START   = 3\r
-SERVICE_ERROR_NORMAL   = 1\r
-REG_DWORD              = 0x00010001\r
-REG_DWORD_NO_CLOBBER   = 0x00010003\r
-REG_MULTI_SZ_APPEND    = 0x00010008\r
-DIRID_SYSTEM           = 11\r
-DIRID_DRIVERS          = 12\r
-DIRID_SYSTEM_X86       = 16425\r

diff --git a/branches/winverbs/core/bus/kernel/etc/mthca-filter.cdf b/branches/winverbs/core/bus/kernel/etc/mthca-filter.cdf
new file mode 100644 (file)
index 0000000..c7003df
--- /dev/null
+++ b/branches/winverbs/core/bus/kernel/etc/mthca-filter.cdf
@@ -0,0 +1,22 @@
+[CatalogHeader]\r
+Name=mthca.cat\r
+PublicVersion=0x0000001\r
+EncodingType=0x00010001\r
+CATATTR1=0x10010001:OSAttr:2:6.0\r
+[CatalogFiles]\r
+<hash>mthca.inf=mthca.inf\r
+<hash>mthca.sys=mthca.sys\r
+<hash>mthcau.dll=mthcau.dll\r
+<hash>mthcaud.dll=mthcaud.dll\r
+<hash>mthca32.dll=mthca32.dll\r
+<hash>mthca32d.dll=mthca32d.dll\r
+<hash>ibal.dll=ibal.dll\r
+<hash>ibald.dll=ibald.dll\r
+<hash>complib.dll=complib.dll\r
+<hash>complibd.dll=complibd.dll\r
+<hash>cl32.dll=cl32.dll\r
+<hash>cl32d.dll=cl32d.dll\r
+<hash>ibal32.dll=ibal32.dll\r
+<hash>ibal32d.dll=ibal32d.dll\r
+<hash>ibbus.sys=ibbus.sys\r
+\r

diff --git a/branches/winverbs/core/bus/kernel/etc/mthca.cdf b/branches/winverbs/core/bus/kernel/etc/mthca.cdf
deleted file mode 100644 (file)
index c7003df..0000000
--- a/branches/winverbs/core/bus/kernel/etc/mthca.cdf
+++ /dev/null
@@ -1,22 +0,0 @@
-[CatalogHeader]\r
-Name=mthca.cat\r
-PublicVersion=0x0000001\r
-EncodingType=0x00010001\r
-CATATTR1=0x10010001:OSAttr:2:6.0\r
-[CatalogFiles]\r
-<hash>mthca.inf=mthca.inf\r
-<hash>mthca.sys=mthca.sys\r
-<hash>mthcau.dll=mthcau.dll\r
-<hash>mthcaud.dll=mthcaud.dll\r
-<hash>mthca32.dll=mthca32.dll\r
-<hash>mthca32d.dll=mthca32d.dll\r
-<hash>ibal.dll=ibal.dll\r
-<hash>ibald.dll=ibald.dll\r
-<hash>complib.dll=complib.dll\r
-<hash>complibd.dll=complibd.dll\r
-<hash>cl32.dll=cl32.dll\r
-<hash>cl32d.dll=cl32d.dll\r
-<hash>ibal32.dll=ibal32.dll\r
-<hash>ibal32d.dll=ibal32d.dll\r
-<hash>ibbus.sys=ibbus.sys\r
-\r

diff --git a/branches/winverbs/core/bus/kernel/etc/mthca.inx b/branches/winverbs/core/bus/kernel/etc/mthca.inx
index c47375fed8fc4e93b3bef23189d707a37d0c5167..d85707fe539a1ddf7e6fe0e54e562ccae0bb64aa 100644 (file)
--- a/branches/winverbs/core/bus/kernel/etc/mthca.inx
+++ b/branches/winverbs/core/bus/kernel/etc/mthca.inx
@@ -7,7 +7,7 @@ Class=InfiniBandController
 ClassGUID={58517E00-D3CF-40c9-A679-CEE5752F4491}\r
 Provider=%OFA%\r
 ; must be synchronized with MTHCA_DEV.H\r
-DriverVer=05/19/2008,2.0.0000.1177\r
+DriverVer=03/08/2006,1.0.0000.614\r
 CatalogFile=mthca.cat\r
 \r
 ; ================= Destination directory section =====================\r
@@ -25,9 +25,9 @@ Ibal.WOW64CopyFiles=%DIRID_SYSTEM_X86%
 AddReg=ClassAddReg\r
 \r
 [ClassAddReg]\r
-HKR,,,0,"RDMA Channel Adapters"\r
+HKR,,,,"InfiniBand Channel Adapters"\r
 HKR,,Icon,,-5\r
-HKR,,SilentInstall,,0\r
+HKR,,SilentInstall,,1\r
 HKR,,"UpperFilters",0x00010000,"ibbus" ; enable IBBUS/AL Filter driver loading.\r
 \r
 \r
@@ -302,7 +302,7 @@ MT24205.DeviceDesc="InfiniHost III Lx (MT24205) - Mellanox InfiniBand HCA for PC
 MT25204.DeviceDesc="InfiniHost III Lx (MT25204) - Mellanox InfiniBand HCA for PCI Express"\r
 MT25205.DeviceDesc="InfiniHost III Lx (MT25205) - Mellanox InfiniBand HCA for PCI Express (burner device)"\r
 DiskId = "Mellanox InfiniBand HCA installation disk"\r
-Ibbus.ServiceDesc = "InfiniBand Bus/Fabric/AL (Filter Driver)"\r
+Ibbus.ServiceDesc = "InfiniBand Bus/AL (Filter Driver)"\r
 SPSVCINST_NULL = 0x0\r
 SPSVCINST_ASSOCSERVICE = 0x00000002\r
 SPSVCINST_STOPSERVICE  = 0x00000200\r

diff --git a/branches/winverbs/core/bus/kernel/ib_bus.cdf b/branches/winverbs/core/bus/kernel/ib_bus.cdf
deleted file mode 100644 (file)
index ac428f1..0000000
--- a/branches/winverbs/core/bus/kernel/ib_bus.cdf
+++ /dev/null
@@ -1,18 +0,0 @@
-[CatalogHeader]\r
-Name=ib_bus.cat\r
-PublicVersion=0x0000001\r
-EncodingType=0x00010001\r
-CATATTR1=0x10010001:OSAttr:2:6.0\r
-[CatalogFiles]\r
-<hash>ib_bus.inf=ib_bus.inf\r
-<hash>ibbus.sys=ibbus.sys\r
-<hash>ibiou.sys=ibiou.sys\r
-<hash>ibal.dll=ibal.dll\r
-<hash>complib.dll=complib.dll\r
-<hash>ibald.dll=ibald.dll\r
-<hash>complibd.dll=complibd.dll\r
-<hash>cl32d.dll=cl32d.dll\r
-<hash>cl32.dll=cl32.dll\r
-<hash>ibal32d.dll=ibal32d.dll\r
-<hash>ibal32.dll=ibal32.dll\r
-\r