i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XHCI: revert part of c409803d6f

Browse Source 
The TRB_3_DIR bit on the Status Stage was previously correctly set as per the spec:
Table 4-6: Status Stage TRB and Device-to-host and wLength > 0 means DIR OUT.

Also free descriptors when _LinkDescriptorForPipe fails.
This commit is contained in:
Jérôme Duval
2019-02-23 20:33:12 +01:00
parent e12480694e
commit 342c997667
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/usb/xhci.cpp
+10 -6
View File
@@ -673,16 +673,18 @@ XHCI::SubmitControlRequest(Transfer *transfer)
descriptor->trbs[index].dwtrb2 = TRB_2_IRQ(0); descriptor->trbs[index].dwtrb2 = TRB_2_IRQ(0);
descriptor->trbs[index].dwtrb3 = B_HOST_TO_LENDIAN_INT32( descriptor->trbs[index].dwtrb3 = B_HOST_TO_LENDIAN_INT32(
TRB_3_TYPE(TRB_TYPE_STATUS_STAGE) TRB_3_TYPE(TRB_TYPE_STATUS_STAGE)
| TRB_3_DIR_IN | TRB_3_IOC_BIT | TRB_3_CYCLE_BIT); | ((directionIn && requestData->Length > 0) ? 0 : TRB_3_DIR_IN)
// Note that TRB_3_DIR on a TRB_TYPE_STATUS_STAGE does not refer to the | TRB_3_IOC_BIT | TRB_3_CYCLE_BIT);
// Data Stage, but rather to which way the status notification should // Status Stage is an OUT transfer when the device sent data
// go, i.e. device to host, or host to device. (XHCI 1.1 § 4.11.2.2 p205.) // (see XHCI 1.1 § 4.11.2.2 Table 4-6)
descriptor->trb_count = index + 1; descriptor->trb_count = index + 1;
status = _LinkDescriptorForPipe(descriptor, endpoint); status = _LinkDescriptorForPipe(descriptor, endpoint);
if (status != B_OK) if (status != B_OK) {
FreeDescriptor(descriptor);
return status; return status;
}
TRACE("SubmitControlRequest() request linked\n"); TRACE("SubmitControlRequest() request linked\n");
TRACE("Endpoint status 0x%08" B_PRIx32 " 0x%08" B_PRIx32 " 0x%016" B_PRIx64 "\n", TRACE("Endpoint status 0x%08" B_PRIx32 " 0x%08" B_PRIx32 " 0x%016" B_PRIx64 "\n",
@@ -765,8 +767,10 @@ XHCI::SubmitNormalRequest(Transfer *transfer)
xhci_endpoint *endpoint = (xhci_endpoint *)pipe->ControllerCookie(); xhci_endpoint *endpoint = (xhci_endpoint *)pipe->ControllerCookie();
descriptor->transfer = transfer; descriptor->transfer = transfer;
status = _LinkDescriptorForPipe(descriptor, endpoint); status = _LinkDescriptorForPipe(descriptor, endpoint);
if (status != B_OK) if (status != B_OK) {
return status; return status;
FreeDescriptor(descriptor);
}
TRACE("SubmitNormalRequest() request linked\n"); TRACE("SubmitNormalRequest() request linked\n");
TRACE("Endpoint status 0x%08" B_PRIx32 " 0x%08" B_PRIx32 " 0x%016" B_PRIx64 "\n", TRACE("Endpoint status 0x%08" B_PRIx32 " 0x%08" B_PRIx32 " 0x%016" B_PRIx64 "\n",