From patchwork Mon Dec 2 07:48:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xiaolong Ye X-Patchwork-Id: 63430 X-Patchwork-Delegate: xiaolong.ye@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 8ACD2A04B5; Mon, 2 Dec 2019 08:58:12 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0970B1B13C; Mon, 2 Dec 2019 08:57:59 +0100 (CET) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 7BEF51F5 for ; Mon, 2 Dec 2019 08:57:55 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Dec 2019 23:57:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,268,1571727600"; d="scan'208";a="207993300" Received: from dpdk_yexl_af_xdp.sh.intel.com ([10.67.119.186]) by fmsmga008.fm.intel.com with ESMTP; 01 Dec 2019 23:57:54 -0800 From: Xiaolong Ye To: Beilei Xing , Qi Zhang Cc: dev@dpdk.org, Xiaolong Ye , Doug Dziggel Date: Mon, 2 Dec 2019 15:48:28 +0800 Message-Id: <20191202074935.97629-3-xiaolong.ye@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191202074935.97629-1-xiaolong.ye@intel.com> References: <20191202074935.97629-1-xiaolong.ye@intel.com> Subject: [dpdk-dev] [PATCH 02/69] net/i40e/base: add ESXi support to transition to flat NVM X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" ESXi is required to transition back to a flat NVM from structured. Adding ifdef support for ESXi. Signed-off-by: Doug Dziggel Reviewed-by: Stillwell Jr Paul M Reviewed-by: Williams Mitch A Reviewed-by: Kirsher Jeffrey T Signed-off-by: Xiaolong Ye --- drivers/net/i40e/base/i40e_common.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/i40e/base/i40e_common.c b/drivers/net/i40e/base/i40e_common.c index 68348858d..ed9ad011d 100644 --- a/drivers/net/i40e/base/i40e_common.c +++ b/drivers/net/i40e/base/i40e_common.c @@ -1017,10 +1017,10 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw) #ifdef I40E_NVMUPD_SUPPORT #ifndef EXTERNAL_RELEASE - /* At the moment there are only two OSes where this feature - * is required - FreeBSD and Linux. FreeBSD driver does + /* At the moment there are only three OSes where this feature + * is required - ESX, FreeBSD and Linux. FreeBSD driver does * not support transition to Flat NVM. Use preprocessor - * tag to ensure that this is exposed only for Linux. + * tag to ensure that this is exposed only for Linux and esx. */ #endif /* NVMUpdate features structure initialization */ @@ -1032,7 +1032,7 @@ enum i40e_status_code i40e_init_shared_code(struct i40e_hw *hw) sizeof(*hw->nvmupd_features.features), I40E_NONDMA_MEM); -#ifdef LINUX_SUPPORT +#if defined(LINUX_SUPPORT) || defined(ESX_SUPPORT) hw->nvmupd_features.features[0] = I40E_NVMUPD_FEATURE_FLAT_NVM_SUPPORT; #else /* No features supported at the moment */