From 1ed374886d693b799c878581057e39515a350f04 Mon Sep 17 00:00:00 2001 From: stansmith Date: Tue, 9 Sep 2008 18:43:23 +0000 Subject: [PATCH] [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 --- trunk/etc/makebin.bat | 104 +++++++++++++++++++++-- trunk/ulp/ipoib/kernel/netipoib-xp32.inf | 32 ++++--- trunk/ulp/ipoib/kernel/netipoib.inx | 12 ++- 3 files changed, 122 insertions(+), 26 deletions(-) diff --git a/trunk/etc/makebin.bat b/trunk/etc/makebin.bat index a4b77f5f..5efd5c33 100644 --- a/trunk/etc/makebin.bat +++ b/trunk/etc/makebin.bat @@ -3,10 +3,10 @@ setlocal rem usage: makebin src dst [wlh | wnet | wxp] rem -rem src - OpenIB src path ...\gen1\trunk -rem dst - full path tp where binaries are copied, 'bin\' created here. -rem OSE - (Operating System Environment) which windows version {wxp,wlh,wnet} -rem representing {XP, server 2008 & server 2003} +rem src(%1) - OpenIB src path ...\gen1\trunk +rem dst(%2) - full path tp where binaries are copied, 'bin\' created here. +rem OSE(%3) - (Operating System Environment) which windows version +rem {wxp,wlh,wnet} representing {XP, server 2008 & server 2003} rem makebin is designed to take an openIB build tree path and produce a folder rem tree of binaries suitable for input to a WIX builder which procduces @@ -63,13 +63,13 @@ rem if /I "%OSE%" == "wxp" goto wxp_drv -rem Copy AMD64 drivers +rem Copy AMD64 Free drivers set bin_dir=%1\bin\kernel\objfre_%OSE%_amd64\amd64 set dest_dir=%2\HCA\amd64\ if "%DBG%" == "TRUE" echo DBG: AMD64 free drivers -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 +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 for %%i in ( %F% ) do ( xcopy %bin_dir%\%%i %dest_dir% /yq 1> nul if ERRORLEVEL 1 ( @@ -83,6 +83,10 @@ xcopy %bin_dir%\ipoib.sys %2\net\amd64\ /yq xcopy %bin_dir%\qlgcvnic.sys %2\net\amd64\ /yq xcopy %bin_dir%\ibsrp.sys %2\storage\amd64\ /yq +xcopy %bin_dir%\ipoib.pdb %2\net\amd64\ /yq +xcopy %bin_dir%\qlgcvnic.pdb %2\net\amd64\ /yq +xcopy %bin_dir%\ibsrp.pdb %2\storage\amd64\ /yq + xcopy %bin_dir%\netipoib.inf %2\net\amd64\ /yq xcopy %bin_dir%\netvnic.inf %2\net\amd64\ /yq xcopy %bin_dir%\ib_srp.inf %2\storage\amd64\ /yq @@ -95,7 +99,7 @@ if "%DBG%" == "TRUE" echo DBG: ia64 free drivers rem add mlx4_hca.inf & mlx4_bus.inf when Connectx on ia64 works. -set F=ibbus.sys ib_bus.inf ibiou.sys ib_iou.inf mthca.sys mthca.inf winverbs.sys winverbs.inf +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 for %%i in ( %F% ) do ( xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul if ERRORLEVEL 1 ( @@ -109,6 +113,10 @@ xcopy %bin_dir%\ipoib.sys %2\net\ia64\ /yq xcopy %bin_dir%\qlgcvnic.sys %2\net\ia64\ /yq xcopy %bin_dir%\ibsrp.sys %2\storage\ia64\ /yq +xcopy %bin_dir%\ipoib.pdb %2\net\ia64\ /yq +xcopy %bin_dir%\qlgcvnic.pdb %2\net\ia64\ /yq +xcopy %bin_dir%\ibsrp.pdb %2\storage\ia64\ /yq + xcopy %bin_dir%\netipoib.inf %2\net\ia64\ /yq xcopy %bin_dir%\netvnic.inf %2\net\ia64\ /yq xcopy %bin_dir%\ib_srp.inf %2\storage\ia64\ /yq @@ -122,7 +130,7 @@ if "%DBG%" == "TRUE" echo DBG: x86 free drivers set bin_dir=%1\bin\kernel\objfre_%OSE%_x86\i386 set dest_dir=%2\HCA\x86\ -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 +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 for %%i in ( %F% ) do ( xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul if ERRORLEVEL 1 ( @@ -135,6 +143,11 @@ xcopy %WdfCoInstaller%\x86\WdfCoInstaller01007.dll %dest_dir% /yq xcopy %bin_dir%\ipoib.sys %2\net\x86\ /yq xcopy %bin_dir%\qlgcvnic.sys %2\net\x86\ /yq xcopy %bin_dir%\ibsrp.sys %2\storage\x86\ /yq + +xcopy %bin_dir%\ipoib.pdb %2\net\x86\ /yq +xcopy %bin_dir%\qlgcvnic.pdb %2\net\x86\ /yq +xcopy %bin_dir%\ibsrp.pdb %2\storage\x86\ /yq + xcopy %bin_dir%\netipoib.inf %2\net\x86\ /yq xcopy %bin_dir%\netvnic.inf %2\net\x86\ /yq xcopy %bin_dir%\ib_srp.inf %2\storage\x86\ /yq @@ -149,7 +162,7 @@ set bin_dir=%1\bin\user\objchk_%OSE%_amd64\amd64 set dest_dir=%2\HCA\amd64\ for %%i in (ibald.dll complibd.dll mthcaud.dll IbInstaller.dll mlx4ud.dll) do ( - xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul + xcopy %bin_dir%\%%i %dest_dir% /yq 1>nul if ERRORLEVEL 1 ( echo ERR on xcopy %bin_dir%\%%i %dest_dir% /yq exit /B 1 @@ -758,6 +771,79 @@ if NOT exist %2\Misc ( copy /Y/A %1\Docs\Manual.htm %2\Misc\Manual.htm copy /Y/A %1\tests\cmtest\user\cmtest_main.c %2\Misc\cmtest.c +rem setup Checked Drivers & Symbols for signing and installation. +if "%DBG%" == "TRUE" echo %3 Checked Drivers+symbols + +if NOT exist %2\Chk ( + mkdir %2\Chk + if ERRORLEVEL 1 ( + echo "failed[%ERRORLEVEL%] mkdir %2\Chk ?" + exit /B 1 + ) +) + +for %%i in ( HCA net storage ) do ( + xcopy %2\%%i %2\Chk\%%i\ /S /Y /Q + if ERRORLEVEL 1 ( + echo ERR on xcopy %2\%%i %2\Chk /syq + exit /B 1 + ) +) + +rem cleanout free symbols +for /F %%i in ('dir /B/S Chk\*.pdb') do ( + @del /F/Q %%i +) + +set B=%2\bin\kernel\objchk_%3 + +for %%i in ( ibbus mthca ibiou mlx4_hca mlx4_bus ) do ( + if exist %B%_amd64\amd64\%%i.sys ( + copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\HCA\amd64\%%i.sys + copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\HCA\amd64\%%i.pdb + ) + + if exist %B%_ia64\ia64\%%i.sys ( + copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\HCA\ia64\%%i.sys + copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\HCA\ia64\%%i.pdb + ) + if exist %B%_x86\i386\%%i.sys ( + copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\HCA\x86\%%i.sys + copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\HCA\x86\%%i.pdb + ) +) + + +for %%i in ( ipoib qlgcvnic ) do ( + if exist %B%_amd64\amd64\%%i.sys ( + copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\net\amd64\%%i.sys + copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\net\amd64\%%i.pdb + ) + if exist %B%_ia64\ia64\%%i.sys ( + copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\net\ia64\%%i.sys + copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\net\ia64\%%i.pdb + ) + if exist %B%_x86\i386\%%i.sys ( + copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\net\x86\%%i.sys + copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\net\x86\%%i.pdb + ) +) + +for %%i in ( ibsrp ) do ( + if exist %B%_amd64\amd64\%%i.sys ( + copy /B/Y %B%_amd64\amd64\%%i.sys %2\Chk\storage\amd64\%%i.sys + copy /B/Y %B%_amd64\amd64\%%i.pdb %2\Chk\storage\amd64\%%i.pdb + ) + if exist %B%_ia64\ia64\%%i.sys ( + copy /B/Y %B%_ia64\ia64\%%i.sys %2\Chk\storage\ia64\%%i.sys + copy /B/Y %B%_ia64\ia64\%%i.pdb %2\Chk\storage\ia64\%%i.pdb + ) + if exist %B%_x86\i386\%%i.sys ( + copy /B/Y %B%_x86\i386\%%i.sys %2\Chk\storage\x86\%%i.sys + copy /B/Y %B%_x86\i386\%%i.pdb %2\Chk\storage\x86\%%i.pdb + ) +) + goto end :usage diff --git a/trunk/ulp/ipoib/kernel/netipoib-xp32.inf b/trunk/ulp/ipoib/kernel/netipoib-xp32.inf index 73fa7bae..850c52ad 100644 --- 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 +; OpenFabrics Alliance Internet Protocol over InfiniBand Adapter ; Copyright 2005 SilverStorm Technologies all Rights Reserved. ; Copyright 2006 Mellanox Technologies all Rights Reserved. @@ -7,7 +7,7 @@ Signature = "$Windows NT$" Class = Net ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318} Provider = %OPENIB% -DriverVer=06/11/2008,1.0.0000.1207 +DriverVer=09/09/2008,2.0.0000.1576 CatalogFile=ipoib.cat [Manufacturer] @@ -74,7 +74,7 @@ HKR, Ndi\Params\RqDepth, Step, 0, "128" HKR, Ndi\Params\RqLowWatermark, ParamDesc, 0, "Receive Queue Low Watermark" HKR, Ndi\Params\RqLowWatermark, Type, 0, "dword" HKR, Ndi\Params\RqLowWatermark, Default, 0, "4" -HKR, Ndi\Params\RqLowWatermark, Optional, 0, "1" +HKR, Ndi\Params\RqLowWatermark, Optional, 0, "0" HKR, Ndi\Params\RqLowWatermark, Min, 0, "2" HKR, Ndi\Params\RqLowWatermark, Max, 0, "8" HKR, Ndi\Params\RqLowWatermark, Step, 0, "1" @@ -89,17 +89,27 @@ HKR, Ndi\Params\SqDepth, Step, 0, "128" HKR, Ndi\Params\SendChksum, ParamDesc, 0, "Send Checksum Offload" HKR, Ndi\Params\SendChksum, Type, 0, "enum" -HKR, Ndi\Params\SendChksum, Default, 0, "0" +HKR, Ndi\Params\SendChksum, Default, 0, "1" HKR, Ndi\Params\SendChksum, Optional, 0, "0" HKR, Ndi\Params\SendChksum\enum, "0", 0, "Disabled" -HKR, Ndi\Params\SendChksum\enum, "1", 0, "Enabled" +HKR, Ndi\Params\SendChksum\enum, "1", 0, "Enabled (if supported by HW)" +HKR, Ndi\Params\SendChksum\enum, "2", 0, "Bypass" HKR, Ndi\Params\RecvChksum, ParamDesc, 0, "Recv Checksum Offload" HKR, Ndi\Params\RecvChksum, Type, 0, "enum" -HKR, Ndi\Params\RecvChksum, Default, 0, "0" +HKR, Ndi\Params\RecvChksum, Default, 0, "1" HKR, Ndi\Params\RecvChksum, Optional, 0, "0" HKR, Ndi\Params\RecvChksum\enum, "0", 0, "Disabled" -HKR, Ndi\Params\RecvChksum\enum, "1", 0, "Enabled" +HKR, Ndi\Params\RecvChksum\enum, "1", 0, "Enabled (if supported by HW)" +HKR, Ndi\Params\RecvChksum\enum, "2", 0, "Bypass" + +HKR, Ndi\Params\lso, ParamDesc, 0, "Large Send Offload" +HKR, Ndi\Params\lso, Type, 0, "enum" +HKR, Ndi\Params\lso, Default, 0, "0" +HKR, Ndi\Params\lso, Optional, 0, "0" +HKR, Ndi\Params\lso\enum, "0", 0, "Disabled" +HKR, Ndi\Params\lso\enum, "1", 0, "Enabled" + HKR, Ndi\Params\SaTimeout, ParamDesc, 0, "SA Query Timeout (ms)" HKR, Ndi\Params\SaTimeout, Type, 0, "dword" @@ -133,6 +143,7 @@ HKR, Ndi\Params\MCLeaveRescan, Default, 0, "260" HKR, Ndi\Params\MCLeaveRescan, Optional, 0, "0" HKR, Ndi\Params\MCLeaveRescan, Min, 0, "1" HKR, Ndi\Params\MCLeaveRescan, Max, 0, "3600" + [IpoibService] DisplayName = %IpoibServiceDispName% ServiceType = 1 ;%SERVICE_KERNEL_DRIVER% @@ -204,10 +215,11 @@ WOW64CopyFiles = %DIRID_SYSTEM_X86% DefaultDestDir = %DIRID_SYSTEM% [Strings] -OPENIB = "OpenIB Alliance" -IpoibDesc = "OpenIB IPoIB Adapter" +OPENIB = "OpenFabrics Alliance" +IpoibDesc = "OpenFabrics IPoIB Adapter" +IpoibDescP = "OpenFabrics IPoIB Adapter Partition" IpoibServiceDispName = "IPoIB" -IcsDisk1 = "OpenIB IPoIB Disk #1" +IcsDisk1 = "OpenFabrics IPoIB Disk #1" DIRID_SYSTEM = 11 DIRID_DRIVERS = 12 DIRID_SYSTEM_X86 = 16425 diff --git a/trunk/ulp/ipoib/kernel/netipoib.inx b/trunk/ulp/ipoib/kernel/netipoib.inx index f3aa5f0f..74f76862 100644 --- a/trunk/ulp/ipoib/kernel/netipoib.inx +++ b/trunk/ulp/ipoib/kernel/netipoib.inx @@ -1,4 +1,4 @@ -; OpenIB Internet Protocol over InfiniBand Adapter +; OpenFabrics Alliance Internet Protocol over InfiniBand Adapter ; Copyright 2005 SilverStorm Technologies all Rights Reserved. ; Copyright 2006 Mellanox Technologies all Rights Reserved. @@ -143,7 +143,6 @@ HKR, Ndi\Params\PayloadMtu, Default, 0, "2044" HKR, Ndi\Params\PayloadMtu, Min, 0, "60" HKR, Ndi\Params\PayloadMtu, Max, 0, "4092" - HKR, Ndi\Params\MCLeaveRescan, ParamDesc, 0, "MC leave rescan (sec)" HKR, Ndi\Params\MCLeaveRescan, Type, 0, "dword" HKR, Ndi\Params\MCLeaveRescan, Default, 0, "260" @@ -151,7 +150,6 @@ HKR, Ndi\Params\MCLeaveRescan, Optional, 0, "0" HKR, Ndi\Params\MCLeaveRescan, Min, 0, "1" HKR, Ndi\Params\MCLeaveRescan, Max, 0, "3600" - [IpoibService] DisplayName = %IpoibServiceDispName% ServiceType = 1 ;%SERVICE_KERNEL_DRIVER% @@ -227,11 +225,11 @@ WOW64CopyFiles = %DIRID_SYSTEM_X86% DefaultDestDir = %DIRID_SYSTEM% [Strings] -OPENIB = "OpenIB Alliance" -IpoibDesc = "OpenIB IPoIB Adapter" -IpoibDescP = "OpenIB IPoIB Adapter Partition" +OPENIB = "OpenFabrics Alliance" +IpoibDesc = "OpenFabrics IPoIB Adapter" +IpoibDescP = "OpenFabrics IPoIB Adapter Partition" IpoibServiceDispName = "IPoIB" -IcsDisk1 = "OpenIB IPoIB Disk #1" +IcsDisk1 = "OpenFabrics IPoIB Disk #1" DIRID_SYSTEM = 11 DIRID_DRIVERS = 12 DIRID_SYSTEM_X86 = 16425 -- 2.46.0