https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4c6cc29bb86d534462daf8f9a2406654e7b2fd69
commit 4c6cc29bb86d534462daf8f9a2406654e7b2fd69 Author: Thomas Faber <[email protected]> AuthorDate: Sat Sep 7 10:38:42 2019 +0200 Commit: Thomas Faber <[email protected]> CommitDate: Thu Sep 26 10:27:31 2019 +0200 [HDAUDBUS] Fix timeouts for hardware register operations. CORE-15874 Most needed to be multiplied by 10 to match Haiku's behavior. In one case, the broken timeout was offset by a higher number of loop iterations, which is now restored. This should fix failures on real hardware that result in the "unable to exit reset" print, and avoid a possible subsequent Pnp manager crash. Compare with the following (both snooze and KeStallExecutionProcessor use microseconds): https://github.com/haiku/haiku/blob/ff38df48cfb21b95fb2dce0443762e0e470db57c/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp#L466 https://github.com/haiku/haiku/blob/ff38df48cfb21b95fb2dce0443762e0e470db57c/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp#L357 https://github.com/haiku/haiku/blob/ff38df48cfb21b95fb2dce0443762e0e470db57c/src/add-ons/kernel/drivers/audio/hda/hda_controller.cpp#L978 --- drivers/wdm/audio/hdaudbus/fdo.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/wdm/audio/hdaudbus/fdo.cpp b/drivers/wdm/audio/hdaudbus/fdo.cpp index 8a08371fd2c..a600c64c7d8 100644 --- a/drivers/wdm/audio/hdaudbus/fdo.cpp +++ b/drivers/wdm/audio/hdaudbus/fdo.cpp @@ -391,8 +391,8 @@ HDA_InitCorbRirbPos( corbReadPointer |= CORB_READ_POS_RESET; WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS), corbReadPointer); - for (Index = 0; Index < 100; Index++) { - KeStallExecutionProcessor(10); + for (Index = 0; Index < 10; Index++) { + KeStallExecutionProcessor(100); corbReadPointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); if ((corbReadPointer & CORB_READ_POS_RESET) != 0) break; @@ -411,7 +411,7 @@ HDA_InitCorbRirbPos( corbReadPointer &= ~CORB_READ_POS_RESET; WRITE_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS), corbReadPointer); for (Index = 0; Index < 10; Index++) { - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); corbReadPointer = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_CORB_READ_POS)); if ((corbReadPointer & CORB_READ_POS_RESET) == 0) break; @@ -493,7 +493,7 @@ HDA_ResetController( WRITE_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL, Control); for (int timeout = 0; timeout < 10; timeout++) { - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); corbControl = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_CORB_CONTROL); rirbControl = READ_REGISTER_UCHAR(DeviceExtension->RegBase + HDAC_RIRB_CONTROL); @@ -514,7 +514,7 @@ HDA_ResetController( WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL), Control & ~GLOBAL_CONTROL_RESET); for (int timeout = 0; timeout < 10; timeout++) { - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); if ((Control & GLOBAL_CONTROL_RESET) == 0) @@ -531,7 +531,7 @@ HDA_ResetController( WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL), Control | GLOBAL_CONTROL_RESET); for (int timeout = 0; timeout < 10; timeout++) { - KeStallExecutionProcessor(10); + KeStallExecutionProcessor(100); Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); if ((Control & GLOBAL_CONTROL_RESET) != 0) @@ -544,7 +544,7 @@ HDA_ResetController( // Wait for codecs to finish their own reset (apparently needs more // time than documented in the specs) - KeStallExecutionProcessor(100); + KeStallExecutionProcessor(1000); // Enable unsolicited responses Control = READ_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_GLOBAL_CONTROL)); @@ -646,7 +646,7 @@ HDA_FDOStartDevice( // Enable controller interrupts WRITE_REGISTER_ULONG((PULONG)(DeviceExtension->RegBase + HDAC_INTR_CONTROL), INTR_CONTROL_GLOBAL_ENABLE | INTR_CONTROL_CONTROLLER_ENABLE); - KeStallExecutionProcessor(100); + KeStallExecutionProcessor(1000); Value = READ_REGISTER_USHORT((PUSHORT)(DeviceExtension->RegBase + HDAC_STATE_STATUS)); if (!Value) {
