[ofw] patches for loading winverbs and winmad as filter drivers for mthca: 3 of 3 - file: mthca.inx
Stan C. Smith
stan.smith at intel.com
Mon Jan 5 13:46:01 PST 2009
Now for the 'meat' of the changes.
This patch loads winverbs and winmad as filter drivers for mthca.
The 3 patches have been tested on svn.1807 based WinOF installer for:
Server 2008, Server 2003, Vista, XP32, XP64 - arch x64 and x86
Server 2003 - arch ia64
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/mthca/kernel/mthca.inx
C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/hw/mthca/kernel/mthca.inx-WV
--- C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/hw/mthca/kernel/mthca.inx Mon Oct
27 09:19:16 2008
+++ C:/Documents and Settings/scsmith/My Documents/openIB-windows/SVN/gen1/trunk/hw/mthca/kernel/mthca.inx-WV Wed Dec
17 11:11:53 2008
@@ -18,6 +18,12 @@
MTHCA.WOW64CopyFiles=%DIRID_SYSTEM_X86%
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%
+Wdf_CoInstaller_CopyFiles = %DIRID_SYSTEM%
+
; ================= Class Install section =====================
@@ -28,7 +34,9 @@
HKR,,,,"InfiniBand Channel Adapters"
HKR,,Icon,,-5
HKR,,SilentInstall,,1
-HKR,,"UpperFilters",0x00010000,"ibbus" ; enable IBBUS/AL Filter driver loading.
+HKR,,"UpperFilters",0x00010000,"ibbus" ; enable IBBUS/AL Filter driver load.
+HKR,,"UpperFilters",0x00010008,"WinVerbs" ; enable winverbs Filter driver load.
+HKR,,"UpperFilters",0x00010008,"WinMad"
; ================= Device Install section =====================
@@ -51,6 +59,14 @@
ibald.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,,
+WdfCoInstaller01007.dll = 1,,
+
[SourceDisksFiles.amd64]
mthca.sys=1,,
@@ -67,6 +83,13 @@
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,,
+WdfCoInstaller01007.dll = 1,,
[SourceDisksFiles.ia64]
mthca.sys=1,,
@@ -83,6 +106,13 @@
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,,
+WdfCoInstaller01007.dll = 1,,
[Manufacturer]
%MTL% = HCA.DeviceSection,ntx86,ntamd64,ntia64
@@ -128,6 +158,10 @@
CopyFiles = MTHCA.UMCopyFiles
CopyFiles = Ibal.UMCopyFiles
CopyFiles = Ibbus.CopyFiles
+CopyFiles = WinVerbs.CopySysFiles
+CopyFiles = WinVerbs.CopyDllFiles
+CopyFiles = WinMad.CopySysFiles
+CopyFiles = WinMad.CopyDllFiles
[MTHCA.DDInstall.ntamd64]
CopyFiles = MTHCA.CopyFiles
@@ -136,6 +170,10 @@
CopyFiles = Ibal.UMCopyFiles
CopyFiles = Ibal.WOW64CopyFiles
CopyFiles = Ibbus.CopyFiles
+CopyFiles = WinVerbs.CopySysFiles
+CopyFiles = WinVerbs.CopyDllFiles
+CopyFiles = WinMad.CopySysFiles
+CopyFiles = WinMad.CopyDllFiles
[MTHCA.DDInstall.ntia64]
CopyFiles = MTHCA.CopyFiles
@@ -144,6 +182,10 @@
CopyFiles = Ibal.UMCopyFiles
CopyFiles = Ibal.WOW64CopyFiles
CopyFiles = Ibbus.CopyFiles
+CopyFiles = WinVerbs.CopySysFiles
+CopyFiles = WinVerbs.CopyDllFiles
+CopyFiles = WinMad.CopySysFiles
+CopyFiles = WinMad.CopyDllFiles
; ============== Services ==============
@@ -151,14 +193,20 @@
[MTHCA.DDInstall.ntx86.Services]
AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog
AddService = ibbus,,Ibbus.ServiceInstall
+AddService = WinVerbs,,WinVerbs.ServiceInstall
+AddService = WinMad,,WinMad.ServiceInstall
[MTHCA.DDInstall.ntamd64.Services]
AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog
AddService = ibbus,,Ibbus.ServiceInstall
+AddService = WinVerbs,,WinVerbs.ServiceInstall
+AddService = WinMad,,WinMad.ServiceInstall
[MTHCA.DDInstall.ntia64.Services]
AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog
AddService = ibbus,,Ibbus.ServiceInstall
+AddService = WinVerbs,,WinVerbs.ServiceInstall
+AddService = WinMad,,WinMad.ServiceInstall
; ============= File Copy ==============
@@ -189,6 +237,19 @@
[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
; ============= MTHCA Service Install section ==============
@@ -246,6 +307,65 @@
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
+
+
+; ============= KMDF CoInstaller section ==============
+
+[MTHCA.DDInstall.ntx86.CoInstallers]
+AddReg = Wdf_CoInstaller_AddReg
+CopyFiles = Wdf_CoInstaller_CopyFiles
+
+[MTHCA.DDInstall.ntamd64.CoInstallers]
+AddReg = Wdf_CoInstaller_AddReg
+CopyFiles = Wdf_CoInstaller_CopyFiles
+
+[MTHCA.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
+
+[MTHCA.DDInstall.ntx86.Wdf]
+KmdfService = WinVerbs, WvWdfSect
+KmdfService = WinMad, WvWdfSect
+
+[MTHCA.DDInstall.ntamd64.Wdf]
+KmdfService = WinVerbs, WvWdfSect
+KmdfService = WinMad, WvWdfSect
+
+[MTHCA.DDInstall.ntia64.Wdf]
+KmdfService = WinVerbs, WvWdfSect
+KmdfService = WinMad, WvWdfSect
+
+[WvWdfSect]
+KmdfLibraryVersion = 1.7
+
+
; ============= Uninstall Section =============
[DefaultUninstall.ntx86]
@@ -257,6 +377,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 = MTHCA.CopyFiles
@@ -269,6 +393,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 = MTHCA.CopyFiles
@@ -281,8 +409,14 @@
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 = mthca,%SPSVCINST_STOPSERVICE%
@@ -303,10 +437,13 @@
MT25205.DeviceDesc="InfiniHost III Lx (MT25205) - Mellanox InfiniBand HCA for PCI Express (burner device)"
DiskId = "Mellanox InfiniBand HCA installation disk"
Ibbus.ServiceDesc = "InfiniBand Bus/AL (Filter Driver)"
-SPSVCINST_NULL = 0x0
+WinVerbs.ServiceDesc = "WinVerbs Service"
+WinMad.ServiceDesc = "WinMad Service"
+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: mthca.inx.patch
Type: application/octet-stream
Size: 7589 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090105/7ffdee20/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mthca.inx
Type: application/octet-stream
Size: 9696 bytes
Desc: not available
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20090105/7ffdee20/attachment-0001.obj>
More information about the ofw
mailing list