tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-25 14:44:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Re-execute the failed SCSI command if iSCSI driver could reinstates the session successfully.

Browse Source 
Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Dong, Guo <guo.dong@intel.com>
Reviewed-by: Tian, Feng <feng.tian@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15152 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Fu Siyuan 2014-01-22 01:57:06 +00:00 committed by sfu5
parent b36f701d4f
commit cb162780fe
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
NetworkPkg/IScsiDxe/IScsiExtScsiPassThru.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The implementation of EFI_EXT_SCSI_PASS_THRU_PROTOCOL. The implementation of EFI_EXT_SCSI_PASS_THRU_PROTOCOL.
Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -86,6 +86,9 @@ IScsiExtScsiPassThruFunction (
IN EFI_EVENT Event OPTIONAL IN EFI_EVENT Event OPTIONAL
) )
{ {
EFI_STATUS Status;
ISCSI_DRIVER_DATA *Private;
if (Target[0] != 0) { if (Target[0] != 0) {
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
@ -94,7 +97,20 @@ IScsiExtScsiPassThruFunction (
return EFI_INVALID_PARAMETER; return EFI_INVALID_PARAMETER;
} }
return IScsiExecuteScsiCommand (This, Target, Lun, Packet); Status = IScsiExecuteScsiCommand (This, Target, Lun, Packet);
if ((Status != EFI_SUCCESS) && (Status != EFI_NOT_READY)) {
//
// Try to reinstate the session and re-execute the Scsi command.
//
Private = ISCSI_DRIVER_DATA_FROM_EXT_SCSI_PASS_THRU (This);
if (EFI_ERROR (IScsiSessionReinstatement (Private->Session))) {
return EFI_DEVICE_ERROR;
}
Status = IScsiExecuteScsiCommand (This, Target, Lun, Packet);
}
return Status;
} }

12
NetworkPkg/IScsiDxe/IScsiProto.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The implementation of iSCSI protocol based on RFC3720. The implementation of iSCSI protocol based on RFC3720.
Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -2820,6 +2820,7 @@ IScsiOnNopInRcvd (
@retval EFI_DEVICE_ERROR Session state was not as required. @retval EFI_DEVICE_ERROR Session state was not as required.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory. @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval EFI_PROTOCOL_ERROR There is no such data in the net buffer. @retval EFI_PROTOCOL_ERROR There is no such data in the net buffer.
@retval EFI_NOT_READY The target can not accept new commands.
@retval Others Other errors as indicated. @retval Others Other errors as indicated.
**/ **/
@ -2998,15 +2999,6 @@ ON_EXIT:
IScsiDelTcb (Tcb); IScsiDelTcb (Tcb);
} }
if ((Status != EFI_SUCCESS) && (Status != EFI_NOT_READY)) {
//
// Reinstate the session.
//
if (EFI_ERROR (IScsiSessionReinstatement (Session))) {
Status = EFI_DEVICE_ERROR;
}
}
return Status; return Status;
} }

3
NetworkPkg/IScsiDxe/IScsiProto.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
The header file of iSCSI Protocol that defines many specific data structures. The header file of iSCSI Protocol that defines many specific data structures.
Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 which accompanies this distribution. The full text of the license may be found at
@ -982,6 +982,7 @@ IScsiNormalizeName (
the Packet. the Packet.
@retval EFI_DEVICE_ERROR Session state was not as required. @retval EFI_DEVICE_ERROR Session state was not as required.
@retval EFI_OUT_OF_RESOURCES Failed to allocate memory. @retval EFI_OUT_OF_RESOURCES Failed to allocate memory.
@retval EFI_NOT_READY The target can not accept new commands.
@retval Others Other errors as indicated. @retval Others Other errors as indicated.
**/ **/