Revision: 19224
http://sourceforge.net/p/edk2/code/19224
Author: vanjeff
Date: 2015-12-11 07:36:06 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
MdeModulePkg ScsiBusDxe: Fix caller event may nerver be signaled
For function ScsiExecuteSCSICommand(), when the 'Event' parameter is not
NULL but the target SCSI device does not support non-blocking I/O, it will
execute a blocking I/O operation instead.
However, after the SCSI operation is done, the 'Event' is not signaled to
inform the caller.
(Sync patch r19217 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <[email protected]>
Reviewed-by: Feng Tian <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/19217
Modified Paths:
--------------
branches/UDK2015/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
Modified: branches/UDK2015/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
===================================================================
--- branches/UDK2015/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c 2015-12-11
07:35:31 UTC (rev 19223)
+++ branches/UDK2015/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c 2015-12-11
07:36:06 UTC (rev 19224)
@@ -2,7 +2,7 @@
SCSI Bus driver that layers on every SCSI Pass Thru and
Extended SCSI Pass Thru protocol in the system.
-Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
which accompanies this distribution. The full text of the license may be
found at
@@ -986,13 +986,34 @@
if (ScsiIoDevice->ExtScsiSupport) {
ExtRequestPacket = (EFI_EXT_SCSI_PASS_THRU_SCSI_REQUEST_PACKET *) Packet;
- Status = ScsiIoDevice->ExtScsiPassThru->PassThru (
- ScsiIoDevice->ExtScsiPassThru,
- Target,
- ScsiIoDevice->Lun,
- ExtRequestPacket,
- Event
- );
+
+ if (((ScsiIoDevice->ExtScsiPassThru->Mode->Attributes &
EFI_SCSI_PASS_THRU_ATTRIBUTES_NONBLOCKIO) != 0) && (Event != NULL)) {
+ Status = ScsiIoDevice->ExtScsiPassThru->PassThru (
+ ScsiIoDevice->ExtScsiPassThru,
+ Target,
+ ScsiIoDevice->Lun,
+ ExtRequestPacket,
+ Event
+ );
+ } else {
+ //
+ // If there's no event or the SCSI Device doesn't support NON-BLOCKING,
+ // let the 'Event' parameter for PassThru() be NULL.
+ //
+ Status = ScsiIoDevice->ExtScsiPassThru->PassThru (
+ ScsiIoDevice->ExtScsiPassThru,
+ Target,
+ ScsiIoDevice->Lun,
+ ExtRequestPacket,
+ NULL
+ );
+ if (Event != NULL) {
+ //
+ // Signal Event to tell caller to pick up the SCSI IO Packet.
+ //
+ gBS->SignalEvent (Event);
+ }
+ }
} else {
mWorkingBuffer = AllocatePool
(sizeof(EFI_SCSI_PASS_THRU_SCSI_REQUEST_PACKET));
@@ -1052,7 +1073,7 @@
ScsiIoDevice->Pun.ScsiId.Scsi,
ScsiIoDevice->Lun,
mWorkingBuffer,
- Event
+ NULL
);
if (EFI_ERROR(Status)) {
FreePool(mWorkingBuffer);
@@ -1065,6 +1086,13 @@
// free mWorkingBuffer.
//
FreePool(mWorkingBuffer);
+
+ //
+ // Signal Event to tell caller to pick up the SCSI IO Packet.
+ //
+ if (Event != NULL) {
+ gBS->SignalEvent (Event);
+ }
}
}
return Status;
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
