[IPoIB]

  netipoib.inx - OpenIB --> OpenFabrics name change
  netipoib-xp32.inf - match netipoib.inx (except for 32-bit issues) DriverVer updated.
[WinOF] makebin.bat - updated to include free driver symbol files (.pdb) in std WinOF release.

git-svn-id: svn://openib.tc.cornell.edu/gen1@1578 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat
index a4b77f5f6379778535a0c857332bd021a7490b22..5efd5c33b5b66c0176f43ccbf8b17192936140d2 100644 (file)
--- a/trunk/etc/makebin.bat
+++ b/trunk/etc/makebin.bat
@@ -3,10 +3,10 @@ setlocal
 \r
 rem usage: makebin src dst [wlh | wnet | wxp]\r
 rem\r
-rem  src - OpenIB src path ...\gen1\trunk\r
-rem  dst - full path tp where binaries are copied, 'bin\' created here.\r
-rem  OSE - (Operating System Environment) which windows version {wxp,wlh,wnet}\r
-rem        representing {XP, server 2008 & server 2003}\r
+rem  src(%1) - OpenIB src path ...\gen1\trunk\r
+rem  dst(%2) - full path tp where binaries are copied, 'bin\' created here.\r
+rem  OSE(%3) - (Operating System Environment) which windows version\r
+rem            {wxp,wlh,wnet} representing {XP, server 2008 & server 2003}\r
 \r
 rem makebin is designed to take an openIB build tree path and produce a folder\r
 rem tree of binaries suitable for input to a WIX builder which procduces\r
@@ -63,13 +63,13 @@ rem
 \r
 if /I "%OSE%" == "wxp" goto wxp_drv\r
 \r
-rem Copy AMD64 drivers\r
+rem Copy AMD64 Free drivers\r
 set bin_dir=%1\bin\kernel\objfre_%OSE%_amd64\amd64\r
 set dest_dir=%2\HCA\amd64\\r
 \r
 if "%DBG%" == "TRUE" echo DBG: AMD64 free drivers\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf mlx4_hca.sys mlx4_bus.sys mlx4_hca.inf mlx4_bus.inf winverbs.sys winverbs.inf\r
