From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g9t5008.houston.hpe.com (g9t5008.houston.hpe.com [15.241.48.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8942682106 for ; Sun, 12 Feb 2017 22:24:16 -0800 (PST) Received: from HEGDENAG9.asiapacific.hpqcorp.net (hegdenag9.asiapacific.hpqcorp.net [16.154.153.125]) by g9t5008.houston.hpe.com (Postfix) with ESMTP id C03915B; Mon, 13 Feb 2017 06:24:13 +0000 (UTC) From: hegdenag To: edk2-devel@lists.01.org Cc: jiaxin.wu@intel.com, jaben.carsey@intel.com, ruiyu.ni@intel.com, lubo.zhang@intel.com, sriram-s@hpe.com Date: Mon, 13 Feb 2017 11:54:06 +0530 Message-Id: <20170213062407.12336-2-nagaraj-p.hegde@hpe.com> X-Mailer: git-send-email 2.8.3.windows.1 In-Reply-To: <20170213062407.12336-1-nagaraj-p.hegde@hpe.com> References: <20170213062407.12336-1-nagaraj-p.hegde@hpe.com> Subject: [PATCH v1 1/2] NetworkPkg/iSCSIDxe: Update the condition for IScsiStart Abort X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Feb 2017 06:24:16 -0000 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 --- NetworkPkg/IScsiDxe/IScsiDriver.c | 8 +++++++- NetworkPkg/IScsiDxe/IScsiDriver.h | 19 +++++++++++-------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.c b/NetworkPkg/IScsiDxe/IScsiDriver.c index 78c93ba..5ea24b6 100644 --- a/NetworkPkg/IScsiDxe/IScsiDriver.c +++ b/NetworkPkg/IScsiDxe/IScsiDriver.c @@ -2,6 +2,8 @@ The entry point of IScsi driver. Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.
+(C) Copyright 2017 Hewlett Packard Enterprise Development LP
+ 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 @@ -419,7 +421,11 @@ IScsiStart ( } 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. // diff --git a/NetworkPkg/IScsiDxe/IScsiDriver.h b/NetworkPkg/IScsiDxe/IScsiDriver.h index 9e59b38..e3c15fa 100644 --- a/NetworkPkg/IScsiDxe/IScsiDriver.h +++ b/NetworkPkg/IScsiDxe/IScsiDriver.h @@ -2,6 +2,8 @@ The header file of IScsiDriver.c. Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.
+(C) Copyright 2017 Hewlett Packard Enterprise Development LP
+ 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 @@ -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_IP6 4 -#define ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_AIP 0x00 -#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_IP6 0x04 -#define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_OFFLOAD 0x08 -#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_IP6 0x40 +#define ALWAYS_USE_UEFI_ISCSI_AND_IGNORE_ISCSI_HBA 0x00 +#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_IP6 0x04 +#define STOP_UEFI_ISCSI_IF_AIP_SUPPORT_OFFLOAD 0x08 +#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_IP6 0x40 +#define ALWAYS_USE_ISCSI_HBA_AND_IGNORE_UEFI_ISCSI 0xFF extern EFI_COMPONENT_NAME2_PROTOCOL gIScsiComponentName2; extern EFI_COMPONENT_NAME_PROTOCOL gIScsiComponentName; -- 2.8.3.windows.1