Backport usbehci driver from build 26040

build/RockchipDrivers.sln

@@ -29,7 +29,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csaudio-Utilities", "..\dri
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dwc_eqos", "..\drivers\net\dwc_eqos\dwc_eqos.vcxproj", "{CAD465B6-97D7-402D-85F8-50DE140A6D9D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usbehci_noncoherent", "..\drivers\usb\usbehci_noncoherent\usbehci_noncoherent.vcxproj", "{BB0C35DD-3009-4CA5-86C8-B255D378A84B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "usbehci_nointerlocked", "..\drivers\usb\usbehci_nointerlocked\usbehci_nointerlocked.vcxproj", "{BB0C35DD-3009-4CA5-86C8-B255D378A84B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

drivers/usb/usbehci_nointerlocked/usbehci_nointerlocked.inf

@@ -0,0 +1,120 @@
+; Override INF that enables the "NoInterlockedOpOnCommonBuffers" option for
+; usbehci. This option was introduced in Windows 11 2024.
+
+[Version]
+Signature   = "$Windows NT$"
+Class       = USB
+ClassGuid   = {36fc9e60-c465-11cf-8056-444553540000}
+Provider    = %Provider%
+DriverVer   = ; provided by stampinf
+CatalogFile = usbehci_nointerlocked.cat
+PnpLockdown = 1
+
+[ControlFlags]
+ExcludeFromSelect = *
+
+[SourceDisksNames]
+1 = Disk
+
+[SourceDisksFiles]
+usbehci_nointerlocked.sys = 1
+
+[DestinationDirs]
+DefaultDestDir = 12
+
+[Manufacturer]
+%Provider% = Generic.Section, NTarm64.10.0...19041, NTarm64.10.0...26038
+
+[Generic.Section.NTarm64.10.0...19041]
+%EhciPci.DeviceDesc%  = EHCI.Dev.Backport,     PCI\CC_0C0320
+%EhciSoc.DeviceDesc%  = EHCI_SOC.Dev.Backport, *PNP0D20
+%EhciSoc.DeviceDesc%  = EHCI_SOC.Dev.Backport, *PNP0FFC
+%EhciSoc.DeviceDesc%  = EHCI_SOC.Dev.Backport, ACPI\PNP0D20
+%RKCP0D20.DeviceDesc% = EHCI_SOC.Dev.Backport, ACPI\RKCP0D20
+
+[Generic.Section.NTarm64.10.0...26038]
+%EhciPci.DeviceDesc%  = EHCI.Dev,     PCI\CC_0C0320
+%EhciSoc.DeviceDesc%  = EHCI_SOC.Dev, *PNP0D20
+%EhciSoc.DeviceDesc%  = EHCI_SOC.Dev, *PNP0FFC
+%EhciSoc.DeviceDesc%  = EHCI_SOC.Dev, ACPI\PNP0D20
+%RKCP0D20.DeviceDesc% = EHCI_SOC.Dev, ACPI\RKCP0D20
+
+[EHCI.Dev.Backport.NT]
+FeatureScore = 1
+Include      = usbport.inf
+Needs        = EHCI.Dev.NT
+CopyFiles    = EHCI.Backport.Copy
+
+[EHCI.Dev.Backport.NT.Services]
+AddService = usbehci, 0x00000002, EHCI.Backport.AddService, EHCI.Backport.AddEventLog
+
+[EHCI.Dev.Backport.NT.HW]
+AddReg  = NoInterlockedOp_AddReg
+
+[EHCI_SOC.Dev.Backport.NT]
+FeatureScore = 1
+Include      = usbport.inf
+Needs        = EHCI_SOC.Dev.NT
+CopyFiles    = EHCI.Backport.Copy
+
+[EHCI_SOC.Dev.Backport.NT.Services]
+AddService = usbehci, 0x00000002, EHCI.Backport.AddService, EHCI.Backport.AddEventLog
+
+[EHCI_SOC.Dev.Backport.NT.HW]
+AddReg = NoInterlockedOp_AddReg
+
+[EHCI.Backport.AddService]
+DisplayName    = %EHCIMP.SvcDesc%
+ServiceType    = 1                  ; SERVICE_KERNEL_DRIVER
+StartType      = 3                  ; SERVICE_DEMAND_START
+ErrorControl   = 1                  ; SERVICE_ERROR_NORMAL
+ServiceBinary  = %12%\usbehci_nointerlocked.sys
+LoadOrderGroup = Base
+AddReg         = EHCI.Backport.AddService.AddReg
+
+[EHCI.Backport.AddEventLog]
+AddReg = EHCI.Backport.AddEventLog.AddReg
+
+[EHCI.Backport.AddEventLog.AddReg]
+HKR,, EventMessageFile, 0x00020000, "%%SystemRoot%%\System32\IoLogMsg.dll;%%SystemRoot%%\System32\Drivers\usbehci_nointerlocked.sys"
+HKR,, TypesSupported, 0x00010001, 7
+
+[EHCI.Backport.AddService.AddReg]
+HKR,, BootFlags, 0x00010003, 0x4 ; CM_SERVICE_USB_DISK_BOOT_LOAD
+
+[EHCI.Backport.Copy]
+usbehci_nointerlocked.sys
+
+[EHCI.Dev.NT]
+FeatureScore = 1
+Include      = usbport.inf
+Needs        = EHCI.Dev.NT
+
+[EHCI.Dev.NT.Services]
+Include = usbport.inf
+Needs   = EHCI.Dev.NT.Services
+
+[EHCI.Dev.NT.HW]
+AddReg  = NoInterlockedOp_AddReg
+
+[EHCI_SOC.Dev.NT]
+FeatureScore = 1
+Include      = usbport.inf
+Needs        = EHCI_SOC.Dev.NT
+
+[EHCI_SOC.Dev.NT.Services]
+Include = usbport.inf
+Needs   = EHCI.Dev.NT.Services
+
+[EHCI_SOC.Dev.NT.HW]
+AddReg = NoInterlockedOp_AddReg
+
+[NoInterlockedOp_AddReg]
+HKR,, NoInterlockedOpOnCommonBuffers, 0x10001, 0x00000001
+
+[Strings]
+Provider            = "Open Source"
+EHCIMP.SvcDesc      = "Microsoft USB 2.0 Enhanced Host Controller Miniport Driver (NoInterlocked)"
+EhciPci.DeviceDesc  = "Standard Enhanced PCI to USB Host Controller (NoInterlocked)"
+EhciSoc.DeviceDesc  = "Standard EHCI-compliant Host Controller (NoInterlocked)"
+RKCP0D20.DeviceDesc = "Rockchip USB 2.0 Enhanced Host Controller"

drivers/usb/usbehci_noncoherent/usbehci_noncoherent.vcxproj → drivers/usb/usbehci_nointerlocked/usbehci_nointerlocked.vcxproj

@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="usbehci_noncoherent.inf" />
+    <Inf Include="usbehci_nointerlocked.inf" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{BB0C35DD-3009-4CA5-86C8-B255D378A84B}</ProjectGuid>
@@ -20,7 +20,7 @@
     <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <Configuration>Debug</Configuration>
     <Platform Condition="'$(Platform)' == ''">Win32</Platform>
-    <RootNamespace>usbehci_noncoherent</RootNamespace>
+    <RootNamespace>usbehci_nointerlocked</RootNamespace>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
@@ -77,7 +77,12 @@
     <VerifyDrivers />
     <VerifyFlags>133563</VerifyFlags>
   </PropertyGroup>
+  <ItemDefinitionGroup>
+    <PostBuildEvent>
+      <Command>xcopy "usbehci_nointerlocked.sys" "$(OutDir)\$(TargetName)\" /i /y /d</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>

drivers/usb/usbehci_noncoherent/usbehci_noncoherent.vcxproj.filters → drivers/usb/usbehci_nointerlocked/usbehci_nointerlocked.vcxproj.filters

@@ -19,7 +19,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <Inf Include="usbehci_noncoherent.inf">
+    <Inf Include="usbehci_nointerlocked.inf">
       <Filter>Driver Files</Filter>
     </Inf>
   </ItemGroup>