ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-02 04:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SCSIPORT] Fix Sense request sending

Browse Source 
- Pass all SRB flags which Windows scsiport passes
- Correctly reset the queue after completion

This fixes the bug when MS cdrom driver hangs after media ejection
This commit is contained in:
Victor Perevertkin
2020-12-05 22:28:54 +03:00
parent a97c6e0aa9
commit fb155b4ea4
1 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/storage/port/scsiport/scsi.c
+30 -1
View File
@@ -445,6 +445,9 @@ SpiSenseCompletionRoutine(
_In_ PIRP Irp,
_In_opt_ PVOID Context)
{
PIO_STACK_LOCATION ioStack = IoGetNextIrpStackLocation(Irp);
PSCSI_PORT_LUN_EXTENSION lunExt = ioStack->DeviceObject->DeviceExtension;
PSCSI_PORT_DEVICE_EXTENSION portExt = lunExt->Common.LowerDevice->DeviceExtension;
PSCSI_REQUEST_BLOCK Srb = (PSCSI_REQUEST_BLOCK)Context;
PSCSI_REQUEST_BLOCK InitialSrb;
PIRP InitialIrp;
@@ -478,6 +481,26 @@ SpiSenseCompletionRoutine(
/* Make sure initial SRB's queue is frozen */
ASSERT(InitialSrb->SrbStatus & SRB_STATUS_QUEUE_FROZEN);
// The queue is frozen, but the SRB had a SRB_FLAGS_NO_QUEUE_FREEZE => unfreeze the queue
if ((InitialSrb->SrbFlags & SRB_FLAGS_NO_QUEUE_FREEZE) &&
(InitialSrb->SrbStatus & SRB_STATUS_QUEUE_FROZEN))
{
KIRQL irql;
KeAcquireSpinLock(&portExt->SpinLock, &irql);
ASSERT(lunExt->Flags & LUNEX_FROZEN_QUEUE);
lunExt->Flags &= ~LUNEX_FROZEN_QUEUE;
lunExt->Flags &= ~LUNEX_NEED_REQUEST_SENSE;
// SpiGetNextRequestFromLun releases the lock
SpiGetNextRequestFromLun(portExt, lunExt);
KeLowerIrql(irql);
InitialSrb->SrbStatus &= ~SRB_STATUS_QUEUE_FROZEN;
}
/* Complete this request */
IoCompleteRequest(InitialIrp, IO_DISK_INCREMENT);
@@ -580,10 +603,16 @@ SpiSendRequestSense(
Srb->SrbFlags = SRB_FLAGS_DATA_IN | SRB_FLAGS_BYPASS_FROZEN_QUEUE |
SRB_FLAGS_DISABLE_DISCONNECT;
/* Transfer disable synch transfer flag */
// pass some InitialSrb flags
if (InitialSrb->SrbFlags & SRB_FLAGS_DISABLE_SYNCH_TRANSFER)
Srb->SrbFlags |= SRB_FLAGS_DISABLE_SYNCH_TRANSFER;
if (InitialSrb->SrbFlags & SRB_FLAGS_BYPASS_LOCKED_QUEUE)
Srb->SrbFlags |= SRB_FLAGS_BYPASS_LOCKED_QUEUE;
if (InitialSrb->SrbFlags & SRB_FLAGS_NO_QUEUE_FREEZE)
Srb->SrbFlags |= SRB_FLAGS_NO_QUEUE_FREEZE;
Srb->DataBuffer = InitialSrb->SenseInfoBuffer;
/* Fill the transfer length */