sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg: refine codes of iSCSI driver.

Browse Source 
Add error handling logic in DriverBingingStop function,
it may return error status when invoking the
UninstallProtocolInterface.

Cc: Fu Siyuan <siyuan.fu@intel.com>
Cc: Ye Ting <ting.ye@intel.com>
Cc: Wu Jiaxin <jiaxin.wu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Jiaxin Wu <jiaxin.wu@intel.com>
This commit is contained in:
Zhang Lubo 2016-04-22 15:18:40 +08:00 committed by Jiaxin Wu
parent 74a8877033
commit e3761c71d9
3 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MdeModulePkg/Universal/Network/IScsiDxe/IScsiDriver.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
The entry point of IScsi driver. The entry point of IScsi driver.
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, 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
@ -339,6 +339,10 @@ ON_ERROR:
@retval EFI_SUCCESS The device was stopped. @retval EFI_SUCCESS The device was stopped.
@retval EFI_DEVICE_ERROR The device could not be stopped due to a device error. @retval EFI_DEVICE_ERROR The device could not be stopped due to a device error.
@retval EFI_INVALID_PARAMETER Child handle is NULL.
@retval EFI_ACCESS_DENIED The protocol could not be removed from the Handle
because its interfaces are being used.
**/ **/
EFI_STATUS EFI_STATUS
EFIAPI EFIAPI
@ -451,7 +455,10 @@ IScsiDriverBindingStop (
IScsiPublishIbft (); IScsiPublishIbft ();
IScsiSessionAbort (&Private->Session); IScsiSessionAbort (&Private->Session);
IScsiCleanDriverData (Private); Status = IScsiCleanDriverData (Private);
if (EFI_ERROR (Status)) {
return Status;
}
return EFI_SUCCESS; return EFI_SUCCESS;
} }

38
MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
Miscellaneous routines for iSCSI driver. Miscellaneous routines for iSCSI driver.
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, 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
@ -587,34 +587,46 @@ IScsiCreateDriverData (
/** /**
Clean the iSCSI driver data. Clean the iSCSI driver data.
@param[in] Private The iSCSI driver data. @param[in] Private The iSCSI driver data.
@retval EFI_SUCCES The clean operation is successful.
@retval Others Other errors as indicated.
**/ **/
VOID EFI_STATUS
IScsiCleanDriverData ( IScsiCleanDriverData (
IN ISCSI_DRIVER_DATA *Private IN ISCSI_DRIVER_DATA *Private
) )
{ {
EFI_STATUS Status;
if (Private->DevicePath != NULL) { if (Private->DevicePath != NULL) {
gBS->UninstallProtocolInterface ( Status = gBS->UninstallProtocolInterface (
Private->ExtScsiPassThruHandle, Private->ExtScsiPassThruHandle,
&gEfiDevicePathProtocolGuid, &gEfiDevicePathProtocolGuid,
Private->DevicePath Private->DevicePath
); );
if (EFI_ERROR (Status)) {
goto EXIT;
}
FreePool (Private->DevicePath); FreePool (Private->DevicePath);
} }
if (Private->ExtScsiPassThruHandle != NULL) { if (Private->ExtScsiPassThruHandle != NULL) {
gBS->UninstallProtocolInterface ( Status = gBS->UninstallProtocolInterface (
Private->ExtScsiPassThruHandle, Private->ExtScsiPassThruHandle,
&gEfiExtScsiPassThruProtocolGuid, &gEfiExtScsiPassThruProtocolGuid,
&Private->IScsiExtScsiPassThru &Private->IScsiExtScsiPassThru
); );
} }
EXIT:
gBS->CloseEvent (Private->ExitBootServiceEvent); gBS->CloseEvent (Private->ExitBootServiceEvent);
FreePool (Private); FreePool (Private);
return Status;
} }
/** /**

9
MdeModulePkg/Universal/Network/IScsiDxe/IScsiMisc.h
View File

@ -1,7 +1,7 @@
/** @file /** @file
Miscellaneous definitions for iSCSI driver. Miscellaneous definitions for iSCSI driver.
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2016, 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
@ -219,9 +219,12 @@ IScsiCreateDriverData (
/** /**
Clean the iSCSI driver data. Clean the iSCSI driver data.
@param[in] Private The iSCSI driver data. @param[in] Private The iSCSI driver data.
@retval EFI_SUCCES The clean operation is successful.
@retval Others Other errors as indicated.
**/ **/
VOID EFI_STATUS
IScsiCleanDriverData ( IScsiCleanDriverData (
IN ISCSI_DRIVER_DATA *Private IN ISCSI_DRIVER_DATA *Private
); );