tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NetworkPkg/iSCSIDxe: Update the condition for IScsiStart Abort 

Update existing #define and add a new #define used for the
PCD PcdIScsiAIPNetworkBootPolicy. Update the code in iScsiStart
according to the #define changes in iScsiDriver.h

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hegde Nagaraj P <nagaraj-p.hegde@hpe.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Sriram Subramanian <sriram-s@hpe.com>
Reviewed-by: Zhang Lubo <lubo.zhang@intel.com>
Reviewed-by: Ye Ting <ting.ye@intel.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
This commit is contained in:
hegdenag 2017-02-13 15:20:17 +08:00 committed by Jiaxin Wu
parent b8b769ab81
commit 483ee51520
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NetworkPkg/IScsiDxe/IScsiDriver.c
View File

@ -2,6 +2,8 @@
The entry point of IScsi driver. The entry point of IScsi driver.
Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2017 Hewlett Packard Enterprise Development LP<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
@ -419,7 +421,11 @@ IScsiStart (
} }
NetworkBootPolicy = PcdGet8 (PcdIScsiAIPNetworkBootPolicy); NetworkBootPolicy = PcdGet8 (PcdIScsiAIPNetworkBootPolicy);
if (NetworkBootPolicy != ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_AIP) { if (NetworkBootPolicy == ALWAYS_USE_ISCSI_HBA_AND_IGNORE_UEFI_ISCSI) {
return EFI_ABORTED;
}
if (NetworkBootPolicy != ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_ISCSI_HBA) {
// //
// Check existing iSCSI AIP. // Check existing iSCSI AIP.
// //

19
NetworkPkg/IScsiDxe/IScsiDriver.h
View File

@ -2,6 +2,8 @@
The header file of IScsiDriver.c. The header file of IScsiDriver.c.
Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR> Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2017 Hewlett Packard Enterprise Development LP<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
@ -29,14 +31,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#define IP_MODE_AUTOCONFIG_IP4 3 #define IP_MODE_AUTOCONFIG_IP4 3
#define IP_MODE_AUTOCONFIG_IP6 4 #define IP_MODE_AUTOCONFIG_IP6 4
#define ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_AIP 0x00 #define ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_ISCSI_HBA 0x00
#define STOP_UEFI_ISCSI_IF_HBA_INSTALL_AIP 0x01 #define STOP_UEFI_ISCSI_IF_HBA_INSTALL_AIP 0x01
#define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP4 0x02 #define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP4 0x02
#define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP6 0x04 #define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_IP6 0x04
#define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_OFFLOAD 0x08 #define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_OFFLOAD 0x08
#define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_MPIO 0x10 #define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_MPIO 0x10
#define STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP4 0x20 #define STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP4 0x20
#define STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP6 0x40 #define STOP_UEFI_ISCSI_IF_AIP_CONFIGURED_IP6 0x40
#define ALWAYS_USE_ISCSI_HBA_AND_IGNORE_UEFI_ISCSI 0xFF
extern EFI_COMPONENT_NAME2_PROTOCOL gIScsiComponentName2; extern EFI_COMPONENT_NAME2_PROTOCOL gIScsiComponentName2;
extern EFI_COMPONENT_NAME_PROTOCOL gIScsiComponentName; extern EFI_COMPONENT_NAME_PROTOCOL gIScsiComponentName;