Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USBSTOR] Do not create a new Irp for USB requests - use the original one

Browse source 
from higher-level driver instead.
Refactored CSWCompletionRoutine for correct handling different CSW
statuses, more work to be done here.
This commit is contained in:
Victor Perevertkin 2019-03-28 02:45:32 +03:00
parent b4c03399ba
commit ed6724cd7e
2 changed files with 75 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

117
drivers/usb/usbstor/scsi.c
View file

@ -57,6 +57,7 @@ USBSTOR_AllocateIrpContext()
return Context;
}
static
BOOLEAN
USBSTOR_IsCSWValid(
PIRP_CONTEXT Context)
@ -73,12 +74,6 @@ USBSTOR_IsCSWValid(
return FALSE;
}
if (Context->csw->Status != 0x00)
{
DPRINT1("[USBSTOR] Expected Status 0x00 but got %x\n", Context->csw->Status);
return FALSE;
}
return TRUE;
}
@ -128,32 +123,22 @@ USBSTOR_CSWCompletionRoutine(
PIRP_CONTEXT Context;
PIO_STACK_LOCATION IoStack;
PSCSI_REQUEST_BLOCK Request;
PCDB pCDB;
PUFI_CAPACITY_RESPONSE Response;
NTSTATUS Status;
Context = (PIRP_CONTEXT)Ctx;
if (Context->TransferBufferMDL)
{
// is there an irp associated
if (Context->Irp)
{
// did we allocate the mdl
if (Context->TransferBufferMDL != Context->Irp->MdlAddress)
if (Context->TransferBufferMDL && Context->TransferBufferMDL != Context->Irp->MdlAddress)
{
IoFreeMdl(Context->TransferBufferMDL);
}
}
else
DPRINT("USBSTOR_CSWCompletionRoutine Irp %p Ctx %p Status %x\n", Irp, Ctx, Irp->IoStatus.Status);
// first check for Irp errors
if (!NT_SUCCESS(Irp->IoStatus.Status))
{
IoFreeMdl(Context->TransferBufferMDL);
}
}
DPRINT("USBSTOR_CSWCompletionRoutine Status %x\n", Irp->IoStatus.Status);
if (!NT_SUCCESS(Irp->IoStatus.Information))
if (USBD_STATUS(Context->Urb.UrbHeader.Status) == USBD_STATUS(USBD_STATUS_STALL_PID))
{
if (Context->ErrorIndex == 0)
{
@ -162,40 +147,43 @@ USBSTOR_CSWCompletionRoutine(
// clear stall and resend cbw
Status = USBSTOR_QueueWorkItem(Context, Irp);
ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED);
return STATUS_MORE_PROCESSING_REQUIRED;
}
}
else
{
DPRINT1("USBSTOR_CSWCompletionRoutine: Urb.Hdr.Status - %x\n", Context->Urb.UrbHeader.Status);
}
// perform reset recovery
Context->ErrorIndex = 2;
IoFreeIrp(Irp);
Status = USBSTOR_QueueWorkItem(Context, NULL);
ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED);
return STATUS_MORE_PROCESSING_REQUIRED;
}
if (!USBSTOR_IsCSWValid(Context))
// now check the CSW packet validity
if (!USBSTOR_IsCSWValid(Context) || Context->csw->Status == CSW_STATUS_PHASE_ERROR)
{
// perform reset recovery
Context->ErrorIndex = 2;
IoFreeIrp(Irp);
Status = USBSTOR_QueueWorkItem(Context, NULL);
ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED);
return STATUS_MORE_PROCESSING_REQUIRED;
}
IoStack = IoGetCurrentIrpStackLocation(Context->Irp);
Request = (PSCSI_REQUEST_BLOCK)IoStack->Parameters.Others.Argument1;
IoStack = IoGetCurrentIrpStackLocation(Irp);
Request = IoStack->Parameters.Scsi.Srb;
ASSERT(Request);
Status = Irp->IoStatus.Status;
pCDB = (PCDB)Request->Cdb;
Request->SrbStatus = SRB_STATUS_SUCCESS;
// finally check for CSW errors
if (Context->csw->Status == CSW_STATUS_COMMAND_PASSED)
{
// read capacity needs special work
if (pCDB->AsByte[0] == SCSIOP_READ_CAPACITY)
if (Request->Cdb[0] == SCSIOP_READ_CAPACITY)
{
// get output buffer
Response = (PUFI_CAPACITY_RESPONSE)Context->TransferData;
@ -205,22 +193,29 @@ USBSTOR_CSWCompletionRoutine(
Context->PDODeviceExtension->LastLogicBlockAddress = NTOHL(Response->LastLogicalBlockAddress);
}
Status = STATUS_SUCCESS;
Request->SrbStatus = SRB_STATUS_SUCCESS;
Irp->IoStatus.Status = STATUS_SUCCESS;
Irp->IoStatus.Information = Request->DataTransferLength;
}
else if (Context->csw->Status == CSW_STATUS_COMMAND_FAILED)
{
DPRINT("USBSTOR_CSWCompletionRoutine: CSW_STATUS_COMMAND_FAILED\n");
// perform reset recovery
Context->ErrorIndex = 2;
Status = USBSTOR_QueueWorkItem(Context, NULL);
ASSERT(Status == STATUS_MORE_PROCESSING_REQUIRED);
return STATUS_MORE_PROCESSING_REQUIRED;
}
FreeItem(Context->cbw);
// FIXME: check status
Context->Irp->IoStatus.Status = Irp->IoStatus.Status;
Context->Irp->IoStatus.Information = Context->TransferDataLength;
// terminate current request
USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Context->Irp);
IoCompleteRequest(Context->Irp, IO_NO_INCREMENT);
USBSTOR_QueueTerminateRequest(Context->PDODeviceExtension->LowerDeviceObject, Irp);
USBSTOR_QueueNextRequest(Context->PDODeviceExtension->LowerDeviceObject);
IoFreeIrp(Irp);
FreeItem(Context);
return STATUS_MORE_PROCESSING_REQUIRED;
return Status;
}
VOID
@ -406,7 +401,6 @@ USBSTOR_SendRequest(
PIRP_CONTEXT Context;
PPDO_DEVICE_EXTENSION PDODeviceExtension;
PFDO_DEVICE_EXTENSION FDODeviceExtension;
PIRP Irp;
PUCHAR MdlVirtualAddress;
Context = USBSTOR_AllocateIrpContext();
@ -450,8 +444,6 @@ USBSTOR_SendRequest(
if (Context->TransferDataLength)
{
// check if the original request already does have an mdl associated
if (OriginalRequest)
{
if ((OriginalRequest->MdlAddress != NULL) &&
(Context->TransferData == NULL || Command[0] == SCSIOP_READ || Command[0] == SCSIOP_WRITE))
{
@ -496,37 +488,8 @@ USBSTOR_SendRequest(
MmBuildMdlForNonPagedPool(Context->TransferBufferMDL);
}
}
else
{
// allocate mdl for buffer, buffer must be allocated from NonPagedPool
Context->TransferBufferMDL = IoAllocateMdl(Context->TransferData, Context->TransferDataLength, FALSE, FALSE, NULL);
if (!Context->TransferBufferMDL)
{
FreeItem(Context->cbw);
FreeItem(Context);
return STATUS_INSUFFICIENT_RESOURCES;
}
MmBuildMdlForNonPagedPool(Context->TransferBufferMDL);
}
}
Irp = IoAllocateIrp(DeviceObject->StackSize, FALSE);
if (!Irp)
{
FreeItem(Context->cbw);
FreeItem(Context);
return STATUS_INSUFFICIENT_RESOURCES;
}
if (OriginalRequest)
{
IoMarkIrpPending(OriginalRequest);
}
USBSTOR_SendCBW(Context, Irp);
return STATUS_PENDING;
return USBSTOR_SendCBW(Context, OriginalRequest);
}
NTSTATUS

4
drivers/usb/usbstor/usbstor.h
View file

@ -105,6 +105,10 @@ C_ASSERT(sizeof(CBW) == 31);
#define MAX_LUN 0xF
#define CSW_STATUS_COMMAND_PASSED 0x00
#define CSW_STATUS_COMMAND_FAILED 0x01
#define CSW_STATUS_PHASE_ERROR 0x02
typedef struct
{
ULONG Signature; // CSW signature