Skip to content

Commit 8da42a7

Browse files
PFroesePFroese
authored
Merge pull request #176 from microsoft/users/pfroese/ihvGfxGuids.01
Add new profile for USB4 + IHV Graphics Providers
2 parents 3fba6db + 9238276 commit 8da42a7

File tree

2 files changed

+82
-4
lines changed

2 files changed

+82
-4
lines changed

‎usb/tracing/BusesAllProfile.wprp‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@
4141
<BufferSize Value="64" />
4242
<Buffers Value="1.4" PercentageOfTotalMemory="true" MaximumBufferSpace="32" />
4343
</EventCollector>
44+
<EventCollector Id="EventCollector_Display_Extended" Name="ExtendedDisplayTrace">
45+
<BufferSize Value="64" />
46+
<Buffers Value="3" PercentageOfTotalMemory="true" MaximumBufferSpace="120" />
47+
</EventCollector>
4448
<EventCollector Id="EventCollector_NdisNetCx" Name="NdisNetCxTrace">
4549
<BufferSize Value="64" />
4650
<Buffers Value="1.4" PercentageOfTotalMemory="true" MaximumBufferSpace="32" />
@@ -518,6 +522,21 @@
518522
</EventProvider>
519523
<EventProvider Id="DisplayWin32K" Name="deb96c0a-d2d9-5868-a5d5-50ee13513c8b" NonPagedMemory="true" Level="5" />
520524
<EventProvider Id="DisplayDxgDiagnostics" Name="221D444C-D07E-4FDE-B425-15B746CF535B" NonPagedMemory="true" Level="5" />
525+
<EventProvider Id="DisplayIHV1" Name="6F556899-027A-45EC-A3F5-C58E7FB94FF5" NonPagedMemory="true" Level="5">
526+
<Keywords>
527+
<Keyword Value="0xFFFFFFFFFFFFFFFF" />
528+
</Keywords>
529+
</EventProvider>
530+
<EventProvider Id="DisplayIHV2" Name="6381f857-7661-4b04-9521-288319e75f12" NonPagedMemory="true" Level="5">
531+
<Keywords>
532+
<Keyword Value="0xFFFFFFFFFFFFFFFF" />
533+
</Keywords>
534+
</EventProvider>
535+
<EventProvider Id="DisplayIHV3" Name="31AB337F-8BA3-4145-88F3-CEA537BFE861" NonPagedMemory="true" Level="5">
536+
<Keywords>
537+
<Keyword Value="0xFFFFFFFFFFFFFFFF" />
538+
</Keywords>
539+
</EventProvider>
521540
<EventProvider Id="NetAdapterCxWpp" Name="16D3161E-4883-493F-ACD9-8E2065B82270" NonPagedMemory="true" Level="5">
522541
<Keywords>
523542
<Keyword Value="0xFFFFFFFFFFFFFFFF" />
@@ -931,6 +950,63 @@
931950
Description="USB3, USB4, PnP, Display, Net and PCI"
932951
Base="Usb4WithTunnelsProfile.Verbose.Memory"/>
933952

