[ofw] [PATCH] netipoib* - install NetworkDirect/winverbs provider

[Smith, Stan]

Hello,
  The enclosed patches incorporate the ND winverbs provider (wvndprov.dll) into the IPoIB driver install process; similar to what was done for the ND/IBAL provider.
The only issue is the ND/IBAL provider does not build for IA64, where the ND/winverbs IA64 provider does.
This IA64 difference complicates the .inx/inf files by having two sections for ND install (IA64 & everyone else).

Patches were tested by building installers for all OS/arch variants and installing, then testing IPoIB with various DAPL tests which use IPoIB bound IPv4 addresses.

Between two x64 Svr 2008 systems with ConnectX HCAs, the ndping.exe test was run with the default ND/IBAL provider.
Next the ND/IBAL provider was removed with the ND/Winverbs provider installed and ndping.exe run again.

ND/Winverbs provider removed with the ND/IBAL provider reinstalled; ndping.exe run again.

No observed problems.

Upon your approval, I will commit these patches to the trunk and the WOF 2.2 branch.

Stan.

Signed-off-by: stan smith <stan.smith at intel.com>


--- a/ulp/ipoib_NDIS6_CM/kernel/netipoib.inx    Tue Jan 05 15:10:15 2010
+++ b/ulp/ipoib_NDIS6_CM/kernel/netipoib.inx    Tue Jan 05 15:06:48 2010
@@ -57,6 +57,7 @@
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
 CopyFiles       = WsdCopyFiles
+CopyFiles       = NdWvCopyFiles
 CopyFiles       = WOW64WsdCopyFiles
 *IfType         = 6            ; IF_TYPE_ETHERNET_CSMACD
 *MediaType      = 0            ; NdisMedium802_3
@@ -215,6 +216,11 @@

 [NdCopyFiles]
 ibndprov.dll,,,0x00000002
+wvndprov.dll,,,0x00000002
+ndinstall.exe,,,0x00000002
+
+[NdWvCopyFiles]
+wvndprov.dll,,,0x00000002
 ndinstall.exe,,,0x00000002

 [WOW64CopyFiles]
@@ -237,6 +243,7 @@
 ipoib.sys = 1
 ibwsd.dll = 1
 ibndprov.dll = 1
+wvndprov.dll = 1
 ndinstall.exe = 1

 [SourceDisksFiles.amd64]
@@ -245,17 +252,21 @@
 ibwsd32.dll = 1
 ibndprov.dll = 1
 ibndprov32.dll = 1
+wvndprov.dll = 1
 ndinstall.exe = 1

 [SourceDisksFiles.ia64]
 ipoib.sys = 1
 ibwsd.dll = 1
 ibwsd32.dll = 1
+wvndprov.dll = 1
+ndinstall.exe = 1

 [DestinationDirs]
 IpoibCopyFiles    = %DIRID_DRIVERS%
 WsdCopyFiles      = %DIRID_SYSTEM%
 NdCopyFiles       = %DIRID_SYSTEM%
+NdWvCopyFiles     = %DIRID_SYSTEM%
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%
 WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%
 DefaultDestDir    = %DIRID_SYSTEM%

--- a/ulp/ipoib/kernel/netipoib.inx     Tue Jan 05 15:09:01 2010
+++ b/ulp/ipoib/kernel/netipoib.inx     Tue Jan 05 13:22:18 2010
@@ -51,6 +51,7 @@
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
 CopyFiles       = WsdCopyFiles
+CopyFiles       = NdWvCopyFiles
 CopyFiles       = WOW64WsdCopyFiles

 [Ipoib.DDInstall.ntx86.Services]
@@ -194,6 +195,11 @@

 [NdCopyFiles]
 ibndprov.dll,,,0x00000002
+wvndprov.dll,,,0x00000002
+ndinstall.exe,,,0x00000002
+
+[NdWvCopyFiles]
+wvndprov.dll,,,0x00000002
 ndinstall.exe,,,0x00000002

 [WOW64CopyFiles]
@@ -216,6 +222,7 @@
 ipoib.sys = 1
 ibwsd.dll = 1
 ibndprov.dll = 1
