From patchwork Fri Apr 2 01:26:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kadam, Pallavi" X-Patchwork-Id: 90436 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4165EA0548; Fri, 2 Apr 2021 02:54:47 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE8E940F35; Fri, 2 Apr 2021 02:54:46 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id EFFCA40150 for ; Fri, 2 Apr 2021 02:54:44 +0200 (CEST) IronPort-SDR: dNnS7z5DvZPN0VZcFdtxc1H/Rhmvn0FKuVX/wgbRBwWtzS4AmM6ApfipjNOjV0ADK8XHvSgMmZ PPzgMCFkCAng== X-IronPort-AV: E=McAfee;i="6000,8403,9941"; a="189106950" X-IronPort-AV: E=Sophos;i="5.81,298,1610438400"; d="scan'208";a="189106950" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 17:54:43 -0700 IronPort-SDR: kw4B8HEqHmdbASFzUwnsoo2dPkNMRb11HDJjS2Mfm9oh5A6y7tO+RsbVqjTGZ6Burp/79bjQJQ mPkfVN6tY5Qg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,298,1610438400"; d="scan'208";a="412947676" Received: from win-dpdk-pallavi.jf.intel.com (HELO localhost.localdomain) ([10.166.188.111]) by fmsmga008.fm.intel.com with ESMTP; 01 Apr 2021 17:54:41 -0700 From: Pallavi Kadam To: dev@dpdk.org, thomas@monjalon.net Cc: dmitry.kozliuk@gmail.com, ranjit.menon@intel.com, qiming.yang@intel.com, qi.z.zhang@intel.com, ferruh.yigit@intel.com, pallavi.kadam@intel.com Date: Thu, 1 Apr 2021 18:26:21 -0700 Message-Id: <20210402012621.7944-4-pallavi.kadam@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20210402012621.7944-1-pallavi.kadam@intel.com> References: <20210311015848.4976-1-pallavi.kadam@intel.com> <20210402012621.7944-1-pallavi.kadam@intel.com> Subject: [dpdk-dev] [PATCH v3 3/3] net/ice: disable ice DDP package on Windows X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Disable loading of external DDP package as it is not supported on Windows. Signed-off-by: Pallavi Kadam Reviewed-by: Ranjit Menon Acked-by: Jie Zhou --- doc/guides/nics/ice.rst | 5 +++++ drivers/net/ice/ice_ethdev.c | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 100086132..8d40d1741 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -330,3 +330,8 @@ is stored in ``ice_adapter->active_pkg_type``. A symbolic link to the DDP package file is also ok. The same package file is used by both the kernel driver and the DPDK PMD. + + .. Note:: + + Windows support: The DDP package is not supported on Windows so, + loading of the package is disabled on Windows. diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 81558fd8d..1dea6421c 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -1650,6 +1650,7 @@ ice_pf_setup(struct ice_pf *pf) * Extract device serial number from PCIe Configuration Space and * determine the pkg file path according to the DSN. */ +#ifndef RTE_EXEC_ENV_WINDOWS static int ice_pkg_file_search_path(struct rte_pci_device *pci_dev, char *pkg_file) { @@ -1693,6 +1694,7 @@ ice_pkg_file_search_path(struct rte_pci_device *pci_dev, char *pkg_file) strncpy(pkg_file, ICE_PKG_FILE_DEFAULT, ICE_MAX_PKG_FILENAME_SIZE); return 0; } +#endif enum ice_pkg_type ice_load_pkg_type(struct ice_hw *hw) @@ -1718,6 +1720,7 @@ ice_load_pkg_type(struct ice_hw *hw) return package_type; } +#ifndef RTE_EXEC_ENV_WINDOWS static int ice_load_pkg(struct rte_eth_dev *dev) { struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); @@ -1793,6 +1796,7 @@ static int ice_load_pkg(struct rte_eth_dev *dev) rte_free(buf); return err; } +#endif static void ice_base_queue_get(struct ice_pf *pf) @@ -2073,6 +2077,7 @@ ice_dev_init(struct rte_eth_dev *dev) return -EINVAL; } +#ifndef RTE_EXEC_ENV_WINDOWS ret = ice_load_pkg(dev); if (ret) { if (ad->devargs.safe_mode_support == 0) { @@ -2085,6 +2090,7 @@ ice_dev_init(struct rte_eth_dev *dev) "Entering Safe Mode"); ad->is_safe_mode = 1; } +#endif PMD_INIT_LOG(INFO, "FW %d.%d.%05d API %d.%d", hw->fw_maj_ver, hw->fw_min_ver, hw->fw_build,