From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f45.google.com (mail-wm0-f45.google.com [74.125.82.45]) by dpdk.org (Postfix) with ESMTP id 252C92BD4 for ; Thu, 14 Apr 2016 23:33:38 +0200 (CEST) Received: by mail-wm0-f45.google.com with SMTP id v188so6282351wme.1 for ; Thu, 14 Apr 2016 14:33:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=2rOOpBMn3ZcvjmlAEbi7IIcAIuOPct6PSh6FAm1KmUs=; b=BaDDbap5N93H3YTfxznFYJtwsbr5ymFYkkApXDBjAVEgHyVpG2RqWn7p7a70HhjHxK BWXM890CxMlcsHFynzsdj7WXGE2NCUrVrN2iJVfp03yi7Oi4nUvRFkPEFUkCSKMkoXEW QnM3pznzmSrquf7RpslPyncLv46QYI+WfeizTfKiu6/JkY9B+GlPKr0d9Og1z2Xm6veX IaWdSMbVxIW968YNytKuaHHtLRCwfDqX3iu+oGscT4eIKieinMxJ/oltUXHbYO/p67HT 0ZoyOAwFb+0T0/hR9KQ3uV0rQRgTcVPWB+xBHyO7U44eyhCF/DZmH75Kf0qq7x7fQErG 1mcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=2rOOpBMn3ZcvjmlAEbi7IIcAIuOPct6PSh6FAm1KmUs=; b=aGWKwGA0gyZrT2ND2V4yXakSyMeMWf0T0jhcfkK5eJYUib0nPtKbmXVssELmm4l7al fAuNEJhEqKlWG4F1s+XgPJvEtivov9LVbm/zTfmAt/7de/I7n1+0PvXEVaAdOtipada8 DBLj06j5HKs9MNGkvPwxjaj3429Q8btNG4+dkL8qqZTnse6watzH5Co2hTSdpPkGM691 UmNQk0ig54LWwxetXvetMie8OGB1ShjLx9/KyGfvGc2lUM8juxxeElZep95E1Q2IKOkW 0YmjqUmFBWTpwn5V0YWDh/mwU1QNso+o3/KZA5N3aqzWOj67M446pAtP7M//VmEeaFvn tkaA== X-Gm-Message-State: AOPr4FUnA3JK4LTxTOXB/g6zsdQxp2BGmL+xIjYAGBHtM5KYflUkpo/7sX6bGKwg9UsyKMb8 X-Received: by 10.28.136.19 with SMTP id k19mr639828wmd.11.1460669617952; Thu, 14 Apr 2016 14:33:37 -0700 (PDT) Received: from XPS13.localdomain (245.111.75.86.rev.sfr.net. [86.75.111.245]) by smtp.gmail.com with ESMTPSA id s10sm42980588wjp.3.2016.04.14.14.33.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Apr 2016 14:33:37 -0700 (PDT) From: Thomas Monjalon To: helin.zhang@intel.com Cc: dev@dpdk.org Date: Thu, 14 Apr 2016 23:33:18 +0200 Message-Id: <1460669598-3122-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 Subject: [dpdk-dev] [PATCH] pci: remove deprecated specific config X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2016 21:33:38 -0000 The driver i40e was using a specific PCI config before the release 16.04. >>From 16.04, it is always enabled in i40e (commit 56465cfaf). The API has been deprecated in the commit 68f77593823cab. The igb_uio implementation has been deprecated in commit b7cf8e155. The config helper - through igb_uio sysfs entries - is now removed. Signed-off-by: Thomas Monjalon --- config/common_base | 8 ----- doc/guides/linux_gsg/enable_func.rst | 15 --------- doc/guides/rel_notes/deprecation.rst | 7 ----- lib/librte_eal/common/include/rte_pci.h | 14 --------- lib/librte_eal/linuxapp/eal/eal_pci.c | 12 ------- lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 52 ------------------------------- 6 files changed, 108 deletions(-) diff --git a/config/common_base b/config/common_base index 0124e86..1a54e4c 100644 --- a/config/common_base +++ b/config/common_base @@ -101,14 +101,6 @@ CONFIG_RTE_MALLOC_DEBUG=n CONFIG_RTE_EAL_PMD_PATH="" # -# Special configurations in PCI Config Space for high performance -# They are all deprecated, and will be removed later. -# -CONFIG_RTE_PCI_CONFIG=n -CONFIG_RTE_PCI_EXTENDED_TAG="" -CONFIG_RTE_PCI_MAX_READ_REQUEST_SIZE=0 - -# # Compile Environment Abstraction Layer to support Vmware TSC map # CONFIG_RTE_LIBRTE_EAL_VMWARE_TSC_MAP_SUPPORT=y diff --git a/doc/guides/linux_gsg/enable_func.rst b/doc/guides/linux_gsg/enable_func.rst index 076770f..ec0e04d 100644 --- a/doc/guides/linux_gsg/enable_func.rst +++ b/doc/guides/linux_gsg/enable_func.rst @@ -186,21 +186,6 @@ Check with the local Intel's Network Division application engineers for firmware The base driver to support firmware version of FVL3E will be integrated in the next DPDK release, so currently the validated firmware version is 4.2.6. -Enabling Extended Tag -~~~~~~~~~~~~~~~~~~~~~ - -PCI configuration of ``extended_tag`` has big impact on small packet size -performance of 40G ports. Enabling ``extended_tag`` can help 40G port to -achieve the best performance, especially for small packet size. - -* Disabling/enabling ``extended_tag`` can be done in some BIOS implementations. - -* If BIOS does not enable it, and does not support changing it, tools - (e.g. ``setpci`` on Linux) can be used to enable or disable ``extended_tag``. - -* From release 16.04, ``extended_tag`` is enabled by default during port - initialization, users don't need to care about that anymore. - Use 16 Bytes RX Descriptor Size ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index a3fdbb1..c78cde7 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -20,13 +20,6 @@ Deprecation Notices do not need to care about the kind of devices that are being used, making it easier to add new buses later. -* The EAL function pci_config_space_set is deprecated in release 16.04 - and will be removed from 16.07. - Macros CONFIG_RTE_PCI_CONFIG, CONFIG_RTE_PCI_EXTENDED_TAG and - CONFIG_RTE_PCI_MAX_READ_REQUEST_SIZE will be removed. - The /sys entries extended_tag and max_read_request_size created by igb_uio - will be removed. - * ABI changes are planned for struct rte_pci_id, i.e., add new field ``class``. This new added ``class`` field can be used to probe pci device by class related info. This change should impact size of struct rte_pci_id and struct diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index e692094..9f2301d 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -577,20 +577,6 @@ void rte_eal_pci_ioport_read(struct rte_pci_ioport *p, void rte_eal_pci_ioport_write(struct rte_pci_ioport *p, const void *data, size_t len, off_t offset); -#ifdef RTE_PCI_CONFIG -#include -/** - * Set special config space registers for performance purpose. - * It is deprecated, as all configurations have been moved into - * each PMDs respectively. - * - * @param dev - * A pointer to a rte_pci_device structure describing the device - * to use - */ -void pci_config_space_set(struct rte_pci_device *dev) __rte_deprecated; -#endif /* RTE_PCI_CONFIG */ - #ifdef __cplusplus } #endif diff --git a/lib/librte_eal/linuxapp/eal/eal_pci.c b/lib/librte_eal/linuxapp/eal/eal_pci.c index dbf12a8..bdc08a0 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -481,18 +481,6 @@ error: return -1; } -#ifdef RTE_PCI_CONFIG -/* - * It is deprecated, all its configurations have been moved into - * each PMD respectively. - */ -void -pci_config_space_set(__rte_unused struct rte_pci_device *dev) -{ - RTE_LOG(DEBUG, EAL, "Nothing here, as it is deprecated\n"); -} -#endif - /* Read PCI config space. */ int rte_eal_pci_read_config(const struct rte_pci_device *device, void *buf, size_t len, off_t offset) diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c index 72b2692..45a5720 100644 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -81,62 +81,10 @@ store_max_vfs(struct device *dev, struct device_attribute *attr, return err ? err : count; } -#ifdef RTE_PCI_CONFIG -static ssize_t -show_extended_tag(struct device *dev, struct device_attribute *attr, char *buf) -{ - dev_info(dev, "Deprecated\n"); - - return 0; -} - -static ssize_t -store_extended_tag(struct device *dev, - struct device_attribute *attr, - const char *buf, - size_t count) -{ - dev_info(dev, "Deprecated\n"); - - return 0; -} - -static ssize_t -show_max_read_request_size(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - dev_info(dev, "Deprecated\n"); - - return 0; -} - -static ssize_t -store_max_read_request_size(struct device *dev, - struct device_attribute *attr, - const char *buf, - size_t count) -{ - dev_info(dev, "Deprecated\n"); - - return 0; -} -#endif - static DEVICE_ATTR(max_vfs, S_IRUGO | S_IWUSR, show_max_vfs, store_max_vfs); -#ifdef RTE_PCI_CONFIG -static DEVICE_ATTR(extended_tag, S_IRUGO | S_IWUSR, show_extended_tag, - store_extended_tag); -static DEVICE_ATTR(max_read_request_size, S_IRUGO | S_IWUSR, - show_max_read_request_size, store_max_read_request_size); -#endif static struct attribute *dev_attrs[] = { &dev_attr_max_vfs.attr, -#ifdef RTE_PCI_CONFIG - &dev_attr_extended_tag.attr, - &dev_attr_max_read_request_size.attr, -#endif NULL, }; -- 2.7.0