From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B8D2E4599A; Fri, 20 Sep 2024 11:51:27 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7E8EA402AE; Fri, 20 Sep 2024 11:51:27 +0200 (CEST) Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) by mails.dpdk.org (Postfix) with ESMTP id 38B0640275 for ; Fri, 20 Sep 2024 11:51:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1726825886; x=1758361886; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=YLcd0srg5k8d1qfGhcxC9JF4+l9mFMuTrOmKhcIdUfA=; b=JOR1jp9XzYu1BLfwxcV5IqiPjmUTWJy5cLVFU/PEAtS8yJM3RVT1uEOV w8llD0qXKPhtqS3cLnsmRaluwFqrqW9sJiafhJmfufGamZRsaeXhdXood 9CsS5j3Zni/+uUabDSx/bwYfr8sq3eUKlNGAMMXI/GCaNsPmjufR25gCe YD/2KnGsmBHlNh6QEbqxDp354CAfDxZErYUKY3vb9VqTgCCWhUpQnlx5w ffLuj366DwRDrZh8S6bQsrpQBzjb1OmQxiDK+DNTE0KgwM8J/YUNEOAjZ mpMqTxdNVHDn63k7ueY+PKpd3tKnK8/KzABZnGHrZbcg3zlcmuKQ0jYTQ Q==; X-CSE-ConnectionGUID: BXBJ7puGTymM2Gs1eSVGhg== X-CSE-MsgGUID: 50D8XooVS4+ILi/F3sCFRw== X-IronPort-AV: E=McAfee;i="6700,10204,11200"; a="29558928" X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="29558928" Received: from fmviesa003.fm.intel.com ([10.60.135.143]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 02:51:25 -0700 X-CSE-ConnectionGUID: t8IU2ajmT6OAeKKy7ypBJQ== X-CSE-MsgGUID: nTmX7yqlRpOqXHDlLzAt/Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,244,1719903600"; d="scan'208";a="74361934" Received: from unknown (HELO zhichao-dpdk..) ([10.239.252.103]) by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Sep 2024 02:51:22 -0700 From: Zhichao Zeng To: dev@dpdk.org Cc: bruce.richardson@intel.com, Zhichao Zeng Subject: [PATCH v6] net/ice: support customized search path for DDP package Date: Fri, 20 Sep 2024 18:05:59 +0800 Message-Id: <20240920100559.1464272-1-zhichaox.zeng@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240919032934.800979-1-zhichaox.zeng@intel.com> References: <20240919032934.800979-1-zhichaox.zeng@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 This patch adds support for customizing firmware search path for DDP package like the kernel behavior, it will read the search path from "/sys/module/firmware_class/parameters/path", and try to load DDP package. Also, updates documentation for loading the DDP package in ice.rst. Signed-off-by: Zhichao Zeng --- v6: use open() instead of fopen() v5: update documentation, fix code logic v4: fix CI error v3: update doc, fix code error v2: separate the patch and rewrite the log --- doc/guides/nics/ice.rst | 60 +++++++++++++++++++----------------- drivers/net/ice/ice_ethdev.c | 47 ++++++++++++++++++++++++++-- drivers/net/ice/ice_ethdev.h | 1 + 3 files changed, 76 insertions(+), 32 deletions(-) diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index ae975d19ad..a6104db4d4 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -80,6 +80,37 @@ are listed in the Tested Platforms section of the Release Notes for each release | 24.03 | 1.13.7 | 1.3.35 | 1.3.45 | 1.3.13 | 4.4 | +-----------+---------------+-----------------+-----------+--------------+-----------+ +Dynamic Device Personalization (DDP) package loading +---------------------------------------------------- + +The Intel E810 requires a programmable pipeline package be downloaded +by the driver to support normal operations. The E810 has limited +functionality built in to allow PXE boot and other use cases, but for DPDK use +the driver must download a package file during the driver initialization +stage. + +The default DDP package file name is ``ice.pkg``. For a specific NIC, the +DDP package supposed to be loaded can have a filename: ``ice-xxxxxx.pkg``, +where 'xxxxxx' is the 64-bit PCIe Device Serial Number of the NIC. For +example, if the NIC's device serial number is 00-CC-BB-FF-FF-AA-05-68, +the device-specific DDP package filename is ``ice-00ccbbffffaa0568.pkg`` +(in hex and all low case), please review README from +`Intel® Ethernet 800 Series Dynamic Device Personalization (DDP) for Telecommunication (Comms) Package +`_ +for more information. A symbolic link to the DDP package file is also ok. +The same package file is used by both the kernel driver and the ICE PMD. + +ICE PMD supports using a customized DDP search path. The driver will read +the search path from '/sys/module/firmware_class/parameters/path' +as 'CUSTOMIZED_PATH'. +During initialization, the driver searches in the following paths in order: +'CUSTOMIZED_PATH', '/lib/firmware/updates/intel/ice/ddp' and '/lib/firmware/intel/ice/ddp'. +The device-specific DDP package has a higher loading priority than default DDP package. + + .. Note:: + + Windows support: DDP packages are not supported on Windows. + Configuration ------------- @@ -487,32 +518,3 @@ Usage:: In "brief" mode, all scheduling nodes in the tree are displayed. In "detail" mode, each node's configuration parameters are also displayed. - -Limitations or Known issues ---------------------------- - -The Intel E810 requires a programmable pipeline package be downloaded -by the driver to support normal operations. The E810 has a limited -functionality built in to allow PXE boot and other use cases, but the -driver must download a package file during the driver initialization -stage. - -The default DDP package file name is ice.pkg. For a specific NIC, the -DDP package supposed to be loaded can have a filename: ice-xxxxxx.pkg, -where 'xxxxxx' is the 64-bit PCIe Device Serial Number of the NIC. For -example, if the NIC's device serial number is 00-CC-BB-FF-FF-AA-05-68, -the device-specific DDP package filename is ice-00ccbbffffaa0568.pkg -(in hex and all low case). During initialization, the driver searches -in the following paths in order: /lib/firmware/updates/intel/ice/ddp -and /lib/firmware/intel/ice/ddp. The corresponding device-specific DDP -package will be downloaded first if the file exists. If not, then the -driver tries to load the default package. The type of loaded package -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 304f959b7e..1584b3251c 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -6,6 +6,7 @@ #include #include +#include #include #include #include @@ -1873,21 +1874,61 @@ ice_load_pkg_type(struct ice_hw *hw) return package_type; } +static int ice_read_customized_path(char *pkg_file, uint16_t buff_len) +{ + int fp, n; + + fp = open(ICE_PKG_FILE_CUSTOMIZED_PATH, O_RDONLY); + if (fp < 0) { + PMD_INIT_LOG(INFO, "Failed to read CUSTOMIZED_PATH"); + return -EIO; + } + + n = read(fp, pkg_file, buff_len - 1); + if (n == 0) { + close(fp); + return -EIO; + } + + if (pkg_file[n - 1] == '\n') + n--; + + pkg_file[n] = '\0'; + + close(fp); + return 0; +} + int ice_load_pkg(struct ice_adapter *adapter, bool use_dsn, uint64_t dsn) { struct ice_hw *hw = &adapter->hw; char pkg_file[ICE_MAX_PKG_FILENAME_SIZE]; + char customized_path[ICE_MAX_PKG_FILENAME_SIZE]; char opt_ddp_filename[ICE_MAX_PKG_FILENAME_SIZE]; void *buf; size_t bufsz; int err; - if (!use_dsn) - goto no_dsn; - memset(opt_ddp_filename, 0, ICE_MAX_PKG_FILENAME_SIZE); snprintf(opt_ddp_filename, ICE_MAX_PKG_FILENAME_SIZE, "ice-%016" PRIx64 ".pkg", dsn); + + if (ice_read_customized_path(customized_path, + ICE_MAX_PKG_FILENAME_SIZE) == 0) { + if (use_dsn) { + snprintf(pkg_file, RTE_DIM(pkg_file), + "%s/%s", customized_path, opt_ddp_filename); + if (rte_firmware_read(pkg_file, &buf, &bufsz) == 0) + goto load_fw; + } + snprintf(pkg_file, RTE_DIM(pkg_file), "%s/%s", customized_path, "ice.pkg"); + if (rte_firmware_read(pkg_file, &buf, &bufsz) == 0) + goto load_fw; + } + + if (!use_dsn) + goto no_dsn; + strncpy(pkg_file, ICE_PKG_FILE_SEARCH_PATH_UPDATES, ICE_MAX_PKG_FILENAME_SIZE); strcat(pkg_file, opt_ddp_filename); diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index 3ea9f37dc8..8b644ed700 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -51,6 +51,7 @@ #define ICE_PKG_FILE_UPDATES "/lib/firmware/updates/intel/ice/ddp/ice.pkg" #define ICE_PKG_FILE_SEARCH_PATH_DEFAULT "/lib/firmware/intel/ice/ddp/" #define ICE_PKG_FILE_SEARCH_PATH_UPDATES "/lib/firmware/updates/intel/ice/ddp/" +#define ICE_PKG_FILE_CUSTOMIZED_PATH "/sys/module/firmware_class/parameters/path" #define ICE_MAX_PKG_FILENAME_SIZE 256 #define MAX_ACL_NORMAL_ENTRIES 256 -- 2.34.1