rem set IDIR=D:\temp\r
set IDIR=C:\Windows\Temp\r
\r
-echo Building for OPENIB_REV %SVN%, WDK ConnectX files in tree.\r
+echo Building OPENIB_REV %SVN%, WDK ConnectX in %BSE%.\r
timeout /T 5\r
\r
if NOT EXIST "%IDIR%" (\r
\r
set OPS=-wgcM 3\r
\r
+rem exit /B 1\r
+\r
echo Building Checked x64\r
%COMSPEC% /C "call %_DDK%\IB_CHK_BLD_x64.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\core\complib & build %OPS%"\r
if ERRORLEVEL 1 exit /B 1\r
%COMSPEC% /C "call %_DDK%\IB_CHK_BLD_x64.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\hw\mlx4 & build %OPS%"\r
if ERRORLEVEL 1 exit /B 1\r
echo Checked x64 done\r
-timeout /T 8\r
+timeout /T 6\r
\r
echo Building Free x64\r
%COMSPEC% /C "call %_DDK%\IB_FRE_BLD_x64.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\core\complib & build %OPS%"\r
%COMSPEC% /C "call %_DDK%\IB_FRE_BLD_x64.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\hw\mlx4 & build %OPS%"\r
if ERRORLEVEL 1 exit /B 1\r
echo Free x64 done\r
-timeout /T 8\r
+timeout /T 6\r
\r
rem %COMSPEC% /C "call %BSE%\etc\IB_CHK_BLD_x86.bat %SVN% %CD% %_DDK% '%_PSDK%' & build %OPS%"\r
rem if ERRORLEVEL 1 exit /B 1\r
%COMSPEC% /C "call %_DDK%\IB_FRE_BLD_x86.bat %SVN% %CD% %_DDK% '%_PSDK%' & cd %BSE%\hw\mlx4 & build %OPS%"\r
if ERRORLEVEL 1 exit /B 1\r
echo Free x86 done\r
-timeout /T 8\r
+timeout /T 6\r
\r
rem x86 check ConnectX build fails in core\\r
+\r
rem %COMSPEC% /C "call %BSE%\etc\IB_CHK_BLD_IA64.bat %SVN% %CD% %_DDK% '%_PSDK%' & build %OPS%"\r
rem if ERRORLEVEL 1 exit /B 1\r
rem %COMSPEC% /C "call %BSE%\etc\IB_FRE_BLD_IA64.bat %SVN% %CD% %_DDK% '%_PSDK%' & build %OPS%"\r
rem if ERRORLEVEL 1 exit /B 1\r
+\r
+del /F/Q bin\user\objfre_wnet_amd64\amd64\complib.pdb \r
+del /F/Q bin\user\objfre_wnet_amd64\amd64\ibal.pdb \r
+del /F/Q bin\user\objchk_wnet_amd64\amd64\complibd.pdb \r
+del /F/Q bin\user\objchk_wnet_amd64\amd64\ibald.pdb \r
+\r
+del /F/Q bin\user\objfre_wnet_x86\i386\complib.pdb \r
+del /F/Q bin\user\objfre_wnet_x86\i386\ibal.pdb \r
echo +\r
echo WDK build for ConnectX done!\r
\r
Class=System\r
ClassGuid={4D36E97D-E325-11CE-BFC1-08002BE10318}\r
Provider=%OPENIB%\r
-DriverVer=04/29/2008,1.0.0000.1059\r
+DriverVer=04/29/2008,1.0.0000.1089\r
CatalogFile=ib_bus.cat\r
\r
; ================= Device Install section =====================\r
ClassGUID={58517E00-D3CF-40c9-A679-CEE5752F4491}\r
Provider=%OPENIB%\r
; must be synchronized with MTHCA_DEV.H\r
-DriverVer=04/29/2008,1.0.0000.1059\r
+DriverVer=04/29/2008,1.0.0000.1089\r
CatalogFile=mthca.cat\r
\r
; ================= Destination directory section =====================\r
Class = Net\r
ClassGUID = {4d36e972-e325-11ce-bfc1-08002be10318}\r
Provider = %OPENIB%\r
-DriverVer=04/29/2008,1.0.0000.1059\r
+DriverVer=04/29/2008,1.0.0000.1089\r
CatalogFile=ipoib.cat\r
\r
[Manufacturer]\r
Class=Net\r
ClassGUID={4d36e972-e325-11ce-bfc1-08002be10318}\r
Provider=%Inf_Provider%\r
-DriverVer=04/29/2008,1.0.0000.1059\r
+DriverVer=04/29/2008,1.0.0000.1089\r
\r
[ControlFlags]\r
ExcludeFromSelect = IBA\V00066aP00000030\r
Class=SCSIAdapter\r
ClassGUID={4D36E97B-E325-11CE-BFC1-08002BE10318}\r
Provider=%OPENIB%\r
-DriverVer=04/29/2008,1.0.0000.1059\r
+DriverVer=04/29/2008,1.0.0000.1089\r
\r
\r
; ================= Device Install section =====================\r
End Function\r
\r
\r
-' Since a CustomAction (CA) that runs before SetupFinalize as a defered action\r
+\r
+' A CustomAction (CA) that runs before SetupFinalize as a defered action CA,\r
' can only see the properties through 'CustomActionData'\r
\r
Sub WinOF_setup\r
+ '\r
' Driver Install Properties:\r
' 0-INSTALLDIR; 1-SystemFolder; 2-System64Folder; 3-WindowsFolder\r
\r
End Sub\r
\r
\r
-''''''''''' Remove Driver Files ''''''''''''\r
-\r
'Waiting to delete a file until it's free\r
\r
Function FileDeleteUntilFree(filename)\r
If fso.FileExists(filename) Then\r
On Error Resume Next \r
fso.DeleteFile(filename),True\r
- If (Err AND Err.Number <> 70) Then ' tolerate protection errors\r
+ If (Err And Err.Number <> 70) Then ' tolerate protection errors\r
ErrMsg ("Could not delete: " & filename)\r
End If \r
End If\r
On Error Resume Next \r
If fso.FileExists(filename) Then\r
fso.MoveFile filename,destination\r
- If (Err AND Err.Number <> 70) then ' tolerate protection errors.\r
+ If (Err And Err.Number <> 70) then ' tolerate protection errors.\r
ErrMsg ("Could not move: " & filename & " to " & destination)\r
End if\r
End If\r
' What rmdir does from the cmd line but will not do from vbs?\r
\r
Sub RemoveFolder(objStartFolder)\r
-\r
-Set objFSO = CreateObject("Scripting.FileSystemObject")\r
-\r
-If Not objFSO.FolderExists(objStartFolder) Then\r
- Exit Sub\r
-End if\r
-\r
-Set objFolder = objFSO.GetFolder(objStartFolder)\r
-'Wscript.Echo objFolder.Path\r
-Set colFiles = objFolder.Files\r
-\r
-' del files in top-level folder\r
-For Each objFile in colFiles\r
- objFSO.DeleteFile(objFolder.Path & "\" & objFile.Name)\r
+ \r
+ Set objFSO = CreateObject("Scripting.FileSystemObject")\r
+ \r
+ If Not objFSO.FolderExists(objStartFolder) Then\r
+ Exit Sub\r
+ End if\r
+ \r
+ Set objFolder = objFSO.GetFolder(objStartFolder)\r
+ 'Wscript.Echo objFolder.Path\r
+ Set colFiles = objFolder.Files\r
+ \r
+ ' del files in top-level folder\r
+ For Each objFile in colFiles\r
+ objFSO.DeleteFile(objFolder.Path & "\" & objFile.Name)\r
+ If Err Then\r
+ ErrMsg("Del err on " & objFolder.Path & "\" & objFile.Name)\r
+ End if\r
+ Next\r
+ \r
+ ShowSubfolders objFSO.GetFolder(objStartFolder), objFSO\r
+ \r
+ On Error Resume Next\r
+ objFSO.DeleteFolder(objStartFolder)\r
If Err Then\r
- ErrMsg("Del err on " & objFolder.Path & "\" & objFile.Name)\r
+ ErrMsg("DelFolder err on " & objStartFolder)\r
End if\r
-Next\r
-\r
-ShowSubfolders objFSO.GetFolder(objStartFolder), objFSO\r
-\r
-On Error Resume Next\r
-objFSO.DeleteFolder(objStartFolder)\r
-If Err Then\r
- ErrMsg("DelFolder err on " & objStartFolder)\r
-End if\r
-\r
+ \r
End Sub\r
\r
\r
Sub ShowSubFolders(Folder,FSO)\r
On Error Resume Next\r
For Each Subfolder in Folder.SubFolders\r
-' Wscript.Echo Subfolder.Path\r
+ ' Wscript.Echo Subfolder.Path\r
Set objFolder = FSO.GetFolder(Subfolder.Path)\r
Set colFiles = objFolder.Files\r
For Each objFile in colFiles\r
-' Wscript.Echo Subfolder.Path & "\" & objFile.Name\r
+ ' Wscript.Echo Subfolder.Path & "\" & objFile.Name\r
FSO.DeleteFile(Subfolder.Path & "\" & objFile.Name)\r
If Err Then\r
ErrMsg("DelFile err on " & Subfolder.Path & "\" & objFile.Name)\r
End if\r
Next\r
-' Wscript.Echo\r
+ ' Wscript.Echo\r
ShowSubFolders Subfolder, FSO\r
FSO.DeleteFolder(Subfolder.Path)\r
If Err Then\r
\r
\r
\r
+''''''''''' Remove Driver Files ''''''''''''\r
+\r
' Attempt to clean out driver installed files which fail to be uninstalled\r
' when the driver is uninstalled. Win2K3/x64 files persist, XP & Win2K3/x86\r
' the driver files are correctly remove?\r
sDRIVERS = sDRIVERS & "drivers\"\r
\r
FileDelete(sDRIVERS & "ibbus.sys")\r
+ FileDelete(sDRIVERS & "ibiou.sys")\r
FileDelete(sDRIVERS & "mthca.sys")\r
+ FileDelete(sDRIVERS & "mlx4_bus.sys")\r
+ FileDelete(sDRIVERS & "mlx4_hca.sys")\r
+\r
FileDelete(sDRIVERS & "ipoib.sys")\r
FileDelete(sDRIVERS & "ibsrp.sys")\r
FileDelete(sDRIVERS & "vnic.sys")\r
FileDelete(dllCache & "complibd.dll")\r
FileDelete(dllCache & "mthcau.dll")\r
FileDelete(dllCache & "mthcaud.dll")\r
+ FileDelete(dllCache & "mlx4u.dll")\r
+ FileDelete(dllCache & "mlx4ud.dll")\r
FileDelete(dllCache & "IbInstaller.dll")\r
FileDelete(dllCache & "ibwsd.dll")\r
FileDelete(dllCache & "ibsrp.dll")\r
FileDelete(sSystem64Folder & "complibd.dll")\r
FileDelete(sSystem64Folder & "mthcau.dll")\r
FileDelete(sSystem64Folder & "mthcaud.dll")\r
+ FileDelete(sSystem64Folder & "mlx4u.dll")\r
+ FileDelete(sSystem64Folder & "mlx4ud.dll")\r
FileDelete(sSystem64Folder & "IbInstaller.dll")\r
FileDelete(sSystem64Folder & "ibwsd.dll")\r
FileDelete(sSystem64Folder & "ibsrp.dll")\r
FileDelete(sSystemFolder & "complibd.dll")\r
FileDelete(sSystemFolder & "mthcau.dll")\r
FileDelete(sSystemFolder & "mthcaud.dll")\r
+ FileDelete(sSystemFolder & "mlx4u.dll")\r
+ FileDelete(sSystemFolder & "mlx4ud.dll")\r
FileDelete(sSystemFolder & "ibsrp.dll")\r
FileDelete(sSystemFolder & "ibsrpd.dll")\r
FileDelete(sSystemFolder & "IbInstaller.dll")\r
\r
\r
''''''''''' Driver Install ''''''''''''\r
+' For installer error codes see\r
+' http://msdn2.microsoft.com/en-us/library/aa368542(VS.85).aspx \r
\r
Function DriverInstall()\r
\r
+ const ERROR_INSTALL_SOURCE_ABSENT = 1612 ' missing files to install,\r
+ ' invalid feature selection.\r
+ const ERROR_INSTALL_FAILURE = 1603 ' fatal error during installation\r
+ const ERROR_FUNCTION_FAILED = 1627 ' function failed during execution \r
+ \r
MTARCH = Architecture\r
\r
Dim PropArray, devID, devman, devmanEXE, devmanNET, devmanQL\r
- Dim rc, CheckMode, sInstalldir, fso\r
+ Dim rc, cmd, CheckMode, sInstalldir, fso, DrvInstalled\r
\r
' Get the value of INSTALLDIR\r
CheckMode = Session.Property("CustomActionData")\r
devmanEXE = sInstalldir & "IBcore\devman.exe "\r
devmanEXE1 = "..\IBcore\devman.exe "\r
devman = "cmd.exe /c cd " & sInstalldir & "IBcore & devman.exe "\r
+ devmanCX = "cmd.exe /c cd " & sInstalldir & "ConnectX & " & devmanEXE1\r
devmanNET = "cmd.exe /c cd " & sInstalldir & "net & " & devmanEXE1\r
devmanQL = "cmd.exe /c cd " & sInstalldir & "qlgcvnic & " & devmanEXE1\r
devmanSRP = "cmd.exe /c cd " & sInstalldir & "SRP & " & devmanEXE1\r
Exit Function\r
End if\r
\r
- ' Install HCA Driver\r
- Return = WshShell.Run (devman & "update mthca.inf PCI\VEN_15B3", 0, true)\r
- ' Display error number and description if applicable\r
- If Err Then ShowError\r
- If Return <> 0 Then\r
- msgbox "Driver Install HCA - update mthca.inf PCI\VEN_15b3 Ret=" _\r
- & Return & " Err=" & Err\r
- DriverInstall=Return\r
- ' cleanup device database.\r
- Return = WshShell.Run (devman & "remove PCI\VEN_15B3", 0, true)\r
- Exit Function\r
+ ' Install an HCA (Host Channel Adapter) Driver\r
+\r
+ DrvInstalled = false\r
+\r
+ ' XXX temp until Mx support for mthca & mlx4_hca co-loading works\r
+ ' [4-16-08] stan\r
+\r
+ If fso.FileExists(sInstalldir & "IBcore\mlx4_hca.inf") And _\r
+ fso.FileExists(sInstalldir & "IBcore\mthca.inf") Then\r
+ msgbox "HCA Driver - Error: loading InfiniHost and ConnectX " _\r
+ & "Not Supported."\r
+ DriverInstall=ERROR_INSTALL_FAILURE\r
+ Exit Function\r
+ End If\r
+\r
+ ' InfiniHost HCA?\r
+ If fso.FileExists(sInstalldir & "IBcore\mthca.inf") Then\r
+ Return = WshShell.Run (devman & "update mthca.inf PCI\VEN_15B3",0,true)\r
+ ' Display error number and description if applicable\r
+ If Err Then ShowError\r
+ If Return <> 0 Then\r
+ msgbox "HCA Install - update mthca.inf PCI\VEN_15b3 Ret=" _\r
+ & Return & " Err=" & Err\r
+ DriverInstall=ERROR_INSTALL_FAILURE\r
+ ' cleanup device database.\r
+ Return = WshShell.Run (devman & "remove PCI\VEN_15B3", 0, true)\r
+ Exit Function\r
+ End if\r
+ DrvInstalled = true\r
End if\r
\r
+ ' ConnectX HCA?\r
+ If fso.FileExists(sInstalldir & "IBcore\mlx4_hca.inf") Then\r
+ ' WORKAROUND - force load ibbus driver\r
+ cmd = devman & "install ib_bus.inf {94f41ced-78eb-407c-b5df-958040af0fd8}"\r
+ Return = WshShell.Run (cmd,0,true)\r
+ ' END-WORKAROUND\r
+ cmd = devman & "update mlx4_bus.inf PCI\VEN_15B3"\r
+ Return = WshShell.Run (cmd,0,true)\r
+ cmd = devman & "update mlx4_hca.inf MLX4\CONNECTX_HCA"\r
+ Return = WshShell.Run (cmd,0,true)\r
+ ' Display error number and description if applicable\r
+ If Err Then ShowError\r
+ If Return <> 0 Then\r
+ msgbox "HCA Install - update mlx4_hca.inf MLX4\CONNECTX_HCA Ret=" _\r
+ & Return & " Err=" & Err\r
+ DriverInstall=ERROR_INSTALL_FAILURE\r
+ ' cleanup device database.\r
+ Return = WshShell.Run (devman & "remove PCI\VEN_15B3", 0, true)\r
+ Exit Function\r
+ End if\r
+ DrvInstalled = true\r
+ End if\r
+\r
+ if DrvInstalled = false Then\r
+ msgbox "Driver Install - No HCA Driver Selected to Install?" & _\r
+ " Aborting Installation."\r
+ ' Force installer cleanup (real magic).\r
+ DriverInstall=ERROR_INSTALL_SOURCE_ABSENT\r
+ Exit Function\r
+ End if\r
+\r
' Check/install IPoIB driver\r
If fso.FileExists(sInstalldir & "net\netipoib.inf") Then\r
rc = WshShell.Run (devmanNET & "update netipoib.inf IBA\IPoIB",0,true)\r
-[2-11-08]\r
+[4-11-08]\r
\r
How to generate a Windows OpenFabrics Release (WinOF) using the WIX 2.0 open\r
source installer tool set ( http://sourceforge.net/projects/wix/ ).\r
\r
-[03-11-08] WinOF 1.1 release\r
+[04-28-08] WinOF 1.1 release\r
\r
\r
-Summary Changes since WinOF [1.0.1] (svn.864)\r
------------------------\r
+WinOF 1.1 Summary Changes \r
+-------------------------\r
\r
-0) WinOF 1.1 based on openib-windows src revision XXX.\r
+1) WinOF 1.1 release based on openib-windows svn source revision (braanches\WOF1-1 1089).\r
+ WinOF 1.0.1 release based on svn 864.\r
\r
-1) WinOF 1.1 installer based on open source WIX 2.0 (Windows Installer XML) technology.\r
- - Complete WIX installer source in openib-windows subversion src tree (branches).\r
- InstallShield is no longer required; WIX is free open source.\r
+2) Stability enhancements in :\r
+ IB Core\r
+ IPoIB \r
+ WSD\r
+ QLogic VNIC & SRP\r
+ DAT/DAPL\r
\r
-2) manual.htm updates on\r
- - IB SDK (Software Development Kit)\r
- - Qlogic VNic\r
+3) New Functionality\r
\r
-3) Release_notes_1-1.htm updates\r
- - ?\r
+ Host CHannel Adapter device driver selection:\r
\r
-4) DAT/DAPL 2.0 runtime libraries released with InfiniBand extended operations for\r
- - RDMA write with Immediate data\r
- - Atomic Compare and Swap\r
- - Atomic Fetch and Add\r
+ Mellanox InfiniHost HCA products\r
+ \r
+ Mellanox ConnectX (MT25408) SDR Channel Adapter\r
\r
-5) DAT/DAPL Application Build environments.\r
- - documented in manual.htm\r
- - Optional Header files in %SystemDrive%\DAT\v{1/2}\DAT\r
+ DAT/DAPL\r
+ 2.0 source is the same as OFED 1.3\r
+ DAPL v2 Socket CM available for Windows to Linux Dat interoperability.\r
\r
-6) WSD patches\r
- - ?\r
-\r
-7) SRP patches\r
- - ?\r
-\r
-8) IB Core\r
- - NDI Microsoft NDI support?\r
-\r
-9) WinOF integrated into OpenFabrics Alliance download page.\r
+3) WinOF integrated into OpenFabrics Alliance download page.\r
- http://www.openfabrics.org/downloads/WinOF/v1.1\r
\r
-10) WinOF symbol store available.\r
+4) WinOF symbol store available.\r
Point windbg at http://www.openfabrics.org/downloads/WinOF/v1.1/SymStor\r
\r
\r
\r
**** WARNING ****\r
\r
-After the WinOF.msi file has started execution, an errant\r
+After the WinOF.msi file has started installation execution, an errant\r
"Welcome to the Found New Hardware Wizard" window 'may' popup.\r
\r
Just 'cancel' the errant FNHW popup window in order to proceed with the installation.\r
which are covered.\r
\r
\r
-Please read the Release_notes_1-1.htm file and make sure your HCA firmware is recent.\r
-\r
+Please:\r
+ read the Release_notes.htm file!\r
+ make 'sure' your HCA firmware is recent; vstat.exe will display HCA firmware version.\r
\r
thank you.\r
<h1 align=center style='text-align:center'>1.1 Release Notes</h1>\r
\r
<h3 align=center style='text-align:center'>\r
-<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->02/08/2008<!--webbot bot="Timestamp" endspan i-checksum="12624" --></h3>\r
+<!--webbot bot="Timestamp" S-Type="EDITED" S-Format="%m/%d/%Y" startspan -->04/28/2008<!--webbot bot="Timestamp" endspan i-checksum="12644" --></h3>\r
\r
<div class=MsoNormal align=center style='text-align:center'>\r
\r
<p class=MsoPlainText><span style='font-size:12.0pt;font-family:"Times New Roman"'> Binary\r
files generated from the openib-windows developers subversion (svn) source tree </span>\r
'svn://openib.tc.cornell.edu'<span style='font-size:12.0pt;font-family:"Times New Roman"'> \r
-(svn revision <font color="#FF0000">864</font>)\r
+(branches\WOF1-1 svn revision <font color="#FF0000">1089</font>)\r
are packaged into a <a href="http://www.dalun.com/wix/default.htm">WIX 2.0 \r
(Windows Installer Xml)</a> single file install package referred to as\r
the Windows OpenFabrics (WinOF) release 1.1.<br>\r
</div>\r
<ul>\r
<li>\r
- <p class="MsoPlainText"><font face="Times New Roman" size="3">IPoIB multiple \r
- partition support</font></p></li>\r
+ <p class="MsoPlainText"><font face="Times New Roman" size="3">Mellanox has \r
+ provided driver support for ConnectX hardware.</font></p></li>\r
<li>\r
- <p class="MsoPlainText"><br>\r
- </p></li>\r
+ <p class="MsoPlainText"><font face="Times New Roman" size="3">QLogic has \r
+ enhanced VNIC & SRP for increased stability.</font></p></li>\r
+ <li>\r
+ <p class="MsoPlainText"><font face="Times New Roman" size="3">Voltaire has \r
+ provided IPoIB partitioning support.</font></p></li>\r
+ <li>\r
+ <p class="MsoPlainText"><font face="Times New Roman" size="3">DAPL Socket CM provider now enables Windows to Linux \r
+ DAT interoperability</font></p></li>\r
+ <li>\r
+ <p class="MsoPlainText"><font face="Times New Roman" size="3">DAT/DAPL source is synchronized with OFED 1.3 DAT/DAPL.</font></p></li>\r
+ <li>\r
+ <p class="MsoPlainText"><font face="Times New Roman" size="3">Bug fixes for stability in IBcore, WSD, VNIC, SRP, IPoIB, DAT/DAPL</font></p></li>\r
</ul>\r
-<p class="MsoPlainText"><font face="Times New Roman" size="3" color="#FF0000">Mellanox QA cycle \r
-words?</font></p>\r
-<p class="MsoPlainText"> </p>\r
<div class=Section1>\r
\r
<p>The Windows OpenFabrics (WinOF) release package contains the following:<br>\r
OpenFabrics InfiniBand core drivers and Upper Level Protocols (ULPs):</p>\r
<ul>\r
<li>\r
- <p style="text-indent: -.25in; margin-left: .5in"><span dir="LTR">MTHCA -<span style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'> \r
- Mellanox </span></span><st1:stockticker>\r
+ <p style="text-indent: -.25in; margin-left: .5in"><span dir="LTR">HCA \r
+ Drivers - </span>\r
+ <span style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll' dir="LTR"> Mellanox \r
+ </span>\r
+ <st1:stockticker>\r
<span\r
- style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'>HCA</span></st1:stockticker><span\r
-style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'> low level driver; See list of\r
-supported devices below<br>\r
- </span></li>\r
+ style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'>\r
+ InfiniHost & ConnectX</span></st1:stockticker><span\r
+style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll'> low level drivers; See list of\r
+supported devices below</span></li>\r
<li>\r
<p style="text-indent: -.25in; margin-left: .5in">\r
- <span style="background-position: 0% 0%">Infiniband Core components<br>\r
- </span></li>\r
+ <span style="background-position: 0% 0%">Infiniband Core components</span></li>\r
<li>\r
<p style="text-indent: -.25in; margin-left: .5in">Upper Layer Protocols: \r
IPoIB, WSD, VNIC, SRP Initiator and DAT/DAPL</li>\r
<p style='margin-left:.5in;text-indent:-.25in'><span dir=LTR>OpenSM: InfiniBand fabric Subnet Manager</span></p>\r
</li>\r
<li>\r
- <p style='margin-left:.5in;text-indent:-.25in'><span dir=LTR>Performance tests</span></p>\r
- </li>\r
+ <p style='margin-left:.5in;text-indent:-.25in'><span dir=LTR>Performance \r
+ tests</span></p></li>\r
<li>\r
- <p style='margin-left:.5in;text-indent:-.25in'><span dir=LTR>Diagnostic tools</span></p>\r
+ <p style='margin-left:.5in;text-indent:-.25in'><span dir="LTR">Diagnostic tools</span></p>\r
</li>\r
</ul>\r
\r
\r
<h4><u>Supported HCAs (Host Channel Adapters)</u></h4>\r
\r
-<p>Mellanox (mthca.inf)</p>\r
+<p>Mellanox</p>\r
<ul>\r
<li>\r
<p style='margin-left:.5in;text-indent:-.25in;mso-list:l13 level1 lfo1;\r
<li>\r
<p style='margin-left:.5in;text-indent:-.25in;mso-list:l13 level1 lfo1;\r
tab-stops:list .5in'>\r
- <span style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll' dir="LTR">MT25204 \96 InfiniHost III Lx<o:p></o:p></span></p>\r
+ <span style='background-position: 0% 0%; mso-highlight:yellow; background-image:none; background-repeat:repeat; background-attachment:scroll' dir="LTR">MT25204 \96 InfiniHost III Lx</span></p>\r
+ </li>\r
+ <li>\r
+ <p style='margin-left:.5in;text-indent:-.25in;mso-list:l13 level1 lfo1;\r
+tab-stops:list .5in'><span style="background-position: 0% 0%">MT25408 - </span>\r
+ <span style="background-position: 0% 0%">ConnectX SDR Channel Adapter</span></p>\r
</li>\r
</ul>\r
<p>Both SDR and DDR mode of the InfiniHost III family are supported.<br><br>For official Firmware (FW) versions and update tools please see:<br>\r
-<a href="http://www.mellanox.com/support/firmware_table.php">http://www.mellanox.com/support/firmware_table.php</a></p>\r
+<a href="http://www.mellanox.com/support/firmware_table.php">http://www.mellanox.com/support/firmware_table.php</a><br>\r
+Current HCA firmware version can be viewed from the 'vstat' command.</p>\r
\r
<h4><u>Supported Switches</u></h4>\r
\r
<li>\r
<p style='margin-left:.5in;text-indent:-.25in'><span dir=LTR>Flextronics</span></p>\r
</li>\r
+ <li>\r
+ <p style='margin-left:.5in;text-indent:-.25in'>Due to lack of hardware \r
+ accessibility, \r
+ other vendor switches have not been tested.</p>\r
+ </li>\r
</ul>\r
\r
<h2> </h2>\r
\r
<ul type=disc>\r
<li class=MsoNormal>InfiniBand Core:<ul type=disc>\r
- <li>HCA driver, IB core stack and libraries.</li>\r
+ <li>HCA driver - Mellanox: InfiniHost or ConnectX</li>\r
+ <li>IB core stack and libraries.</li>\r
<li>Release Notes, Manual</li>\r
<li>Subnet Management [opensm], Performance & Diagnostic tools</li>\r
</ul></li>\r
</li>\r
<li>WinOF 1.0.1 is based on openib-windows <b><u>svn revision 864</u></b>.<br>\r
</li>\r
- <li><font color="#FF0000">WinOF 1.1 is based on openib-windows <b><u>svn revision 864.</u></b></font></li>\r
+ <li><font color="#FF0000">WinOF 1.1 is based on openib-windows <b><u>\r
+ (branches\WOF1-1) svn revision \r
+ 1089.</u></b></font></li>\r
</ul>\r
<h3> </h3>\r
<h3><u>DAT & uDAPL Configuration</u></h3>\r
<li>\r
<p class=MsoPlainText><font face="Times New Roman" size="3">The latest round of MS patches to Window Server 2003 (R2) \r
SP2 contain the WSD hotfix which addresses observed WSD problems in pre SP2 \r
- Windows Server 2003. Most users will not need to apply this hotfix.<br>\r
- <br>\r
- The Windows \r
- OpenFabrics release includes a WSD provider library that has been \r
- extensively tested with Microsoft Windows Server 2003 (pre SP2).<br>\r
- During testing, bugs where found in the WSD switch that could lead to hangs, \r
- crashes, data corruption, and other unwanted behavior. Microsoft released a \r
- hotfix to address these issues which should be installed if using WSD.<br>\r
- The Microsoft Windows Server 2003 hotfix for WSD can be located\r
- <a class="wiki" href="http://support.microsoft.com/?kbid=910481">here</a>.<br>\r
- </font><br> <font face="Times New Roman" size="3"><br> </font></p></li>\r
+ Windows Server 2003. Most users will not need to apply this hotfix.</font><br> <font face="Times New Roman" size="3"><br> </font></p></li>\r
</ul>\r
<p class=MsoPlainText><br>\r
</p>\r
exit /B\r
)\r
\r
+REM ************\r
+rem include WDK built ConnectX files\r
+echo Staging ConnectX files\r
+if EXIST %CD%\bin\ConnectX (\r
+ del /F/S/Q %CD%\bin\ConnectX > %TEMP%\jnk.txt\r
+ del %TEMP%\jnk.txt\r
+ rmdir /S/Q %CD%\bin\ConnectX\r
+)\r
+call StageConnectX\r
+echo Done - Staging ConnectX files\r
+rem ************\r
+\r
+\r
if EXIST ia64\WOF_ia64.msi del /Q /F ia64\WOF_ia64.msi\r
if EXIST x64\WOF_x64.msi del /Q /F x64\WOF_x64.msi\r
if EXIST x86\WOF_x86.msi del /Q /F x86\WOF_x86.msi\r
@echo off\r
setlocal\r
rem\r
-rem Construct & populate an OFA-WinOF distribution tree to be used at\r
-rem the OFA-WinOF download site.\r
-rem http://www.openfabrics.org/downloads/WinOF/\r
+rem populate arch specific distribution folders, zip'em, populate symbols \r
+rem folder and zip the entire package for transmission to OFA download website.\r
+rem calls .\zip-OFA-dist.bat script.\r
+\r
+rem Assumes .\WinOF_Release-ID_arch (3 total) folders exist. These arch specific\r
+rem folders are populated by hand!\r
+\r
+rem Assume current arch specific installers are in %systemroot%\temp\*.msi\r
+rem resultant from trunk\buildrelease.bat execution.\r
rem\r
-rem ASSUMES %CD% gen1\branches\WinOF\Wix\r
+rem ASSUMES %CD% == gen1\branches\WinOF\Wix\r
rem\r
-rem mkDist release_ID {target_path}\r
+rem build-OFA-dist release_ID {target_path}\r
rem\r
-rem example mkDist 1.1 C:\tmp\r
+rem example build-OFA-dist 1.1 C:\tmp\r
rem # if target_path is null then default %SystemRoot%\temp\v%1\r
rem # otherwise %2\v%1\r
\r
if "%1" == "" (\r
- echo "Missing release ID, example %0 1.1"\r
+ echo "Missing release ID, example %0 1-1"\r
echo "usage: %0 release_ID {target_path, default: %SystemRoot%\temp}\r
exit /B 1\r
)\r
\r
set ID=%1\r
-if not "%2" == "" (\r
- set DST=%2\v%ID%\r
-) else (\r
- set DST=%SystemRoot%\temp\v%ID%\r
-)\r
+rem set DSTx86=%CD%\WinOF_%ID%_x86\r
+set DSTx86=WinOF_%ID%_x86\r
+set DSTx64=WinOF_%ID%_x64\r
+set DSTia64=WinOF_%ID%_ia64\r
\r
rem where gen1\trunk\buildRelease.bat stored .msi installer files.\r
set MSI=%SystemRoot%\temp\r
\r
+set WZ="C:\Program Files (x86)\WinZip\WZZIP.EXE"\r
+set ZIP=%MSI%\WinOF_dist_v%ID%.zip\r
+\r
rem MUST execute from gen1\branches\WinOF\WIX\r
set RBIN=%CD%\bin\r
\r
exit /B 1\r
)\r
\r
-set PGM="C:\Program Files\Debugging Tools for Windows 64-bit"\symstore.exe\r
-set SS=%DST%\SymStor\r
-\r
-if NOT EXIST %PGM% (\r
- echo Missing installation of MS Debug tools @\r
- echo %PGM%\r
- exit /B 1\r
-)\r
-\r
-rem Assumption is the arch specific installer zip packages have been previously\r
-rem constructed.\r
-\r
-set WIXLAND=%CD%\r
\r
-if not EXIST WinOF_%ID%_x64.zip (\r
- echo missing WinOF zip package: WinOF_%ID%_x64.zip \r
+echo Building target %DSTx86%\r
+rmdir /S /Q %DSTx86% \r
+mkdir %DSTx86%\r
+if NOT EXIST %DSTx86% (\r
+ echo Unable to create %DSTx86% ?\r
exit /B 1\r
)\r
-if not EXIST WinOF_%ID%_x86.zip (\r
- echo missing WinOF arch package: WinOF_%ID%_x86.zip \r
- exit /B 1\r
-)\r
-if not EXIST WinOF_%ID%_ia64.zip (\r
- echo missing WinOF arch package: WinOF_%ID%_ia64.zip \r
+copy README_release.txt %DSTX86%\README.txt\r
+if ERRORLEVEL 1 (\r
+ echo Err - missing file README_release.txt ?\r
exit /B 1\r
)\r
+copy /B openfabrics.gif %DSTX86%\openfabrics.gif\r
+copy release_notes.htm %DSTX86%\release_notes.htm\r
\r
-echo "Creating WinOF downloadable distribution in"\r
-echo " %DST%"\r
-echo " from binaries in"\r
-echo " %RBIN%"\r
\r
-if EXIST "%DST%" (\r
- echo rmdir %DST%\r
- rmdir /S /Q %DST%\r
-)\r
-if EXIST "%DST%" (\r
- echo Failed to remove %DST%\r
+echo Building target %DSTx64%\r
+rmdir /S /Q %DSTx64%\r
+mkdir %DSTx64%\r
+if NOT EXIST %DSTx64% (\r
+ echo Unable to create %DSTx64% ?\r
exit /B 1\r
)\r
-mkdir %DST%\r
-if ERRORLEVEL 1 (\r
- echo "mkdir %DST% error %ERRORLEVEL% ?"\r
+copy README_release.txt %DSTX64%\README.txt\r
+copy /B openfabrics.gif %DSTX64%\openfabrics.gif\r
+copy release_notes.htm %DSTX64%\release_notes.htm\r
+\r
+\r
+echo Building target %DSTia64%\r
+rmdir /S /Q %DSTia64%\r
+mkdir %DSTia64%\r
+if NOT EXIST %DSTia64% (\r
+ echo Unable to create %DSTia64% ?\r
exit /B 1\r
)\r
+copy README_release.txt %DSTia64%\README.txt\r
+copy /B openfabrics.gif %DSTia64%\openfabrics.gif\r
+copy release_notes.htm %DSTia64%\release_notes.htm\r
\r
-mkdir %SS%\r
-mkdir %DST%\Installers\r
\r
-echo Generating Symbol store\r
+copy /B /Y %MSI%\WOF_x86.msi %DSTx86%\WinOF_%ID%_x86.msi\r
+copy /B /Y %MSI%\WOF_x64.msi %DSTx64%\WinOF_%ID%_x64.msi\r
+copy /B /Y %MSI%\WOF_ia64.msi %DSTia64%\WinOF_%ID%_ia64.msi\r
\r
-%PGM% add /r /f %RBIN% /s %SS% /t "WinOF" /v "version %ID%"\r
\r
-echo Generating arch releases\r
+echo Generate compressed arch folders\r
\r
-copy WinOF_%ID%_x64.zip %DST%\Installers\r
-copy WinOF_%ID%_x86.zip %DST%\Installers\r
-copy WinOF_%ID%_ia64.zip %DST%\Installers\r
+if EXIST %DSTx86%.zip del /F /Q %DSTx86%.zip\r
+if EXIST %DSTx64%.zip del /F /Q %DSTx64%.zip\r
+if EXIST %DSTia64%.zip del /F /Q %DSTia64%.zip\r
\r
-echo "Results in %DST%"\r
+if NOT EXIST %WZ% (\r
+ echo Missing WinZip pro [cmd-line interface]\r
+ echo Please manually create the following archives:\r
+ echo %DSTx86%.zip\r
+ echo %DSTx64%.zip\r
+ echo %DSTia64%.zip\r
+ echo . \r
+) else (\r
+ %WZ% -P -r %DSTx86%.zip %DSTx86%\r
+ %WZ% -P -r %DSTx64%.zip %DSTx64%\r
+ %WZ% -P -r %DSTia64%.zip %DSTia64%\r
+\r
+ if NOT EXIST zip-OFA-dist.bat (\r
+ echo .\zip-OFA-dist.bat script missing?\r
+ exit /B 1\r
+ )\r
+ echo Generating %MSI%\v%ID%\r
+ call zip-OFA-dist %ID% \r
+ pushd %MSI%\r
+ echo Generating %ZIP%\r
+ if EXIST %ZIP% (\r
+ rmdir /Q /S %ZIP%\r
+ )\r
+ %WZ% -P -r %ZIP% v%ID%\r
+ popd\r
+ echo WinOF v%ID% distribution @ %ZIP%\r
+)\r
\r
endlocal\r
exit /B 0\r
<?xml version="1.0" encoding="utf-8"?>\r
<!--\r
- WinOF 1.0.1 for IA64 Itanium (IPF) on Win2K3 or XP\r
+ WinOF 1.0.1 for IA64/IPF Itanium on Win2K3 or XP\r
-->\r
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
- <Product Name="Windows Open Fabrics InfiniBand v1.1"\r
+ <Product Name="Windows Open Fabrics InfiniBand v1.1 (RC-2)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
Version="1.1.0"\r
<![CDATA[Intel64]]>\r
</Condition>\r
\r
+ <!--\r
+ System/Machine-wide install, otherwise per-user (Administrator) only.\r
+ All users see OpenFabrics WinOF Release Notes & Manual in Programs.\r
+ -->\r
+ <Property Id="ALLUSERS"> Value="1" </Property>\r
+\r
<!-- Requires files sc.exe & reg.exe -->\r
<Property Id="REG_EXISTS">\r
<DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">\r
\r
\r
<Directory Id="hcaDir" Name="IBcore">\r
- <Component Id="HcaDriver"\r
+ <Component Id="cIBcore"\r
Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
<CreateFolder />\r
<File Id="devman.exe" Compressed="yes" DiskId="1"\r
<File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
LongName="ibiou.sys" Name="IBIOU.SYS"\r
Source="..\bin\HCA\ia64\ibiou.sys" />\r
+ </Component>\r
+\r
+ <Component Id="cMthcaDriver"\r
+ Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">\r
<File Id="mthca32.dll" Compressed="yes" DiskId="1"\r
LongName="mthca32.dll" Name="MTHCA32.DLL"\r
Source="..\bin\HCA\ia64\mthca32.dll" />\r
LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
Source="..\bin\HCA\ia64\mthcaud.dll" />\r
</Component>\r
+\r
+<!-- Remove until ConnectX works on ia64\r
+ <Component Id="cConnectXDriver"\r
+ Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
+ <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.inf" Name="mlx4_bus.INF"\r
+ Source="..\bin\ConnectX\ia64\mlx4_bus.inf" />\r
+ <File Id="mlx4_bus.cdf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.cdf" Name="mlx4_bus.cdf"\r
+ Source="..\bin\ConnectX\ia64\mlx4_bus.cdf" />\r
+ <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
+ Source="..\bin\ConnectX\ia64\mlx4_bus.sys" />\r
+ <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.pdb" Name="mlx4_bus.pdb"\r
+ Source="..\bin\ConnectX\ia64\mlx4_bus.pdb" />\r
+ <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+ LongName="WdfCoInstaller01005.dll" Name="WCO.dll"\r
+ Source="..\bin\ConnectX\ia64\WdfCoInstaller01005.dll" />\r
+ <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
+ Source="..\bin\ConnectX\ia64\mlx4_hca.inf" />\r
+ <File Id="mlx4_hca.cdf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.cdf" Name="mlx4_hca.cdf"\r
+ Source="..\bin\ConnectX\ia64\mlx4_hca.cdf" />\r
+ <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
+ Source="..\bin\ConnectX\ia64\mlx4_hca.sys" />\r
+ <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.pdb" Name="mlx4_hca.pdb"\r
+ Source="..\bin\ConnectX\ia64\mlx4_hca.pdb" />\r
+ <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u.dll" Name="mlx4u.dll"\r
+ Source="..\bin\ConnectX\ia64\mlx4u.dll" />\r
+ <File Id="mlx4u.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u.pdb" Name="mlx4u.pdb"\r
+ Source="..\bin\ConnectX\ia64\mlx4u.pdb" />\r
+ <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
+ Source="..\bin\ConnectX\ia64\mlx4ud.dll" />\r
+\r
+ <!++ copy 32-bit binaries for 32b in ia64 ++> \r
+ <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u32d.dll" Name="mlx4u32.dll"\r
+ Source="..\bin\ConnectX\ia64\mlx4u32d.dll" />\r
+ <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
+ Source="..\bin\ConnectX\ia64\mlx4u32.dll" />\r
+ <File Id="mlx4u32.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u32.pdb" Name="mlx4u32.pdb"\r
+ Source="..\bin\ConnectX\ia64\mlx4u32.pdb" />\r
+ <File Id="mlx4_hca32.cdf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca32.cdf" Name="m4_hca32.cdf"\r
+ Source="..\bin\ConnectX\ia64\mlx4_hca32.cdf" />\r
+ </Component>\r
+End Remove -->\r
+\r
</Directory>\r
\r
<Directory Id="ipoibDir" Name="net">\r
<!--\r
Features - Level=1 == Typical, no WSD on XP\r
-->\r
+\r
+ <Feature Id="HcaDriver" Title="InfiniBand HCA Driver" Level="1"\r
+ Description="InfiniBand Host Channel Adapter Drivers"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+\r
+ <Feature Id="hca_mthca" Title="Mellanox InfiniHost" Level="1"\r
+ Description="InfiniHost series - all except ConnectX"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+ <ComponentRef Id="cMthcaDriver" />\r
+ </Feature>\r
+\r
+<!-- remove until ConnectX works on ia64\r
+ <Feature Id="hca_connectX" Title="Mellanox ConnectX" Level="5"\r
+ Description="ConnectX only - mlx4"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+ <ComponentRef Id="cConnectXDriver" />\r
+ </Feature>\r
+End Remove -->\r
+ </Feature>\r
+\r
<Feature Id="IBcore" Title="InfiniBand Core" Level="1"\r
Description="InfiniBand: Core, Tools, Docs"\r
Display="expand" ConfigurableDirectory="INSTALLDIR"\r
AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+ <ComponentRef Id="cIBcore" />\r
<ComponentRef Id="Docs" />\r
<ComponentRef Id="Tools" />\r
- <ComponentRef Id="HcaDriver" />\r
<ComponentRef Id="OpenSMservice" />\r
</Feature>\r
\r
WinOF 1.0.1 for x64 Win2K3 or XP\r
-->\r
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
- <Product Name="Windows Open Fabrics InfiniBand v1.1"\r
+ <Product Name="Windows Open Fabrics InfiniBand v1.1 (RC-2)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF' \r
Version="1.1.0"\r
<![CDATA[Msix64]]>\r
</Condition>\r
\r
+ <!--\r
+ System/Machine-wide install, otherwise per-user (Administrator) only.\r
+ All users see OpenFabrics WinOF Release Notes & Manual in Programs.\r
+ -->\r
+ <Property Id="ALLUSERS"> Value="1" </Property>\r
+\r
<!-- Requires files sc.exe & reg.exe -->\r
<Property Id="REG_EXISTS">\r
<DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">\r
LongName="Release_notes.htm" Name="RELEASE_.HTM"\r
Source="..\Release_notes.htm" />\r
\r
- <Shortcut Id="RelNotes" Directory="ProgramMenuDir" Name="RelNotes"\r
- LongName="Release Notes"\r
+ <Shortcut Id="RelNotes" Directory="ProgramMenuDir"\r
+ Name="RelNotes" LongName="Release Notes"\r
Target="[INSTALLDIR]\Release_notes.htm" Show="normal"\r
WorkingDirectory="INSTALLDIR" Icon="openfabrics"\r
IconIndex="0" />\r
IconIndex="0" Show="normal" WorkingDirectory="INSTALLDIR" />\r
\r
<Shortcut Id="UninstallProduct" Name="UnMyApp"\r
+ Directory="ProgramMenuDir"\r
LongName="Uninstall WinOF"\r
Target="[System64Folder]msiexec.exe"\r
Arguments="/X [ProductCode]"\r
- Directory="ProgramMenuDir"\r
Description="Uninstalls OpenFabrics InfiniBand" />\r
<RemoveFolder Id="RemoveShorcutFolder" On="uninstall" />\r
</Component>\r
Remove='uninstall' />\r
</Component>\r
\r
- <Directory Id="hcaDir" Name="IBcore">\r
- <Component Id="HcaDriver"\r
+ <Directory Id="IBcoreDir" Name="IBcore">\r
+ <Component Id="cIBcore"\r
Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
<CreateFolder />\r
<File Id="devman.exe" Compressed="yes" DiskId="1"\r
<File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
LongName="ibiou.sys" Name="IBIOU.SYS"\r
Source="..\bin\HCA\amd64\ibiou.sys" />\r
+ </Component>\r
+\r
+ <Component Id="cMthcaDriver"\r
+ Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">\r
<File Id="mthca32.dll" Compressed="yes" DiskId="1"\r
LongName="mthca32.dll" Name="MTHCA32.DLL"\r
Source="..\bin\HCA\amd64\mthca32.dll" />\r
LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
Source="..\bin\HCA\amd64\mthcaud.dll" />\r
</Component>\r
+\r
+ <Component Id="cConnectXDriver"\r
+ Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
+ <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.inf" Name="mlx4_bus.INF"\r
+ Source="..\bin\ConnectX\x64\mlx4_bus.inf" />\r
+ <File Id="mlx4_bus.cdf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.cdf" Name="mlx4_bus.cdf"\r
+ Source="..\bin\ConnectX\x64\mlx4_bus.cdf" />\r
+ <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
+ Source="..\bin\ConnectX\x64\mlx4_bus.sys" />\r
+ <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.pdb" Name="mlx4_bus.pdb"\r
+ Source="..\bin\ConnectX\x64\mlx4_bus.pdb" />\r
+ <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+ LongName="WdfCoInstaller01005.dll" Name="WCO.dll"\r
+ Source="..\bin\ConnectX\x64\WdfCoInstaller01005.dll" />\r
+ <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
+ Source="..\bin\ConnectX\x64\mlx4_hca.inf" />\r
+ <File Id="mlx4_hca.cdf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.cdf" Name="mlx4_hca.cdf"\r
+ Source="..\bin\ConnectX\x64\mlx4_hca.cdf" />\r
+ <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
+ Source="..\bin\ConnectX\x64\mlx4_hca.sys" />\r
+ <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.pdb" Name="mlx4_hca.pdb"\r
+ Source="..\bin\ConnectX\x64\mlx4_hca.pdb" />\r
+ <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u.dll" Name="mlx4u.dll"\r
+ Source="..\bin\ConnectX\x64\mlx4u.dll" />\r
+ <File Id="mlx4u.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u.pdb" Name="mlx4u.pdb"\r
+ Source="..\bin\ConnectX\x64\mlx4u.pdb" />\r
+ <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
+ Source="..\bin\ConnectX\x64\mlx4ud.dll" />\r
+\r
+ <!-- copy 32-bit binaries for 32b in x64 -->\r
+ <File Id="mlx4u32d.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u32d.dll" Name="mlx4u32.dll"\r
+ Source="..\bin\ConnectX\x64\mlx4u32d.dll" />\r
+ <File Id="mlx4u32.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u32.dll" Name="mlx4u32.dll"\r
+ Source="..\bin\ConnectX\x64\mlx4u32.dll" />\r
+ <File Id="mlx4u32.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u32.pdb" Name="mlx4u32.pdb"\r
+ Source="..\bin\ConnectX\x64\mlx4u32.pdb" />\r
+ <File Id="mlx4_hca32.cdf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca32.cdf" Name="m4_hca32.cdf"\r
+ Source="..\bin\ConnectX\x64\mlx4_hca32.cdf" />\r
+ </Component>\r
</Directory>\r
\r
<Directory Id="ipoibDir" Name="net">\r
<!--\r
Features - Level=1 == Typical, no WSD on XP\r
-->\r
+\r
+ <Feature Id="HcaDriver" Title="InfiniBand HCA Driver" Level="1"\r
+ Description="InfiniBand Host Channel Adapter Drivers"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+\r
+ <Feature Id="hca_mthca" Title="Mellanox InfiniHost" Level="1"\r
+ Description="InfiniHost series - all except ConnectX"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+ <ComponentRef Id="cMthcaDriver" />\r
+ </Feature>\r
+\r
+ <Feature Id="hca_connectX" Title="Mellanox ConnectX" Level="5"\r
+ Description="ConnectX only - mlx4"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+ <ComponentRef Id="cConnectXDriver" />\r
+ </Feature>\r
+ </Feature>\r
+\r
<Feature Id="IBcore" Title="InfiniBand Core" Level="1"\r
Description="InfiniBand: Core, Tools, Docs"\r
Display="expand" ConfigurableDirectory="INSTALLDIR"\r
AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+ <ComponentRef Id="cIBcore" />\r
<ComponentRef Id="Docs" />\r
<ComponentRef Id="Tools" />\r
- <ComponentRef Id="HcaDriver" />\r
<ComponentRef Id="OpenSMservice" />\r
</Feature>\r
\r
-->\r
<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">\r
\r
- <Product Name="Windows OpenFabrics InfiniBand v1.1"\r
+ <Product Name="Windows OpenFabrics InfiniBand v1.1 (RC-2)"\r
Id="3A6A276E-A636-48e8-8624-9A0DE3F2A15E"\r
UpgradeCode='E38964D6-359D-4E38-9BBF-8C79D84DF6CF'\r
Version="1.1.0"\r
<Condition Message="Administrator required to install [ProductName].">\r
Privileged\r
</Condition>\r
- <Condition Message="[ProductName] requires that your computer is running Windows XP or Windows 2003 Server"><![CDATA[(Not Version9X=400) And (Not Version9X=410) And\r
+\r
+ <Condition Message="[ProductName] requires that your computer is running Windows XP or Windows 2003 Server">\r
+ <![CDATA[(Not Version9X=400) And (Not Version9X=410) And\r
(Not Version9X=490) And (Not VersionNT=400) And\r
(Not VersionNT=500)]]></Condition>\r
- <Condition Message="This package can be installed on x86 systems only"><![CDATA[(Not Intel64) And (Not Msix64)]]></Condition>\r
- <!-- Requires files sc.exe & reg.exe -->\r
+\r
+ <Condition Message="This package can be installed on x86 systems only">\r
+ <![CDATA[(Not Intel64) And (Not Msix64)]]></Condition>\r
+\r
+ <!--\r
+ System/Machine-wide install, otherwise per-user (Administrator) only.\r
+ All users see OpenFabrics WinOF Release Notes & Manual in Programs.\r
+ -->\r
+ <Property Id="ALLUSERS"> Value="1" </Property>\r
+\r
+ <!-- Requires files sc.exe & reg.exe -->\r
\r
<Property Id="REG_EXISTS">\r
<DirectorySearch Id="RegFileDir" Path="[WindowsFolder]" Depth="1">\r
Remove='uninstall' />\r
</Component>\r
\r
- <Directory Id="HcaDriver" Name="IBcore">\r
- <Component Id="HcaDriver"\r
+ <Directory Id="IBcoreDir" Name="IBcore">\r
+ <Component Id="cIBcore"\r
Guid="4B4EA649-65ED-4B0D-8717-D60481412211">\r
<CreateFolder />\r
<File Id="devman.exe" Compressed="yes" DiskId="1"\r
<File Id="ibiou.sys" Compressed="yes" DiskId="1"\r
LongName="ibiou.sys" Name="IBIOU.SYS"\r
Source="..\bin\HCA\x86\ibiou.sys" />\r
+ </Component>\r
+\r
+ <Component Id="cMthcaDriver"\r
+ Guid="BE4ED061-C852-40a2-A240-F06DBBE1159F">\r
<File Id="mthca.inf" Compressed="yes" DiskId="1"\r
LongName="mthca.inf" Name="MTHCA.INF"\r
Source="..\bin\HCA\x86\mthca.inf" />\r
LongName="mthcaud.dll" Name="MTHCAUD.DLL"\r
Source="..\bin\HCA\x86\mthcaud.dll" />\r
</Component>\r
+\r
+ <Component Id="cConnectXDriver"\r
+ Guid="C1EFF4D6-CE55-432a-9D92-E46AB983D9E3">\r
+ <File Id="mlx4_bus.inf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.inf" Name="mlx4_bus.INF"\r
+ Source="..\bin\ConnectX\x86\mlx4_bus.inf" />\r
+ <File Id="mlx4_bus.cdf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.cdf" Name="mlx4_bus.cdf"\r
+ Source="..\bin\ConnectX\x86\mlx4_bus.cdf" />\r
+ <File Id="mlx4_bus.sys" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.sys" Name="mlx4_bus.sys"\r
+ Source="..\bin\ConnectX\x86\mlx4_bus.sys" />\r
+ <File Id="mlx4_bus.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_bus.pdb" Name="mlx4_bus.pdb"\r
+ Source="..\bin\ConnectX\x86\mlx4_bus.pdb" />\r
+ <File Id="wdfcoinstaller" Compressed="yes" DiskId="1"\r
+ LongName="WdfCoInstaller01005.dll.sys"\r
+ Name="WCO.dll"\r
+ Source="..\bin\ConnectX\x86\WdfCoInstaller01005.dll" />\r
+ <File Id="mlx4_hca.inf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.inf" Name="mlx4_hca.INF"\r
+ Source="..\bin\ConnectX\x86\mlx4_hca.inf" />\r
+ <File Id="mlx4_hca.cdf" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.cdf" Name="mlx4_hca.cdf"\r
+ Source="..\bin\ConnectX\x86\mlx4_hca.cdf" />\r
+ <File Id="mlx4_hca.sys" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.sys" Name="mlx4_hca.sys"\r
+ Source="..\bin\ConnectX\x86\mlx4_hca.sys" />\r
+ <File Id="mlx4_hca.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4_hca.pdb" Name="mlx4_hca.pdb"\r
+ Source="..\bin\ConnectX\x86\mlx4_hca.pdb" />\r
+ <File Id="mlx4u.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u.dll" Name="mlx4u.dll"\r
+ Source="..\bin\ConnectX\x86\mlx4u.dll" />\r
+ <File Id="mlx4u.pdb" Compressed="yes" DiskId="1"\r
+ LongName="mlx4u.pdb" Name="mlx4u.pdb"\r
+ Source="..\bin\ConnectX\x86\mlx4u.pdb" />\r
+ <File Id="mlx4ud.dll" Compressed="yes" DiskId="1"\r
+ LongName="mlx4ud.dll" Name="mlx4ud.dll"\r
+ Source="..\bin\ConnectX\x86\mlx4ud.dll" />\r
+ </Component>\r
</Directory>\r
\r
<Directory Id="ipoibDir" Name="net">\r
<!--\r
Features - Level=1 == Typical, no WSD on XP\r
-->\r
+\r
+ <Feature Id="HcaDrivers" Title="InfiniBand HCA Driver" Level="1"\r
+ Description="InfiniBand Host Channel Adapter Drivers"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='disallow'>\r
+\r
+ <Feature Id="hca_mthca" Title="Mellanox InfiniHost" Level="1"\r
+ Description="InfiniHost series - all except ConnectX"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+ <ComponentRef Id="cMthcaDriver" />\r
+ </Feature>\r
+\r
+ <Feature Id="hca_connectX" Title="Mellanox ConnectX" Level="5"\r
+ Description="ConnectX only - mlx4"\r
+ Display="expand" ConfigurableDirectory="INSTALLDIR"\r
+ AllowAdvertise='no' InstallDefault='local' Absent='allow'>\r
+ <ComponentRef Id="cConnectXDriver" />\r
+ </Feature>\r
+ </Feature>\r
+\r
<Feature Id="IBcore" Title="InfiniBand Core" Level="1"\r
Description="InfiniBand: Core, Tools, Docs" Display="expand"\r
ConfigurableDirectory="INSTALLDIR" AllowAdvertise="no"\r
InstallDefault="local" Absent="disallow">\r
+ <ComponentRef Id="cIBcore" />\r
<ComponentRef Id="Docs" />\r
<ComponentRef Id="Tools" />\r
- <ComponentRef Id="HcaDriver" />\r
<ComponentRef Id="OpenSMservice" />\r
</Feature>\r
\r
projects / ~shefty / rdma-win.git / commitdiff