+wvndprov.dll = 1
 ndinstall.exe = 1

 [SourceDisksFiles.amd64]
@@ -224,17 +231,21 @@
 ibwsd32.dll = 1
 ibndprov.dll = 1
 ibndprov32.dll = 1
+wvndprov.dll = 1
 ndinstall.exe = 1

 [SourceDisksFiles.ia64]
 ipoib.sys = 1
 ibwsd.dll = 1
 ibwsd32.dll = 1
+wvndprov.dll = 1
+ndinstall.exe = 1

 [DestinationDirs]
 IpoibCopyFiles    = %DIRID_DRIVERS%
 WsdCopyFiles      = %DIRID_SYSTEM%
 NdCopyFiles       = %DIRID_SYSTEM%
+NdWvCopyFiles     = %DIRID_SYSTEM%
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%
 WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%
 DefaultDestDir    = %DIRID_SYSTEM%


--- a/ulp/ipoib/kernel/netipoib-xp32.inf        Tue Jan 05 15:09:33 2010
+++ b/ulp/ipoib/kernel/netipoib-xp32.inf        Tue Jan 05 14:03:46 2010
@@ -7,7 +7,7 @@
 Class       = Net
 ClassGUID   = {4d36e972-e325-11ce-bfc1-08002be10318}
 Provider    = %OPENIB%
-DriverVer=10/10/2008,2.0.0000.2159
+DriverVer=01/04/2010,2.2.0000.2654
 CatalogFile=ipoib.cat

 [Manufacturer]
@@ -50,6 +50,7 @@
 AddReg          = IpoibAddReg
 CopyFiles       = IpoibCopyFiles
 CopyFiles       = WsdCopyFiles
+CopyFiles       = NdWvCopyFiles
 CopyFiles       = WOW64WsdCopyFiles

 [Ipoib.DDInstall.ntx86.Services]
@@ -193,6 +194,11 @@

 [NdCopyFiles]
 ibndprov.dll,,,0x00000002
+wvndprov.dll,,,0x00000002
+ndinstall.exe,,,0x00000002
+
+[NdWvCopyFiles]
+wvndprov.dll,,,0x00000002
 ndinstall.exe,,,0x00000002

 [WOW64CopyFiles]
@@ -214,6 +220,7 @@
 [SourceDisksFiles.x86]
 ipoib.sys = 1
 ibndprov.dll = 1
+wvndprov.dll = 1
 ndinstall.exe = 1

 [SourceDisksFiles.amd64]
@@ -222,17 +229,21 @@
 ibwsd32.dll = 1
 ibndprov.dll = 1
 ibndprov32.dll = 1
+wvndprov.dll = 1
 ndinstall.exe = 1

 [SourceDisksFiles.ia64]
 ipoib.sys = 1
 ibwsd.dll = 1
 ibwsd32.dll = 1
+wvndprov.dll = 1
+ndinstall.exe = 1

 [DestinationDirs]
 IpoibCopyFiles    = %DIRID_DRIVERS%
 WsdCopyFiles      = %DIRID_SYSTEM%
 NdCopyFiles       = %DIRID_SYSTEM%
+NdWvCopyFiles     = %DIRID_SYSTEM%
 WOW64CopyFiles    = %DIRID_SYSTEM_X86%
 WOW64WsdCopyFiles = %DIRID_SYSTEM_X86%
 DefaultDestDir    = %DIRID_SYSTEM%
-------------- next part --------------
A non-text attachment was scrubbed...
Name: netipoib.inx.NDIS6_cm.patch
Type: application/octet-stream
Size: 1453 bytes
Desc: netipoib.inx.NDIS6_cm.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20100105/fcd0f2ec/attachment.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: netipoib.inx.patch
Type: application/octet-stream
Size: 1392 bytes
Desc: netipoib.inx.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20100105/fcd0f2ec/attachment-0001.obj>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: netipoib-xp32.inf.patch
Type: application/octet-stream
Size: 1646 bytes
Desc: netipoib-xp32.inf.patch
URL: <http://lists.openfabrics.org/pipermail/ofw/attachments/20100105/fcd0f2ec/attachment-0002.obj>