From 09a1b9f467f88e6931bd4e7d0ab8a0a9a17d3752 Mon Sep 17 00:00:00 2001 From: stansmith Date: Tue, 16 Dec 2008 21:27:32 +0000 Subject: [PATCH] [WinVerbs.mlx4] auto load WinVerbs+WinMad filter drivers when loading ConnectX HCA driver Required additional files to be present in folder for correct install: winverbs.sys winverbs.dll winverbsd.dll winmad.sys winmad.dll winmadd.dll WdfCoInstaller01007.dll git-svn-id: svn://openib.tc.cornell.edu/gen1@1791 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86 --- .../winverbs/hw/mlx4/kernel/hca/mlx4_hca.cdf | 3 + .../winverbs/hw/mlx4/kernel/hca/mlx4_hca.inx | 55 ++++++++++++++++++- .../hw/mlx4/kernel/hca/mlx4_hca32.cdf | 3 + 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca.cdf b/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca.cdf index a839d897..fe3beb7c 100644 --- a/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca.cdf +++ b/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca.cdf @@ -22,4 +22,7 @@ CATATTR1=0x10010001:OSAttr:2:6.0 winverbs.sys=winverbs.sys winverbs.dll=winverbs.dll winverbsd.dll=winverbsd.dll +winmad.sys=winmad.sys +winmad.dll=winmad.dll +winmadd.dll=winmadd.dll WdfCoInstaller01007.dll=WdfCoInstaller01007.dll diff --git a/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca.inx b/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca.inx index 4124367c..2da87937 100644 --- a/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca.inx +++ b/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca.inx @@ -24,6 +24,8 @@ 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% ;***************************************** @@ -39,7 +41,7 @@ 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" ;***************************************** @@ -68,6 +70,9 @@ 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,, @@ -88,6 +93,9 @@ 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,, @@ -108,6 +116,9 @@ ibbus.sys=1,, winverbs.sys = 1,, winverbs.dll = 1,, winverbsd.dll = 1,, +winmad.sys = 1,, +winmad.dll = 1,, +winmadd.dll = 1,, ;***************************************** @@ -136,6 +147,8 @@ CopyFiles = Ibal.UMCopyFiles CopyFiles = Ibbus.CopyFiles CopyFiles = WinVerbs.CopySysFiles CopyFiles = WinVerbs.CopyDllFiles +CopyFiles = WinMad.CopySysFiles +CopyFiles = WinMad.CopyDllFiles [MLX4HCA.DDInstall.ntamd64] CopyFiles = MLX4HCA.CopyFiles @@ -146,6 +159,8 @@ CopyFiles = Ibal.WOW64CopyFiles CopyFiles = Ibbus.CopyFiles CopyFiles = WinVerbs.CopySysFiles CopyFiles = WinVerbs.CopyDllFiles +CopyFiles = WinMad.CopySysFiles +CopyFiles = WinMad.CopyDllFiles [MLX4HCA.DDInstall.ntia64] CopyFiles = MLX4HCA.CopyFiles @@ -156,21 +171,27 @@ 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 ;***************************************** @@ -210,6 +231,14 @@ winverbs.sys winverbs.dll,,,2 winverbsd.dll,,,2 +[WinMad.CopySysFiles] +winmad.sys + +[WinMad.CopyDllFiles] +winmad.dll,,,2 +winmadd.dll,,,2 + + ;***************************************** ; MLX4HCA Service Install section ;***************************************** @@ -276,6 +305,19 @@ 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) @@ -292,6 +334,8 @@ DelFiles = Ibbus.CopyFiles DelReg = Ibbus.ParamsReg DelFiles = WinVerbs.CopySysFiles DelFiles = WinVerbs.CopyDllFiles +DelFiles = WinMad.CopySysFiles +DelFiles = WinMad.CopyDllFiles [DefaultUninstall.ntamd64] DelFiles = MLX4HCA.CopyFiles @@ -306,6 +350,8 @@ DelFiles = Ibbus.CopyFiles DelReg = Ibbus.ParamsReg DelFiles = WinVerbs.CopySysFiles DelFiles = WinVerbs.CopyDllFiles +DelFiles = WinMad.CopySysFiles +DelFiles = WinMad.CopyDllFiles [DefaultUninstall.ntia64] DelFiles = MLX4HCA.CopyFiles @@ -320,8 +366,11 @@ 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% @@ -356,12 +405,15 @@ 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 [WvWdfSect] KmdfLibraryVersion = 1.7 @@ -377,6 +429,7 @@ 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 diff --git a/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca32.cdf b/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca32.cdf index 87141562..bf027678 100644 --- a/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca32.cdf +++ b/branches/winverbs/hw/mlx4/kernel/hca/mlx4_hca32.cdf @@ -16,4 +16,7 @@ CATATTR1=0x10010001:OSAttr:2:6.0 winverbs.sys=winverbs.sys winverbs.dll=winverbs.dll winverbsd.dll=winverbsd.dll +winmad.sys=winmad.sys +winmad.dll=winmad.dll +winmadd.dll=winmadd.dll WdfCoInstaller01007.dll=WdfCoInstaller01007.dll -- 2.46.0