[ofw] patches for loading winverbs and winmad as filter drivers for mlx4_hca: 3 of 3 - file: mlx4_hca.inx
Smith, Stan
stan.smith at intel.com
Mon Jan 5 14:01:28 PST 2009
More food for thought.
This patch loads winverbs and winmad as filter drivers for mlx4_hca.
The 3 patches have been tested on svn.1807 based WinOF installer for:
Server 2008 - arch x64 and x86
Winverbs and winmad load as expected with no observed problems. IPoIB runs correctly as does SRP connected to an OFED SRP target.
Winverbs commands execute correctly:
ibstat, ibv_devinfo, sminfo
Thank you,
Stan.
Signed off by stan.smith at intel.com
diff U3 C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx-WV
--- C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx Mon Oct 27 09:19:15 2008
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/hw/mlx4/kernel/hca/mlx4_hca.inx-WV Wed Dec 17 13:54:55 2008
@@ -19,9 +19,13 @@
DefaultDestDir = %DIRID_DRIVERS%
MLX4HCA.UMCopyFiles = %DIRID_SYSTEM%
MLX4HCA.WOW64CopyFiles = %DIRID_SYSTEM_X86%
-;Wdf_CoInstaller_CopyFiles = %DIRID_SYSTEM%
-Ibal.UMCopyFiles=%DIRID_SYSTEM%
-Ibal.WOW64CopyFiles=%DIRID_SYSTEM_X86%
+Wdf_CoInstaller_CopyFiles = %DIRID_SYSTEM%
+Ibal.UMCopyFiles = %DIRID_SYSTEM%
+Ibal.WOW64CopyFiles = %DIRID_SYSTEM_X86%
+WinVerbs.CopySysFiles = %DIRID_DRIVERS%
+WinVerbs.CopyDllFiles = %DIRID_SYSTEM%
+WinMad.CopySysFiles = %DIRID_DRIVERS%
+WinMad.CopyDllFiles = %DIRID_SYSTEM%
;*****************************************
@@ -36,6 +40,8 @@
HKR,,Icon,,-5
HKR,,SilentInstall,,1
HKR,,"UpperFilters",0x00010000,"ibbus" ; enable IBBUS/AL Filter driver loading.
+HKR,,"UpperFilters",0x00010008,"WinVerbs" ; enable winverbs Filter driver load.
+HKR,,"UpperFilters",0x00010008,"WinMad"
;*****************************************
@@ -55,12 +61,18 @@
mlx4_hca.sys = 1,,
mlx4u.dll = 1,,
mlx4ud.dll = 1,,
-;wdfcoinstaller01005.dll = 1,,
+WdfCoInstaller01007.dll = 1,,
ibal.dll=1,,
ibald.dll=1,,
complib.dll=1,,
complibd.dll=1,,
ibbus.sys=1,,
+winverbs.sys = 1,,
+winverbs.dll = 1,,
+winverbsd.dll = 1,,
+winmad.sys = 1,,
+winmad.dll = 1,,
+winmadd.dll = 1,,
[SourceDisksFiles.amd64]
mlx4_hca.sys = 1,,
@@ -68,7 +80,7 @@
mlx4ud.dll = 1,,
mlx4u32.dll = 1,,
mlx4u32d.dll = 1,,
-;wdfcoinstaller01005.dll = 1,,
+WdfCoInstaller01007.dll = 1,,
ibal.dll=1,,
ibald.dll=1,,
complib.dll=1,,
@@ -78,6 +90,12 @@
ibal32.dll=1,,
ibal32d.dll=1,,
ibbus.sys=1,,
+winverbs.sys = 1,,
+winverbs.dll = 1,,
+winverbsd.dll = 1,,
+winmad.sys = 1,,
+winmad.dll = 1,,
+winmadd.dll = 1,,
[SourceDisksFiles.ia64]
mlx4_hca.sys = 1,,
@@ -85,7 +103,7 @@
mlx4ud.dll = 1,,
mlx4u32.dll = 1,,
mlx4u32d.dll = 1,,
-;wdfcoinstaller01005.dll = 1,,
+WdfCoInstaller01007.dll = 1,,
ibal.dll=1,,
ibald.dll=1,,
complib.dll=1,,
@@ -95,6 +113,12 @@
ibal32.dll=1,,
ibal32d.dll=1,,
ibbus.sys=1,,
+winverbs.sys = 1,,
+winverbs.dll = 1,,
+winverbsd.dll = 1,,
+winmad.sys = 1,,
+winmad.dll = 1,,
+winmadd.dll = 1,,
;*****************************************
@@ -121,6 +145,10 @@
CopyFiles = MLX4HCA.UMCopyFiles
CopyFiles = Ibal.UMCopyFiles
CopyFiles = Ibbus.CopyFiles
+CopyFiles = WinVerbs.CopySysFiles
+CopyFiles = WinVerbs.CopyDllFiles
+CopyFiles = WinMad.CopySysFiles
+CopyFiles = WinMad.CopyDllFiles
[MLX4HCA.DDInstall.ntamd64]
CopyFiles = MLX4HCA.CopyFiles
@@ -129,6 +157,10 @@
CopyFiles = Ibal.UMCopyFiles
CopyFiles = Ibal.WOW64CopyFiles
CopyFiles = Ibbus.CopyFiles
+CopyFiles = WinVerbs.CopySysFiles
+CopyFiles = WinVerbs.CopyDllFiles
+CopyFiles = WinMad.CopySysFiles
+CopyFiles = WinMad.CopyDllFiles
[MLX4HCA.DDInstall.ntia64]
CopyFiles = MLX4HCA.CopyFiles
@@ -137,18 +169,29 @@
CopyFiles = Ibal.UMCopyFiles
CopyFiles = Ibal.WOW64CopyFiles
CopyFiles = Ibbus.CopyFiles
+CopyFiles = WinVerbs.CopySysFiles
+CopyFiles = WinVerbs.CopyDllFiles
+CopyFiles = WinMad.CopySysFiles
+CopyFiles = WinMad.CopyDllFiles
+
[MLX4HCA.DDInstall.ntx86.Services]
AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog
AddService = ibbus,,Ibbus.ServiceInstall
+AddService = WinVerbs,,WinVerbs.ServiceInstall
+AddService = WinMad,,WinMad.ServiceInstall
[MLX4HCA.DDInstall.ntamd64.Services]
AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog
AddService = ibbus,,Ibbus.ServiceInstall
+AddService = WinVerbs,,WinVerbs.ServiceInstall
+AddService = WinMad,,WinMad.ServiceInstall
[MLX4HCA.DDInstall.ntia64.Services]
AddService = mlx4_hca,%SPSVCINST_ASSOCSERVICE%,MLX4HCA.ServiceInstall,MLX4HCA.EventLog
AddService = ibbus,,Ibbus.ServiceInstall
+AddService = WinVerbs,,WinVerbs.ServiceInstall
+AddService = WinMad,,WinMad.ServiceInstall
;*****************************************
@@ -181,6 +224,20 @@
[Ibbus.CopyFiles]
ibbus.sys
+[WinVerbs.CopySysFiles]
+winverbs.sys
+
+[WinVerbs.CopyDllFiles]
+winverbs.dll,,,2
+winverbsd.dll,,,2
+
+[WinMad.CopySysFiles]
+winmad.sys
+
+[WinMad.CopyDllFiles]
+winmad.dll,,,2
+winmadd.dll,,,2
+
;*****************************************
; MLX4HCA Service Install section
@@ -235,6 +292,32 @@
HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000
HKR,"Parameters","ReportPortNIC",%REG_DWORD%,1
+;*****************************************
+; WinVerbs Service Install section
+;*****************************************
+
+[WinVerbs.ServiceInstall]
+DisplayName = %WinVerbs.ServiceDesc%
+ServiceType = %SERVICE_KERNEL_DRIVER%
+StartType = %SERVICE_DEMAND_START%
+ErrorControl = %SERVICE_ERROR_NORMAL%
+ServiceBinary = %12%\winverbs.sys
+LoadOrderGroup = PNP Filter
+Dependencies = ibbus
+
+;*****************************************
+; WinMad Service Install section
+;*****************************************
+
+[WinMad.ServiceInstall]
+DisplayName = %WinMad.ServiceDesc%
+ServiceType = %SERVICE_KERNEL_DRIVER%
+StartType = %SERVICE_DEMAND_START%
+ErrorControl = %SERVICE_ERROR_NORMAL%
+ServiceBinary = %12%\winmad.sys
+LoadOrderGroup = PNP Filter
+Dependencies = winverbs
+
;*****************************************
; Uninstall section (not used now)
@@ -249,6 +332,10 @@
DelFiles = Ibal.UMCopyFiles
DelFiles = Ibbus.CopyFiles
DelReg = Ibbus.ParamsReg
+DelFiles = WinVerbs.CopySysFiles
+DelFiles = WinVerbs.CopyDllFiles
+DelFiles = WinMad.CopySysFiles
+DelFiles = WinMad.CopyDllFiles
[DefaultUninstall.ntamd64]
DelFiles = MLX4HCA.CopyFiles
@@ -261,6 +348,10 @@
DelFiles = Ibal.WOW64CopyFiles
DelFiles = Ibbus.CopyFiles
DelReg = Ibbus.ParamsReg
+DelFiles = WinVerbs.CopySysFiles
+DelFiles = WinVerbs.CopyDllFiles
+DelFiles = WinMad.CopySysFiles
+DelFiles = WinMad.CopyDllFiles
[DefaultUninstall.ntia64]
DelFiles = MLX4HCA.CopyFiles
@@ -273,50 +364,59 @@
DelFiles = Ibal.WOW64CopyFiles
DelFiles = Ibbus.CopyFiles
DelReg = Ibbus.ParamsReg
+DelFiles = WinVerbs.CopySysFiles
+DelFiles = WinVerbs.CopyDllFiles
+DelFiles = WinMad.CopySysFiles
+DelFiles = WinMad.CopyDllFiles
[DefaultUninstall.Services]
+DelService = WinMad,%SPSVCINST_STOPSERVICE%
+DelService = WinVerbs,%SPSVCINST_STOPSERVICE%
DelService = Ibbus,%SPSVCINST_STOPSERVICE%
DelService = mlx4_hca,%SPSVCINST_STOPSERVICE%
;
-; The below section is temporarily disabled.
; It should be uncommented after returning MLX4_HCA to WDF model.
+; WinVerbs is a WDF, KMDF driver.
;
;*****************************************
; WDF Coinstaller installation section
;*****************************************
-;[MLX4HCA.DDInstall.ntx86.CoInstallers]
-;AddReg=Wdf_CoInstaller_AddReg
-;CopyFiles=Wdf_CoInstaller_CopyFiles
-
-;[MLX4HCA.DDInstall.ntamd64.CoInstallers]
-;AddReg=Wdf_CoInstaller_AddReg
-;CopyFiles=Wdf_CoInstaller_CopyFiles
-
-;[MLX4HCA.DDInstall.ntia64.CoInstallers]
-;AddReg=Wdf_CoInstaller_AddReg
-;CopyFiles=Wdf_CoInstaller_CopyFiles
-
-;[Wdf_CoInstaller_AddReg]
-;HKR,,CoInstallers32,0x00010000, "wdfcoinstaller01005.dll,WdfCoInstaller"
-
-;[Wdf_CoInstaller_CopyFiles]
-;wdfcoinstaller01005.dll
-
-;[MLX4HCA.DDInstall.ntx86.Wdf]
-;KmdfService = mlx4_hca, mlx4_hca_wdfsect
-
-;[MLX4HCA.DDInstall.ntamd64.Wdf]
-;KmdfService = mlx4_hca, mlx4_hca_wdfsect
-
-;[MLX4HCA.DDInstall.ntia64.Wdf]
-;KmdfService = mlx4_hca, mlx4_hca_wdfsect
+[MLX4HCA.DDInstall.ntx86.CoInstallers]
+AddReg=Wdf_CoInstaller_AddReg
+CopyFiles=Wdf_CoInstaller_CopyFiles
+
+[MLX4HCA.DDInstall.ntamd64.CoInstallers]
+AddReg=Wdf_CoInstaller_AddReg
+CopyFiles=Wdf_CoInstaller_CopyFiles
+
+[MLX4HCA.DDInstall.ntia64.CoInstallers]
+AddReg=Wdf_CoInstaller_AddReg
+CopyFiles=Wdf_CoInstaller_CopyFiles
+
+[Wdf_CoInstaller_AddReg]
+HKR,,CoInstallers32,0x00010000, "WdfCoInstaller01007.dll,WdfCoInstaller"
+
+[Wdf_CoInstaller_CopyFiles]
+WdfCoInstaller01007.dll
+
+[MLX4HCA.DDInstall.ntx86.Wdf]
+KmdfService = WinVerbs,WvWdfSect
+KmdfService = WinMad,WvWdfSect
+
+[MLX4HCA.DDInstall.ntamd64.Wdf]
+KmdfService = WinVerbs,WvWdfSect
+KmdfService = WinMad,WvWdfSect
+
+[MLX4HCA.DDInstall.ntia64.Wdf]
+KmdfService = WinVerbs,WvWdfSect
+KmdfService = WinMad,WvWdfSect
-;[mlx4_hca_wdfsect]
-;KmdfLibraryVersion = 1.5
+[WvWdfSect]
+KmdfLibraryVersion = 1.7
;*****************************************
@@ -328,12 +428,15 @@
MTL="Mellanox Technologies Ltd."
MLX4HCA.ServiceDesc = "Mellanox ConnectX Virtual Infiband Driver"
Ibbus.ServiceDesc = "InfiniBand Bus/AL (Filter Driver)"
+WinVerbs.ServiceDesc = "WinVerbs Service"
+WinMad.ServiceDesc = "WinMad Service"
Mlx4_Hca.DeviceDesc="Mellanox ConnectX Virtual Channel Adapter"
DiskId = "Mellanox Mlx4 HCA installation disk"
-SPSVCINST_NULL = 0x0
+SPSVCINST_NULL = 0x0
SPSVCINST_ASSOCSERVICE = 0x00000002
SPSVCINST_STOPSERVICE = 0x00000200
SERVICE_KERNEL_DRIVER = 1
+SERVICE_BOOT_START = 0
SERVICE_DEMAND_START = 3
SERVICE_ERROR_NORMAL = 1
REG_DWORD = 0x00010001
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mlx4_hca.inx.patch
Type: application/octet-stream
Size: 9669 bytes
Desc: mlx4_hca.inx.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090105/b8f2c83c/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mlx4_hca.inx
Type: application/octet-stream
Size: 9537 bytes
Desc: mlx4_hca.inx
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090105/b8f2c83c/attachment-0001.obj>
More information about the ofw
mailing list