Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XHCI: Do not try to use hardware with unknown interface versions.

Browse Source 
Should fix the crash in #15717.
This commit is contained in:
Augustin Cavalier 2020-02-17 17:18:11 -05:00
parent 5d08e3a5b9
commit b1970a8427
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/kernel/busses/usb/xhci.cpp
View File

@ -266,8 +266,14 @@ XHCI::XHCI(pci_info *info, Stack *stack)
TRACE("runtime register offset: %" B_PRId32 "\n", fRuntimeRegisterOffset);
TRACE("doorbell register offset: %" B_PRId32 "\n", fDoorbellRegisterOffset);
TRACE_ALWAYS("interface version: 0x%04" B_PRIx32 "\n",
HCI_VERSION(ReadCapReg32(XHCI_HCI_VERSION)));
int32 interfaceVersion = HCI_VERSION(ReadCapReg32(XHCI_HCI_VERSION));
if (interfaceVersion < 0x0090 || interfaceVersion > 0x0120) {
TRACE_ERROR("unsupported interface version: 0x%04" B_PRIx32 "\n",
interfaceVersion);
return;
}
TRACE_ALWAYS("interface version: 0x%04" B_PRIx32 "\n", interfaceVersion);
TRACE_ALWAYS("structural parameters: 1:0x%08" B_PRIx32 " 2:0x%08"
B_PRIx32 " 3:0x%08" B_PRIx32 "\n", ReadCapReg32(XHCI_HCSPARAMS1),
ReadCapReg32(XHCI_HCSPARAMS2), ReadCapReg32(XHCI_HCSPARAMS3));