From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 095FBA2EFC for ; Tue, 17 Sep 2019 03:44:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1B1881BFC2; Tue, 17 Sep 2019 03:44:30 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 394DF1BF2E for ; Tue, 17 Sep 2019 03:44:27 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Sep 2019 18:44:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,514,1559545200"; d="scan'208";a="216407049" Received: from dpdk-xuting-main.sh.intel.com ([10.67.117.161]) by fmsmga002.fm.intel.com with ESMTP; 16 Sep 2019 18:44:24 -0700 From: Ting Xu To: dev@dpdk.org Cc: wenzhuo.lu@intel.com, qiming.yang@intel.com, john.mcnamara@intel.com, marko.kovacevic@intel.com, alejandro.lucero@netronome.com, thomas@monjalon.net, ferruh.yigit@intel.com, arybchenko@solarflare.com, xiaolong.ye@intel.com Date: Tue, 17 Sep 2019 08:44:58 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: <8560c4c7f3547a2a9263a916d03b9f76a1bd9602.1568204462.git.ting.xu@intel.com> References: <8560c4c7f3547a2a9263a916d03b9f76a1bd9602.1568204462.git.ting.xu@intel.com> Subject: [dpdk-dev] [PATCH v7] net/ice: support device-specific DDP package loading 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" This patch adds the feature that supports loading DDP package according to the device serial number. Prior to loading the default DDP package (ice.pkg), the driver will check for the presence of a device-specific DDP package with the name containing 64-bit PCIe Device Serial Number (ice-xxxxxxxxxxxxxxxx.pkg) during initialization. Users can use "lspci -vs" to get the device serial number. The pkg search path are /lib/firmware/updates/intel/ice/ddp/ and /lib/firmware/intel/ice/ddp/. If the package exists, the driver will download it to the device instead of the default one. The loaded package type (OS default and COMMS) will be stored in ice_adapter->active_pkg_type. The package version is stored in ice_hw->active_pkg_ver. Signed-off-by: Ting Xu --- v7: fix coding style error; move function to rte_ethdev_pci.h. v6: update doc and release note; reduce redundant variables; change some log levels. v5: optimize the operation when dsn is not found. v4: correct the commit message format. v3: fix compile error; modify to change the pkg loading order. v2: modify codes according to the comments. --- doc/guides/nics/ice.rst | 20 ++++- doc/guides/rel_notes/release_19_11.rst | 5 ++ drivers/net/ice/ice_ethdev.c | 88 +++++++++++++++++++++- drivers/net/ice/ice_ethdev.h | 8 ++ drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 46 +---------- lib/librte_ethdev/rte_ethdev_pci.h | 59 +++++++++++++++ 6 files changed, 175 insertions(+), 51 deletions(-) diff --git a/doc/guides/nics/ice.rst b/doc/guides/nics/ice.rst index 03819d29f..59a222e28 100644 --- a/doc/guides/nics/ice.rst +++ b/doc/guides/nics/ice.rst @@ -118,10 +118,22 @@ 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 file must be in the /lib/firmware/intel/ice/ddp directory -and it must be named ice.pkg. A symbolic link to this file is also ok. -The same package file is used by both the kernel driver and the DPDK PMD. - +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. 19.02 limitation ~~~~~~~~~~~~~~~~ diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst index 8490d897c..ef5048829 100644 --- a/doc/guides/rel_notes/release_19_11.rst +++ b/doc/guides/rel_notes/release_19_11.rst @@ -56,6 +56,11 @@ New Features Also, make sure to start the actual text at the margin. ========================================================= +* **Support device-specific DDP package loading.** + + Added support to load device-specific DDP package. The package file + with name including NIC's device serial number would be searched and + loaded (if existed) prior to the default package (ice.pkg). Removed Items ------------- diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c index 44a14cb8a..8d9f04134 100644 --- a/drivers/net/ice/ice_ethdev.c +++ b/drivers/net/ice/ice_ethdev.c @@ -26,7 +26,16 @@ static const char * const ice_valid_args[] = { }; #define ICE_DFLT_OUTER_TAG_TYPE ICE_AQ_VSI_OUTER_TAG_VLAN_9100 -#define ICE_DFLT_PKG_FILE "/lib/firmware/intel/ice/ddp/ice.pkg" + +/* DDP package search path */ +#define ICE_PKG_FILE_DEFAULT "/lib/firmware/intel/ice/ddp/ice.pkg" +#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_OS_DEFAULT_PKG_NAME "ICE OS Default Package" +#define ICE_COMMS_PKG_NAME "ICE COMMS Package" +#define ICE_MAX_PKG_FILENAME_SIZE 256 int ice_logtype_init; int ice_logtype_driver; @@ -1263,15 +1272,86 @@ ice_pf_setup(struct ice_pf *pf) return 0; } +/* + * Extract device serial number from PCIe Configuration Space and + * determine the pkg file path according to the DSN. + */ +static int +ice_pkg_file_search_path(struct rte_pci_device *pci_dev, char *pkg_file) +{ + int pos; + char opt_ddp_filename[ICE_MAX_PKG_FILENAME_SIZE]; + uint32_t dsn_low, dsn_high; + memset(opt_ddp_filename, 0, ICE_MAX_PKG_FILENAME_SIZE); + + pos = rte_eth_dev_pci_find_next_ext_capability(pci_dev, + PCI_EXT_CAP_ID_DSN); + + if (pos) { + rte_pci_read_config(pci_dev, &dsn_low, 4, pos + 4); + rte_pci_read_config(pci_dev, &dsn_high, 4, pos + 8); + snprintf(opt_ddp_filename, ICE_MAX_PKG_FILENAME_SIZE, + "ice-%08x%08x.pkg", dsn_high, dsn_low); + } else { + PMD_INIT_LOG(ERR, "Failed to read device serial number\n"); + goto fail_dsn; + } + + strncpy(pkg_file, ICE_PKG_FILE_SEARCH_PATH_UPDATES, + ICE_MAX_PKG_FILENAME_SIZE); + if (!access(strcat(pkg_file, opt_ddp_filename), 0)) + return 0; + + strncpy(pkg_file, ICE_PKG_FILE_SEARCH_PATH_DEFAULT, + ICE_MAX_PKG_FILENAME_SIZE); + if (!access(strcat(pkg_file, opt_ddp_filename), 0)) + return 0; + +fail_dsn: + strncpy(pkg_file, ICE_PKG_FILE_UPDATES, ICE_MAX_PKG_FILENAME_SIZE); + if (!access(pkg_file, 0)) + return 0; + strncpy(pkg_file, ICE_PKG_FILE_DEFAULT, ICE_MAX_PKG_FILENAME_SIZE); + return 0; +} + +static enum ice_pkg_type +ice_load_pkg_type(struct ice_hw *hw) +{ + enum ice_pkg_type package_type; + + /* store the activated package type (OS default or Comms) */ + if (!strncmp((char *)hw->active_pkg_name, ICE_OS_DEFAULT_PKG_NAME, + ICE_PKG_NAME_SIZE)) + package_type = ICE_PKG_TYPE_OS_DEFAULT; + else if (!strncmp((char *)hw->active_pkg_name, ICE_COMMS_PKG_NAME, + ICE_PKG_NAME_SIZE)) + package_type = ICE_PKG_TYPE_COMMS; + else + package_type = ICE_PKG_TYPE_UNKNOWN; + + PMD_INIT_LOG(NOTICE, "Active package is: %d.%d.%d.%d, %s", + hw->active_pkg_ver.major, hw->active_pkg_ver.minor, + hw->active_pkg_ver.update, hw->active_pkg_ver.draft, + hw->active_pkg_name); + + return package_type; +} + static int ice_load_pkg(struct rte_eth_dev *dev) { struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private); - const char *pkg_file = ICE_DFLT_PKG_FILE; + char pkg_file[ICE_MAX_PKG_FILENAME_SIZE]; int err; uint8_t *buf; int buf_len; FILE *file; struct stat fstat; + struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(dev->device); + struct ice_adapter *ad = + ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + + ice_pkg_file_search_path(pci_dev, pkg_file); file = fopen(pkg_file, "rb"); if (!file) { @@ -1311,6 +1391,10 @@ static int ice_load_pkg(struct rte_eth_dev *dev) PMD_INIT_LOG(ERR, "ice_copy_and_init_hw failed: %d\n", err); goto fail_exit; } + + /* store the loaded pkg type info */ + ad->active_pkg_type = ice_load_pkg_type(hw); + err = ice_init_hw_tbls(hw); if (err) { PMD_INIT_LOG(ERR, "ice_init_hw_tbls failed: %d\n", err); diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h index f569da833..926db23d2 100644 --- a/drivers/net/ice/ice_ethdev.h +++ b/drivers/net/ice/ice_ethdev.h @@ -124,6 +124,13 @@ #define ICE_ETH_OVERHEAD \ (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE * 2) +/* DDP package type */ +enum ice_pkg_type { + ICE_PKG_TYPE_UNKNOWN, + ICE_PKG_TYPE_OS_DEFAULT, + ICE_PKG_TYPE_COMMS, +}; + struct ice_adapter; /** @@ -294,6 +301,7 @@ struct ice_adapter { uint32_t ptype_tbl[ICE_MAX_PKT_TYPE] __rte_cache_min_aligned; bool is_safe_mode; struct ice_devargs devargs; + enum ice_pkg_type active_pkg_type; /* loaded ddp package type */ }; struct ice_vsi_vlan_pvid_info { diff --git a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c index 0b9db974e..f16a3c86e 100644 --- a/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c +++ b/drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c @@ -746,50 +746,6 @@ nfp6000_set_interface(struct rte_pci_device *dev, struct nfp_cpp *cpp) return 0; } -#define PCI_CFG_SPACE_SIZE 256 -#define PCI_CFG_SPACE_EXP_SIZE 4096 -#define PCI_EXT_CAP_ID(header) (int)(header & 0x0000ffff) -#define PCI_EXT_CAP_NEXT(header) ((header >> 20) & 0xffc) -#define PCI_EXT_CAP_ID_DSN 0x03 -static int -nfp_pci_find_next_ext_capability(struct rte_pci_device *dev, int cap) -{ - uint32_t header; - int ttl; - int pos = PCI_CFG_SPACE_SIZE; - - /* minimum 8 bytes per capability */ - ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8; - - if (rte_pci_read_config(dev, &header, 4, pos) < 0) { - printf("nfp error reading extended capabilities\n"); - return -1; - } - - /* - * If we have no capabilities, this is indicated by cap ID, - * cap version and next pointer all being 0. - */ - if (header == 0) - return 0; - - while (ttl-- > 0) { - if (PCI_EXT_CAP_ID(header) == cap) - return pos; - - pos = PCI_EXT_CAP_NEXT(header); - if (pos < PCI_CFG_SPACE_SIZE) - break; - - if (rte_pci_read_config(dev, &header, 4, pos) < 0) { - printf("nfp error reading extended capabilities\n"); - return -1; - } - } - - return 0; -} - static int nfp6000_set_serial(struct rte_pci_device *dev, struct nfp_cpp *cpp) { @@ -798,7 +754,7 @@ nfp6000_set_serial(struct rte_pci_device *dev, struct nfp_cpp *cpp) int serial_len = 6; int pos; - pos = nfp_pci_find_next_ext_capability(dev, PCI_EXT_CAP_ID_DSN); + pos = rte_eth_dev_pci_find_next_ext_capability(dev, PCI_EXT_CAP_ID_DSN); if (pos <= 0) { printf("PCI_EXT_CAP_ID_DSN not found. nfp set serial failed\n"); return -1; diff --git a/lib/librte_ethdev/rte_ethdev_pci.h b/lib/librte_ethdev/rte_ethdev_pci.h index ccdbb46ec..1445f74ef 100644 --- a/lib/librte_ethdev/rte_ethdev_pci.h +++ b/lib/librte_ethdev/rte_ethdev_pci.h @@ -196,4 +196,63 @@ rte_eth_dev_pci_generic_remove(struct rte_pci_device *pci_dev, return 0; } + /** + * Returns the address of the next matching extended capability structure + * within the device's PCI configuration space or 0 if the device does + * not support it. Some capabilities can occur several times, e.g., the + * vendor-specific capability, and this provides a way to find them all. + * + * @param dev + * PCI device to query + * + * @cap + * Capability code + */ + +#define PCI_CFG_SPACE_SIZE 256 +#define PCI_CFG_SPACE_EXP_SIZE 4096 +#define PCI_EXT_CAP_ID(header) (int)((header) & 0x0000ffff) +#define PCI_EXT_CAP_NEXT(header) (((header) >> 20) & 0xffc) +#define PCI_EXT_CAP_ID_DSN 0x03 + +static inline int +rte_eth_dev_pci_find_next_ext_capability(struct rte_pci_device *dev, int cap) +{ + uint32_t header; + int ttl; + int pos = PCI_CFG_SPACE_SIZE; + + /* minimum 8 bytes per capability */ + ttl = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8; + + if (rte_pci_read_config(dev, &header, 4, pos) < 0) { + RTE_LOG(ERR, EAL, "Error reading extended capabilities\n"); + return -1; + } + + /* + * If we have no capabilities, this is indicated by cap ID, + * cap version and next pointer all being 0. + */ + if (header == 0) + return 0; + + while (ttl-- > 0) { + if (PCI_EXT_CAP_ID(header) == cap) + return pos; + + pos = PCI_EXT_CAP_NEXT(header); + + if (pos < PCI_CFG_SPACE_SIZE) + break; + + if (rte_pci_read_config(dev, &header, 4, pos) < 0) { + RTE_LOG(ERR, EAL, "Error reading extended capabilities\n"); + return -1; + } + } + + return 0; +} + #endif /* _RTE_ETHDEV_PCI_H_ */ -- 2.17.1