+set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.inf mthca.pdb mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1> nul\r
     if ERRORLEVEL 1 (\r
@@ -83,6 +83,10 @@ xcopy %bin_dir%\ipoib.sys %2\net\amd64\ /yq
 xcopy %bin_dir%\qlgcvnic.sys %2\net\amd64\ /yq\r
 xcopy %bin_dir%\ibsrp.sys %2\storage\amd64\ /yq\r
 \r
+xcopy %bin_dir%\ipoib.pdb %2\net\amd64\ /yq\r
+xcopy %bin_dir%\qlgcvnic.pdb %2\net\amd64\ /yq\r
+xcopy %bin_dir%\ibsrp.pdb %2\storage\amd64\ /yq\r
+\r
 xcopy %bin_dir%\netipoib.inf %2\net\amd64\ /yq\r
 xcopy %bin_dir%\netvnic.inf %2\net\amd64\ /yq\r
 xcopy %bin_dir%\ib_srp.inf %2\storage\amd64\ /yq\r
@@ -95,7 +99,7 @@ if "%DBG%" == "TRUE" echo DBG: ia64 free drivers
 \r
 rem add mlx4_hca.inf & mlx4_bus.inf when Connectx on ia64 works.\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf winverbs.sys winverbs.inf\r
+set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.pdb mthca.inf winverbs.sys winverbs.pdb winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
@@ -109,6 +113,10 @@ xcopy %bin_dir%\ipoib.sys %2\net\ia64\ /yq
 xcopy %bin_dir%\qlgcvnic.sys %2\net\ia64\ /yq\r
 xcopy %bin_dir%\ibsrp.sys %2\storage\ia64\ /yq\r
 \r
+xcopy %bin_dir%\ipoib.pdb %2\net\ia64\ /yq\r
+xcopy %bin_dir%\qlgcvnic.pdb %2\net\ia64\ /yq\r
+xcopy %bin_dir%\ibsrp.pdb %2\storage\ia64\ /yq\r
+\r
 xcopy %bin_dir%\netipoib.inf %2\net\ia64\ /yq\r
 xcopy %bin_dir%\netvnic.inf %2\net\ia64\ /yq\r
 xcopy %bin_dir%\ib_srp.inf %2\storage\ia64\ /yq\r
@@ -122,7 +130,7 @@ if "%DBG%" == "TRUE" echo DBG: x86 free drivers
 set bin_dir=%1\bin\kernel\objfre_%OSE%_x86\i386\r
 set dest_dir=%2\HCA\x86\\r
 \r
-set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf mlx4_hca.sys mlx4_bus.sys mlx4_hca.inf mlx4_bus.inf winverbs.sys winverbs.inf\r
+set F=ibbus.sys ibbus.pdb ibiou.sys ibiou.pdb ib_iou.inf mthca.sys mthca.pdb mthca.inf mlx4_hca.sys mlx4_hca.pdb mlx4_hca.inf mlx4_bus.sys mlx4_bus.pdb mlx4_bus.inf winverbs.sys winverbs.pdb winverbs.inf\r
 for %%i in ( %F% ) do (\r
     xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
@@ -135,6 +143,11 @@ xcopy %WdfCoInstaller%\x86\WdfCoInstaller01007.dll %dest_dir% /yq
 xcopy %bin_dir%\ipoib.sys %2\net\x86\ /yq\r
 xcopy %bin_dir%\qlgcvnic.sys %2\net\x86\ /yq\r
 xcopy %bin_dir%\ibsrp.sys %2\storage\x86\ /yq\r
+\r
+xcopy %bin_dir%\ipoib.pdb %2\net\x86\ /yq\r
+xcopy %bin_dir%\qlgcvnic.pdb %2\net\x86\ /yq\r
+xcopy %bin_dir%\ibsrp.pdb %2\storage\x86\ /yq\r
+\r
 xcopy %bin_dir%\netipoib.inf %2\net\x86\ /yq\r
 xcopy %bin_dir%\netvnic.inf %2\net\x86\ /yq\r
 xcopy %bin_dir%\ib_srp.inf %2\storage\x86\ /yq\r
@@ -149,7 +162,7 @@ set bin_dir=%1\bin\user\objchk_%OSE%_amd64\amd64
 set dest_dir=%2\HCA\amd64\\r
 \r
 for %%i in (ibald.dll complibd.dll mthcaud.dll IbInstaller.dll mlx4ud.dll) do (\r
-       xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
+    xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul\r
     if ERRORLEVEL 1 (\r
         echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq\r
         exit /B 1\r
@@ -758,6 +771,79 @@ if NOT exist %2\Misc (
 copy /Y/A %1\Docs\Manual.htm %2\Misc\Manual.htm\r
 copy /Y/A %1\tests\cmtest\user\cmtest_main.c %2\Misc\cmtest.c\r
 \r
+rem setup Checked Drivers & Symbols for signing and installation.\r
+if "%DBG%" == "TRUE" echo %3 Checked Drivers+symbols\r
+\r
+if NOT exist %2\Chk (\r
+    mkdir %2\Chk\r
+    if ERRORLEVEL 1 (\r
+        echo "failed[%ERRORLEVEL%] mkdir %2\Chk ?"\r
+        exit /B 1\r
+    )\r
+)\r
+\r
+for %%i in ( HCA net storage ) do (\r
+    xcopy %2\%%i %2\Chk\%%i\ /S /Y /Q\r
+    if ERRORLEVEL 1 (\r
+        echo ERR on xcopy %2\%%i %2\Chk /syq\r
+        exit /B 1\r
+    )\r
+)\r
+\r
+rem cleanout free symbols\r
+for /F %%i in ('dir /B/S Chk\*.pdb') do (\r
+  @del /F/Q %%i\r
+)\r
+\r
+set B=%2\bin\kernel\objchk_%3\r
+\r
+for %%i in ( ibbus mthca ibiou mlx4_hca mlx4_bus ) do (\r
+    if exist %B%_amd64\amd64\%%i.sys (\r
+        copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\HCA\amd64\%%i.sys\r
+        copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\HCA\amd64\%%i.pdb\r
+    )\r
+\r
+    if exist %B%_ia64\ia64\%%i.sys (\r
+        copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\HCA\ia64\%%i.sys\r
+        copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\HCA\ia64\%%i.pdb\r
+    )\r
+    if exist %B%_x86\i386\%%i.sys (\r
+        copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\HCA\x86\%%i.sys\r
+        copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\HCA\x86\%%i.pdb\r
+    )\r
+)\r
+\r
+\r
+for %%i in ( ipoib qlgcvnic ) do (\r
+    if exist %B%_amd64\amd64\%%i.sys (\r
+        copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\net\amd64\%%i.sys\r
+        copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\net\amd64\%%i.pdb\r
+    )\r
+    if exist %B%_ia64\ia64\%%i.sys (\r
+        copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\net\ia64\%%i.sys\r
+        copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\net\ia64\%%i.pdb\r
+    )\r
+    if exist %B%_x86\i386\%%i.sys (\r
+        copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\net\x86\%%i.sys\r
+        copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\net\x86\%%i.pdb\r
+    )\r
+)\r
+\r
+for %%i in ( ibsrp ) do (\r
+    if exist %B%_amd64\amd64\%%i.sys (\r
+        copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\storage\amd64\%%i.sys\r
+        copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\storage\amd64\%%i.pdb\r
+    )\r
+    if exist %B%_ia64\ia64\%%i.sys (\r
+        copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\storage\ia64\%%i.sys\r
+        copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\storage\ia64\%%i.pdb\r
+    )\r
+    if exist %B%_x86\i386\%%i.sys (\r
+        copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\storage\x86\%%i.sys\r
+        copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\storage\x86\%%i.pdb\r
+    )\r
+)\r
+\r
 goto end\r
 \r
 :usage\r

diff --git a/trunk/ulp/ipoib/kernel/netipoib-xp32.inf b/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
index 73fa7baec80b0ecad2b5dc5ebffba7aca9303622..850c52adb2c441b4fe249bcde9ded0306e39fdbc 100644 (file)
--- a/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
+++ b/trunk/ulp/ipoib/kernel/netipoib-xp32.inf
@@ -1,4 +1,4 @@
-; OpenIB Internet Protocol over InfiniBand Adapter\r
+; OpenFabrics Alliance Internet Protocol over InfiniBand Adapter\r
 ; Copyright 2005 SilverStorm Technologies all Rights Reserved.\r
 ; Copyright 2006 Mellanox Technologies all Rights Reserved.\r
 \r
@@ -7,7 +7,7 @@ Signature   = "$Windows NT$"
 Class       = Net\r
 ClassGUID   = {4d36e972-e325-11ce-bfc1-08002be10318}\r
 Provider    = %OPENIB%\r
-DriverVer=06/11/2008,1.0.0000.1207\r
+DriverVer=09/09/2008,2.0.0000.1576\r
 CatalogFile=ipoib.cat\r
 \r
 [Manufacturer]\r
@@ -74,7 +74,7 @@ HKR, Ndi\Params\RqDepth,              Step,           0, "128"
 HKR, Ndi\Params\RqLowWatermark,        ParamDesc,      0, "Receive Queue Low Watermark"\r
 HKR, Ndi\Params\RqLowWatermark,        Type,           0, "dword"\r
 HKR, Ndi\Params\RqLowWatermark,        Default,        0, "4"\r
-HKR, Ndi\Params\RqLowWatermark,        Optional,       0, "1"\r
+HKR, Ndi\Params\RqLowWatermark,        Optional,       0, "0"\r
 HKR, Ndi\Params\RqLowWatermark,        Min,            0, "2"\r
 HKR, Ndi\Params\RqLowWatermark,        Max,            0, "8"\r
 HKR, Ndi\Params\RqLowWatermark,        Step,           0, "1"\r
@@ -89,17 +89,27 @@ HKR, Ndi\Params\SqDepth,            Step,           0, "128"
 \r
 HKR, Ndi\Params\SendChksum,            ParamDesc,      0, "Send Checksum Offload"\r
 HKR, Ndi\Params\SendChksum,            Type,           0, "enum"\r
-HKR, Ndi\Params\SendChksum,            Default,        0, "0"\r
+HKR, Ndi\Params\SendChksum,            Default,        0, "1"\r
 HKR, Ndi\Params\SendChksum,            Optional,       0, "0"\r
 HKR, Ndi\Params\SendChksum\enum,       "0",    0, "Disabled"\r
-HKR, Ndi\Params\SendChksum\enum,       "1",    0, "Enabled"\r
+HKR, Ndi\Params\SendChksum\enum,       "1",    0, "Enabled (if supported by HW)"\r
+HKR, Ndi\Params\SendChksum\enum,       "2",    0, "Bypass"\r
 \r
 HKR, Ndi\Params\RecvChksum,            ParamDesc,      0, "Recv Checksum Offload"\r
 HKR, Ndi\Params\RecvChksum,            Type,           0, "enum"\r
-HKR, Ndi\Params\RecvChksum,            Default,        0, "0"\r
+HKR, Ndi\Params\RecvChksum,            Default,        0, "1"\r
 HKR, Ndi\Params\RecvChksum,            Optional,       0, "0"\r
 HKR, Ndi\Params\RecvChksum\enum,       "0",    0, "Disabled"\r
-HKR, Ndi\Params\RecvChksum\enum,       "1",    0, "Enabled"\r
+HKR, Ndi\Params\RecvChksum\enum,       "1",    0, "Enabled (if supported by HW)"\r
+HKR, Ndi\Params\RecvChksum\enum,       "2",    0, "Bypass"\r
+\r
+HKR, Ndi\Params\lso,           ParamDesc,      0, "Large Send Offload"\r
+HKR, Ndi\Params\lso,           Type,           0, "enum"\r
+HKR, Ndi\Params\lso,           Default,        0, "0"\r
+HKR, Ndi\Params\lso,           Optional,       0, "0"\r
+HKR, Ndi\Params\lso\enum,      "0",    0, "Disabled"\r
+HKR, Ndi\Params\lso\enum,      "1",    0, "Enabled"\r
+\r
 \r
 HKR, Ndi\Params\SaTimeout,             ParamDesc,      0, "SA Query Timeout (ms)"\r
 HKR, Ndi\Params\SaTimeout,             Type,           0, "dword"\r
@@ -133,6 +143,7 @@ HKR, Ndi\Params\MCLeaveRescan,              Default,        0, "260"
 HKR, Ndi\Params\MCLeaveRescan,         Optional,       0, "0"\r
 HKR, Ndi\Params\MCLeaveRescan,         Min,            0, "1"\r
 HKR, Ndi\Params\MCLeaveRescan,         Max,            0, "3600"\r
+\r
 [IpoibService]\r
 DisplayName     = %IpoibServiceDispName%\r
 ServiceType     = 1 ;%SERVICE_KERNEL_DRIVER%\r
@@ -204,10 +215,11 @@ WOW64CopyFiles    = %DIRID_SYSTEM_X86%
 DefaultDestDir    = %DIRID_SYSTEM%\r
 \r
 [Strings]\r
-OPENIB               = "OpenIB Alliance"\r
-IpoibDesc            = "OpenIB IPoIB Adapter"\r
+OPENIB               = "OpenFabrics Alliance"\r
+IpoibDesc            = "OpenFabrics IPoIB Adapter"\r
+IpoibDescP           = "OpenFabrics IPoIB Adapter Partition"\r
 IpoibServiceDispName = "IPoIB"\r
-IcsDisk1             = "OpenIB IPoIB Disk #1"\r
+IcsDisk1             = "OpenFabrics IPoIB Disk #1"\r
 DIRID_SYSTEM         = 11\r
 DIRID_DRIVERS        = 12\r
 DIRID_SYSTEM_X86     = 16425\r

diff --git a/trunk/ulp/ipoib/kernel/netipoib.inx b/trunk/ulp/ipoib/kernel/netipoib.inx
index f3aa5f0f0ed306e4a12278ca9b166297c79982aa..74f76862d16e9b607e9bda504fa954b3345a5841 100644 (file)
--- a/trunk/ulp/ipoib/kernel/netipoib.inx
+++ b/trunk/ulp/ipoib/kernel/netipoib.inx
@@ -1,4 +1,4 @@
-; OpenIB Internet Protocol over InfiniBand Adapter\r
+; OpenFabrics Alliance Internet Protocol over InfiniBand Adapter\r
 ; Copyright 2005 SilverStorm Technologies all Rights Reserved.\r
 ; Copyright 2006 Mellanox Technologies all Rights Reserved.\r
 \r
@@ -143,7 +143,6 @@ HKR, Ndi\Params\PayloadMtu,         Default,        0, "2044"
 HKR, Ndi\Params\PayloadMtu,            Min,            0, "60"\r
 HKR, Ndi\Params\PayloadMtu,            Max,            0, "4092"\r
 \r
-\r
 HKR, Ndi\Params\MCLeaveRescan,         ParamDesc,      0, "MC leave rescan (sec)"\r
 HKR, Ndi\Params\MCLeaveRescan,         Type,           0, "dword"\r
 HKR, Ndi\Params\MCLeaveRescan,         Default,        0, "260"\r
@@ -151,7 +150,6 @@ HKR, Ndi\Params\MCLeaveRescan,              Optional,       0, "0"
 HKR, Ndi\Params\MCLeaveRescan,         Min,            0, "1"\r
 HKR, Ndi\Params\MCLeaveRescan,         Max,            0, "3600"\r
 \r
-\r
 [IpoibService]\r
 DisplayName     = %IpoibServiceDispName%\r
 ServiceType     = 1 ;%SERVICE_KERNEL_DRIVER%\r
@@ -227,11 +225,11 @@ WOW64CopyFiles    = %DIRID_SYSTEM_X86%
 DefaultDestDir    = %DIRID_SYSTEM%\r
 \r
 [Strings]\r
-OPENIB               = "OpenIB Alliance"\r
-IpoibDesc            = "OpenIB IPoIB Adapter"\r
-IpoibDescP           = "OpenIB IPoIB Adapter Partition"\r
+OPENIB               = "OpenFabrics Alliance"\r
+IpoibDesc            = "OpenFabrics IPoIB Adapter"\r
+IpoibDescP           = "OpenFabrics IPoIB Adapter Partition"\r
 IpoibServiceDispName = "IPoIB"\r
-IcsDisk1             = "OpenIB IPoIB Disk #1"\r
+IcsDisk1             = "OpenFabrics IPoIB Disk #1"\r
 DIRID_SYSTEM         = 11\r
 DIRID_DRIVERS        = 12\r
 DIRID_SYSTEM_X86     = 16425\r