953+
<Profile Id="Usb4WithExtendedDisplayProfile.Verbose.Memory" Name="Usb4WithExtendedDisplayProfile" DetailLevel="Verbose" LoggingMode="Memory"
954+
Description="USB3, USB4, PnP, Display, and PCI">
955+
<Collectors>
956+
<EventCollectorId Value="EventCollector_Usb">
957+
<EventProviders>
958+
<EventProviderId Value="UsbXhciCommonEtw" />
959+
<EventProviderId Value="UsbXhciCompanionWpp" />
960+
<EventProviderId Value="UsbXhciDriverWpp" />
961+
<EventProviderId Value="UsbXhciTrustletWpp" />
962+
<EventProviderId Value="UcxEtw" />
963+
<EventProviderId Value="UcxWpp" />
964+
<EventProviderId Value="UsbHub3Etw" />
965+
<EventProviderId Value="UsbHub3Wpp" />
966+
<EventProviderId Value="QcXhciFilterWpp" />
967+
<EventProviderId Value="QcUsbFnSSFilterWpp" />
968+
<EventProviderId Value="QcUsbCUcsi8280Wpp" />
969+
<EventProviderId Value="NVPEP" />
970+
</EventProviders>
971+
</EventCollectorId>
972+
<EventCollectorId Value="EventCollector_Usb4">
973+
<EventProviders>
974+
<EventProviderId Value="USB4HrdWpp" />
975+
<EventProviderId Value="USB4DrdWpp" />
976+
<EventProviderId Value="USB4HrdTlg" />
977+
<EventProviderId Value="USB4DrdTlg" />
978+
<EventProviderId Value="Usb4NetWpp" />
979+
<EventProviderId Value="QcUsb4FilterWpp" />
980+
<EventProviderId Value="QcUsb4BusWpp" />
981+
</EventProviders>
982+
</EventCollectorId>
983+
<EventCollectorId Value="EventCollector_PnP">
984+
<EventProviders>
985+
<EventProviderId Value="Microsoft-Windows-Kernel-PnP" />
986+
</EventProviders>
987+
</EventCollectorId>
988+
<EventCollectorId Value="EventCollector_Pci">
989+
<EventProviders>
990+
<EventProviderId Value="PciWpp" />
991+
<EventProviderId Value="QcPpxWpp" />
992+
</EventProviders>
993+
</EventCollectorId>
994+
<EventCollectorId Value="EventCollector_Display_Extended">
995+
<EventProviders>
996+
<EventProviderId Value="DisplayDxgDiagnostics" />
997+
<EventProviderId Value="DisplayWin32K" />
998+
<EventProviderId Value="QcDxkmWpp" />
999+
<EventProviderId Value="DisplayIHV1" />
1000+
<EventProviderId Value="DisplayIHV2" />
1001+
<EventProviderId Value="DisplayIHV3" />
1002+
</EventProviders>
1003+
</EventCollectorId>
1004+
</Collectors>
1005+
</Profile>
1006+
<Profile Id="Usb4WithExtendedDisplayProfile.Verbose.File" Name="Usb4WithExtendedDisplayProfile" DetailLevel="Verbose" LoggingMode="File"
1007+
Description="USB3, USB4, PnP, Display, and PCI"
1008+
Base="Usb4WithExtendedDisplayProfile.Verbose.Memory"/>
1009+
9341010
<Profile Id="USBCProfile.Verbose.Memory" Name="USBCProfile" DetailLevel="Verbose" LoggingMode="Memory"
9351011
Description="USB-C, URS and USBFN">
9361012
<Collectors>

‎usb/tracing/BusesTrace.cmd‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,17 @@ echo 2) UsbAndPnPProfile (USB2, USB3, USB4 and PnP)
115115
echo 3) UsbCProfile (UCM, URS and USBFN)
116116
echo 4) LowPowerBusesProfile (SerCx2 and SpbCx)
117117
echo 5) InputOnlyWithVerboseWppProfile (Input)
118-
echo 6) Back
118+
echo 6) Usb4WithExtendedDisplayProfile (USB3, USB4, PnP, PCI, Display, and Display IHV providers)
119+
echo 7) Back
119120
echo.
120121
set /p selection=Enter selection number:
121122
if "%selection%"=="1" set profileName=UsbOnlyProfile
122123
if "%selection%"=="2" set profileName=UsbAndPnpProfile
123124
if "%selection%"=="3" set profileName=UsbCProfile
124-
if "%selection%"=="4" set profileName=LowPowerBUsesProfile
125+
if "%selection%"=="4" set profileName=LowPowerBusesProfile
125126
if "%selection%"=="5" set profileName=InputOnlyWithVerboseWppProfile
126-
if "%selection%"=="6" goto BasicProfilesMenu
127+
if "%selection%"=="6" set profileName=Usb4WithExtendedDisplayProfile
128+
if "%selection%"=="7" goto BasicProfilesMenu
127129
if not "%profileName%"=="" goto StartOptionsMenu
128130
echo.
129131
echo "%selection%" is not a valid option. Please try again.
@@ -276,6 +278,7 @@ rem Collecting DispDiag and if availiable the DES mini dump
276278
if "%profileName%"=="SensorsOnlyProfile" goto CollectDispDiag
277279
if "%profileName%"=="Usb4WithTunnelsProfile" goto CollectDispDiag
278280
if "%profileName%"=="BusesAllProfile" goto CollectDispDiag
281+
if "%profileName%"=="Usb4WithExtendedDisplayProfile" goto CollectDispDiag
279282
goto SkipCollectDispDiag
280283
:CollectDispDiag
281284
echo.
@@ -358,4 +361,3 @@ goto End
358361
endlocal
359362
echo.
360363
pause
361-

0 commit comments

Comments
 (0)