hrev52949 adds 1 changeset to branch 'master'
old head: 2e1e3f0d75c2b2304ca06a90156acb9a19020bd8
new head: 695f50f6cc551a29335f69753fb897ce4ca43908
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=695f50f6cc55+%5E2e1e3f0d75c2
----------------------------------------------------------------------------
695f50f6cc55: XHCI: Adjust timeouts in WaitOpBits.
Operations that succeed should not take longer; ones that fail will.
Should get rid of ControllerReset() failed CMD_HCRST.
Change-Id: I4981a319bd64a076f2f404214a96d9909f0676de
Reviewed-on: https://review.haiku-os.org/c/1135
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Greg Crain <gcrain70@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52949
Commit: 695f50f6cc551a29335f69753fb897ce4ca43908
URL: https://git.haiku-os.org/haiku/commit/?id=695f50f6cc55
Author: Greg Crain <gcrain70@xxxxxxxxx>
Date: Sat Mar 2 13:14:54 2019 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sun Mar 3 17:41:49 2019 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
src/add-ons/kernel/busses/usb/xhci.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/busses/usb/xhci.cpp
b/src/add-ons/kernel/busses/usb/xhci.cpp
index ce9f4f4fff..395e6a1a40 100644
--- a/src/add-ons/kernel/busses/usb/xhci.cpp
+++ b/src/add-ons/kernel/busses/usb/xhci.cpp
@@ -2531,10 +2531,10 @@ XHCI::WaitOpBits(uint32 reg, uint32 mask, uint32
expected)
while ((value & mask) != expected) {
snooze(1000);
value = ReadOpReg(reg);
- if (loops == 25) {
+ if (loops == 100) {
TRACE("delay waiting on reg 0x%" B_PRIX32 " match 0x%"
B_PRIX32
" (0x%" B_PRIX32 ")\n", reg, expected, mask);
- } else if (loops > 100) {
+ } else if (loops > 250) {
TRACE_ERROR("timeout waiting on reg 0x%" B_PRIX32
" match 0x%" B_PRIX32 " (0x%" B_PRIX32 ")\n",
reg, expected,
mask);
