[ofw] ibbus filter driver patch 8/18 - mthca.inx
Smith, Stan
stan.smith at intel.com
Mon Aug 18 14:44:08 PDT 2008
Mthca.inx file modified to load ibbus.sys as a class upper filter driver.
Signed-off by: Stan Smith (stan.smith at intel.com)
Having problems with Intel mailer, hence formatting of patch is incorrect, see attached patch file.
diff -Nau SVN\gen1\trunk\hw\mthca\kernel\mthca.inx mthca.inx
--- SVN\gen1\trunk\hw\mthca\kernel\mthca.inx 2008-07-17 17:15:33.131900800 -0700
+++ mthca.inx 2008-08-18 08:35:17.651408600 -0700
@@ -3,9 +3,9 @@
[Version]
Signature="$Windows NT$"
-Class=InfiniBandHca
+Class=InfiniBandController
ClassGUID={58517E00-D3CF-40c9-A679-CEE5752F4491}
-Provider=%OPENIB%
+Provider=%OFA%
; must be synchronized with MTHCA_DEV.H
DriverVer=03/08/2006,1.0.0000.614
CatalogFile=mthca.cat
@@ -14,25 +14,22 @@
[DestinationDirs]
DefaultDestDir=%DIRID_DRIVERS%
-ClassCopyFiles=%DIRID_SYSTEM%
MTHCA.UMCopyFiles=%DIRID_SYSTEM%
MTHCA.WOW64CopyFiles=%DIRID_SYSTEM_X86%
+Ibal.UMCopyFiles=%DIRID_SYSTEM%
+Ibal.WOW64CopyFiles=%DIRID_SYSTEM_X86%
; ================= Class Install section =====================
[ClassInstall32]
-CopyFiles=ClassCopyFiles
AddReg=ClassAddReg
-[ClassCopyFiles]
-IbInstaller.dll
-
[ClassAddReg]
-HKR,,,,"InfiniBand Host Channel Adapters"
+HKR,,,,"InfiniBand Channel Adapters"
HKR,,Icon,,-5
HKR,,SilentInstall,,1
-HKLM,"System\CurrentControlSet\Control\CoDeviceInstallers", \
- %HcaClassGuid%,%REG_MULTI_SZ_APPEND%, "IbInstaller.dll,IbCoInstaller"
+HKR,,"UpperFilters",0x00010000,"ibbus" ; enable IBBUS/AL Filter driver loading.
+
; ================= Device Install section =====================
@@ -46,26 +43,46 @@
1=%DiskId%,,,""
[SourceDisksFiles]
-IbInstaller.dll=1
-mthca.sys=1
-mthcau.dll=1
-mthcaud.dll=1
+mthca.sys=1,,
+mthcau.dll=1,,
+mthcaud.dll=1,,
+ibal.dll=1,,
+complib.dll=1,,
+ibald.dll=1,,
+complibd.dll=1,,
+ibbus.sys=1,,
[SourceDisksFiles.amd64]
-IbInstaller.dll=1
-mthca.sys=1
-mthcau.dll=1
-mthcaud.dll=1
-mthca32.dll=1
-mthca32d.dll=1
+mthca.sys=1,,
+mthcau.dll=1,,
+mthcaud.dll=1,,
+mthca32.dll=1,,
+mthca32d.dll=1,,
+ibal.dll=1,,
+ibald.dll=1,,
+complib.dll=1,,
+complibd.dll=1,,
+cl32.dll=1,,
+cl32d.dll=1,,
+ibal32.dll=1,,
+ibal32d.dll=1,,
+ibbus.sys=1,,
[SourceDisksFiles.ia64]
-IbInstaller.dll=1
-mthca.sys=1
-mthcau.dll=1
-mthcaud.dll=1
-mthca32.dll=1
-mthca32d.dll=1
+mthca.sys=1,,
+mthcau.dll=1,,
+mthcaud.dll=1,,
+mthca32.dll=1,,
+mthca32d.dll=1,,
+ibal.dll=1,,
+ibald.dll=1,,
+complib.dll=1,,
+complibd.dll=1,,
+cl32.dll=1,,
+cl32d.dll=1,,
+ibal32.dll=1,,
+ibal32d.dll=1,,
+ibbus.sys=1,,
[Manufacturer]
%MTL% = HCA.DeviceSection,ntx86,ntamd64,ntia64
@@ -109,28 +126,42 @@
[MTHCA.DDInstall.ntx86]
CopyFiles = MTHCA.CopyFiles
CopyFiles = MTHCA.UMCopyFiles
-CopyINF=ib_bus.inf
+CopyFiles = Ibal.UMCopyFiles
+CopyFiles = Ibbus.CopyFiles
[MTHCA.DDInstall.ntamd64]
CopyFiles = MTHCA.CopyFiles
CopyFiles = MTHCA.UMCopyFiles
CopyFiles = MTHCA.WOW64CopyFiles
-CopyINF=ib_bus.inf
+CopyFiles = Ibal.UMCopyFiles
+CopyFiles = Ibal.WOW64CopyFiles
+CopyFiles = Ibbus.CopyFiles
[MTHCA.DDInstall.ntia64]
CopyFiles = MTHCA.CopyFiles
CopyFiles = MTHCA.UMCopyFiles
CopyFiles = MTHCA.WOW64CopyFiles
-CopyINF=ib_bus.inf
+CopyFiles = Ibal.UMCopyFiles
+CopyFiles = Ibal.WOW64CopyFiles
+CopyFiles = Ibbus.CopyFiles
+
+
+; ============== Services ==============
[MTHCA.DDInstall.ntx86.Services]
AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog
+AddService = ibbus,,Ibbus.ServiceInstall
[MTHCA.DDInstall.ntamd64.Services]
AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog
+AddService = ibbus,,Ibbus.ServiceInstall
[MTHCA.DDInstall.ntia64.Services]
AddService = mthca,%SPSVCINST_ASSOCSERVICE%,MTHCA.ServiceInstall,MTHCA.EventLog
+AddService = ibbus,,Ibbus.ServiceInstall
+
+
+; ============= File Copy ==============
[MTHCA.CopyFiles]
mthca.sys
@@ -143,8 +174,24 @@
mthcau.dll,mthca32.dll,,2
mthcaud.dll,mthca32d.dll,,2
+[Ibal.UMCopyFiles]
+ibal.dll,,,2
+ibald.dll,,,2
+complib.dll,,,2
+complibd.dll,,,2
+
+[Ibal.WOW64CopyFiles]
+ibal.dll,ibal32.dll,,2
+ibald.dll,ibal32d.dll,,2
+complib.dll,cl32.dll,,2
+complibd.dll,cl32d.dll,,2
+
+[Ibbus.CopyFiles]
+ibbus.sys
+
+
;
-; ============= Service Install section ==============
+; ============= MTHCA Service Install section ==============
;
[MTHCA.ServiceInstall]
@@ -177,9 +224,72 @@
HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\8bf1f640-63fe-4743-b9ef-fa38c695bfde","Flags",%REG_DWORD%,0xffff
HKLM,"System\CurrentControlSet\Control\WMI\GlobalLogger\8bf1f640-63fe-4743-b9ef-fa38c695bfde","Level",%REG_DWORD%,0x3
+
+; ============= IBBUS/AL Service Install section ==============
+;
+
+[Ibbus.ServiceInstall]
+DisplayName = %Ibbus.ServiceDesc%
+ServiceType = %SERVICE_KERNEL_DRIVER%
+StartType = %SERVICE_DEMAND_START%
+ErrorControl = %SERVICE_ERROR_NORMAL%
+ServiceBinary = %12%\ibbus.sys
+LoadOrderGroup = PnP Filter
+AddReg = Ibbus.ParamsReg
+Dependencies = mthca
+
+[Ibbus.ParamsReg]
+HKR,"Parameters","IbalDebugLevel",%REG_DWORD%,2
+HKR,"Parameters","IbalDebugFlags",%REG_DWORD%,0x00ffffff
+HKR,"Parameters","SmiPollInterval",%REG_DWORD_NO_CLOBBER%,20000
+HKR,"Parameters","IocQueryTimeout",%REG_DWORD_NO_CLOBBER%,250
+HKR,"Parameters","IocQueryRetries",%REG_DWORD_NO_CLOBBER%,4
+HKR,"Parameters","IocPollInterval",%REG_DWORD_NO_CLOBBER%,30000
+HKR,"Parameters","DebugFlags",%REG_DWORD%,0x80000000
+HKR,"Parameters","ReportPortNIC",%REG_DWORD%,1
+
+
+; ============= Uninstall Section =============
+
+[DefaultUninstall.ntx86]
+DelFiles = MTHCA.CopyFiles
+DelFiles = MTHCA.UMCopyFiles
+DelReg = MTHCA.ParamsReg
+DelReg = MTHCA.AddEventLogReg
+DelReg = ClassAddReg
+DelFiles = Ibal.UMCopyFiles
+
+
+[DefaultUninstall.ntamd64]
+DelFiles = MTHCA.CopyFiles
+DelFiles = MTHCA.UMCopyFiles
+DelFiles = MTHCA.WOW64CopyFiles
+DelReg = MTHCA.ParamsReg
+DelReg = MTHCA.AddEventLogReg
+DelReg = ClassAddReg
+DelFiles = Ibal.UMCopyFiles
+DelFiles = Ibal.WOW64CopyFiles
+
+
+[DefaultUninstall.ntia64]
+DelFiles = MTHCA.CopyFiles
+DelFiles = MTHCA.UMCopyFiles
+DelFiles = MTHCA.WOW64CopyFiles
+DelReg = MTHCA.ParamsReg
+DelReg = MTHCA.AddEventLogReg
+DelReg = ClassAddReg
+DelFiles = Ibal.UMCopyFiles
+DelFiles = Ibal.WOW64CopyFiles
+
+
+[DefaultUninstall.Services]
+DelService = Ibbus,%SPSVCINST_STOPSERVICE%
+DelService = mthca,%SPSVCINST_STOPSERVICE%
+
+
[Strings]
-HcaClassGuid = "{58517E00-D3CF-40c9-A679-CEE5752F4491}"
-OPENIB = "OpenIB Alliance"
+IBClassGuid = "{58517E00-D3CF-40c9-A679-CEE5752F4491}"
+OFA = "OpenFabrics Alliance"
MTL="Mellanox Technologies Ltd."
MTHCA.ServiceDesc = "Driver for Mellanox InfiniHost Devices"
MT23108.DeviceDesc="InfiniHost (MT23108) - Mellanox InfiniBand HCA"
@@ -192,12 +302,15 @@
MT25204.DeviceDesc="InfiniHost III Lx (MT25204) - Mellanox InfiniBand HCA for PCI Express"
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
SPSVCINST_ASSOCSERVICE = 0x00000002
+SPSVCINST_STOPSERVICE = 0x00000200
SERVICE_KERNEL_DRIVER = 1
SERVICE_DEMAND_START = 3
SERVICE_ERROR_NORMAL = 1
REG_DWORD = 0x00010001
+REG_DWORD_NO_CLOBBER = 0x00010003
REG_MULTI_SZ_APPEND = 0x00010008
DIRID_SYSTEM = 11
DIRID_DRIVERS = 12
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mthca.inx
Type: application/octet-stream
Size: 9852 bytes
Desc: mthca.inx
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20080818/60725d60/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: mthca.inx.pat
Type: application/octet-stream
Size: 7390 bytes
Desc: mthca.inx.pat
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20080818/60725d60/attachment-0001.obj>
More information about the ofw
mailing list