Revision: 16991
          http://sourceforge.net/p/edk2/code/16991
Author:   vanjeff
Date:     2015-03-03 05:27:00 +0000 (Tue, 03 Mar 2015)
Log Message:
-----------
Add DebugCommunicationLibUsb3 for USB3.0 source level debug support.

(Sync patches r16224 and r16762 from main trunk.)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Elvin Li <[email protected]>
Reviewed-by: Ruiyu Ni <[email protected]>
Reviewed-by: Feng Tian <[email protected]>
Reviewed-by: Jeff Fan <[email protected]>

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/16224
    http://sourceforge.net/p/edk2/code/16762

Modified Paths:
--------------
    branches/UDK2014.SP1/SourceLevelDebugPkg/SourceLevelDebugPkg.dec
    branches/UDK2014.SP1/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc

Modified: branches/UDK2014.SP1/SourceLevelDebugPkg/SourceLevelDebugPkg.dec
===================================================================
--- branches/UDK2014.SP1/SourceLevelDebugPkg/SourceLevelDebugPkg.dec    
2015-03-03 05:07:18 UTC (rev 16990)
+++ branches/UDK2014.SP1/SourceLevelDebugPkg/SourceLevelDebugPkg.dec    
2015-03-03 05:27:00 UTC (rev 16991)
@@ -90,5 +90,27 @@
   # @Prompt Assign debug port buffer size.
   
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugPortHandleBufferSize|0x0|UINT16|0x00000006
 
+  ## The memory BAR of xhci host controller, in which usb debug feature is 
enabled.
+  ## Note that the memory BAR address is only used before Pci bus resource 
allocation.
+  # @Prompt Configure ehci host controller memory BAR.
+  
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbXhciMemorySpaceBase|0xD0000000|UINT64|0x00000007
+  
+  ## The pci address of xhci host controller, in which usb debug feature is 
enabled.
+  #  The format of pci address is :<BR>
+  #      
-----------------------------------------------------------------------<BR>
+  #      | Bits 28..31 | Bits 20..27 | Bits 15..19 | Bits 12..14 | Bits 00..11 
|<BR>
+  #      
-----------------------------------------------------------------------<BR>
+  #      |      0      |     Bus     |   Device    |   Function  |      0      
|<BR>
+  #      
-----------------------------------------------------------------------<BR>
+  #  For the value 0x000A0000, it means the pci address at bus 0x0, device 
0x14, function 0x0.
+  # @Prompt Configure xhci host controller pci address.
+  # @Expression  0x80000001 | 
(gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbXhciPciAddress & 0xF0000FFF) == 0
+  
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbXhciPciAddress|0x000A0000|UINT32|0x00000008
+  
+  ## Per XHCI spec, software shall impose a timeout between the detection of 
the Debug Host 
+  ## connection and the DbC Run transition to 1. This PCD specifies the 
timeout value in microsecond.
+  # @Prompt Configure debug device detection timeout value.
+  
gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdUsbXhciDebugDetectTimeout|3000000|UINT64|0x00000009
+
 [UserExtensions.TianoCore."ExtraFiles"]
   SourceLevelDebugPkgExtra.uni

Modified: branches/UDK2014.SP1/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
===================================================================
--- branches/UDK2014.SP1/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc    
2015-03-03 05:07:18 UTC (rev 16990)
+++ branches/UDK2014.SP1/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc    
2015-03-03 05:27:00 UTC (rev 16991)
@@ -50,8 +50,10 @@
 !ifdef $(SOURCE_DEBUG_USE_USB)
   
DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb/DebugCommunicationLibUsb.inf
 !else
+!ifndef $(SOURCE_DEBUG_USE_USB3)
   
DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibSerialPort/DebugCommunicationLibSerialPort.inf
 !endif
+!endif
 
 [LibraryClasses.common.PEIM]
   PeimEntryPoint|MdePkg/Library/PeimEntryPoint/PeimEntryPoint.inf
@@ -60,6 +62,9 @@
   HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf
   
MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemoryAllocationLib.inf
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAgentLib.inf
+!ifdef $(SOURCE_DEBUG_USE_USB3)
+  
DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Pei.inf
+!endif
 
 [LibraryClasses.common.DXE_DRIVER]
   
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
@@ -70,6 +75,9 @@
   HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf
   
MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/DxeDebugAgentLib.inf
+!ifdef $(SOURCE_DEBUG_USE_USB3)
+  
DebugCommunicationLib|SourceLevelDebugPkg/Library/DebugCommunicationLibUsb3/DebugCommunicationLibUsb3Dxe.inf
+!endif
 
 
###################################################################################################
 #


------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the 
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to