Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/52951/?format=api
{ "id": 52951, "url": "https://patches.dpdk.org/api/patches/52951/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190418233701.20793-1-stephen@networkplumber.org/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20190418233701.20793-1-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20190418233701.20793-1-stephen@networkplumber.org", "date": "2019-04-18T23:37:02", "name": "net/cxgbe: fix colliding function names", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "538a0d09e45b5bca9bd1f0fb183aa9c599f11fab", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20190418233701.20793-1-stephen@networkplumber.org/mbox/", "series": [ { "id": 4389, "url": "https://patches.dpdk.org/api/series/4389/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=4389", "date": "2019-04-18T23:37:02", "name": "net/cxgbe: fix colliding function names", "version": 1, "mbox": "https://patches.dpdk.org/series/4389/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/52951/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/52951/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 051021BAE4;\n\tFri, 19 Apr 2019 01:38:13 +0200 (CEST)", "from mail-pl1-f194.google.com (mail-pl1-f194.google.com\n\t[209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 11B511BAB9\n\tfor <dev@dpdk.org>; Fri, 19 Apr 2019 01:38:11 +0200 (CEST)", "by mail-pl1-f194.google.com with SMTP id t16so1856605plo.0\n\tfor <dev@dpdk.org>; Thu, 18 Apr 2019 16:38:11 -0700 (PDT)", "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n\tby smtp.gmail.com with ESMTPSA id\n\ta3sm4735296pfn.182.2019.04.18.16.38.09\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 18 Apr 2019 16:38:09 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=S35xgKT5qQDNGUIOrZ7We6/fmOrS0kSbHx89ZSwNU34=;\n\tb=rhk4SbGPhOklvjrIW7qgMaGLlMeJ9vcRMBb7dJH6OEQA2RqaLBuTRdVBnUWvLKQr6Y\n\tQSqUmTYs1hc13XVNfo789n0j5KXmtCKfSQ/lw7kFDZWRskXxUQeVoLtWpBYADCxjDAqM\n\tJoVs5huBfPHWWfYJr8hq6VRQDxkJ+PJ7HO/HIEGZiSEuuKkudHHD+FO1PpHt0dxvQIAm\n\tGfwK1/0bPAYguSt01VJ4n0pRjEf2ywhB8fN/6ZKymiIAapxOlIo6IsfBPectORf0uvoa\n\tV8b0GI4j7lfPb9VaWT4XsJpu67juN5UttrsuWC8Vwl9WYSW3BPYM5ZPLymWd3tCNX9Eb\n\tGkFg==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=S35xgKT5qQDNGUIOrZ7We6/fmOrS0kSbHx89ZSwNU34=;\n\tb=UNspuJa7m3xnY+AiSAKsu2EEYZuOAy/e/3H/fXT7mMpkUik2lFc6QV8IjWqnPzTnAc\n\tH816QwoYvtN1uH63u4LTRqZOjLTv7h9vMqMxT/3ijb+vh7QexmjvJv07fUfMkO/sZaeE\n\tAiBSqdOdONcy6XLn7nmPznceivgoodfiqoPPe6Fb/Ielgh+s4kr6PIcGQfBn7kXVz4dJ\n\tDTv9IDnqezb+tiwF+RGjvu0dsjP19wZPp3LEY7luXy8bGncjj1KwEimjGxyIfDk0s+Dl\n\tCFDpwhPtzeu9VzjZw5DhjWk32XXpXdunbekVT4CitN2Lzfm3RQMxpCl70x+txMatKM50\n\tZ30w==", "X-Gm-Message-State": "APjAAAVYgyuFH/HO22YZLyMgibaTvCzYha7VIY/SgL5wuZAMRugyrZrL\n\tzJK2wiaPK/Qar7ksMsBmJg/SwYvfEH0=", "X-Google-Smtp-Source": "APXvYqx0cmqYFYmTTKsFyD667T0kQ8L1xiDPmbZ++nGqEYvPand0GQ9jdN9YxU1OkDUZ/EmUjN4FbQ==", "X-Received": "by 2002:a17:902:2ba6:: with SMTP id\n\tl35mr457171plb.56.1555630690986; \n\tThu, 18 Apr 2019 16:38:10 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "rahul.lakkireddy@chelsio.com", "Cc": "dev@dpdk.org,\n\tStephen Hemminger <stephen@networkplumber.org>", "Date": "Thu, 18 Apr 2019 16:37:02 -0700", "Message-Id": "<20190418233701.20793-1-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.20.1", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH] net/cxgbe: fix colliding function names", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This driver defines lots of functions (like init_rss) which are intended\nto only be used in this device. But when doing static linking these\nglobal functions cause link failures when similar function name is\nused in application.\n\nThis patch prefixes all functions defined in cxgbe.h with cxgbe_\nto avoid these kind of conflicts.\n\nFixes: bfcb257d3014 (\"net/cxgbe: enable RSS for VF\")\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n drivers/net/cxgbe/cxgbe.h | 27 +++++++++++++------------\n drivers/net/cxgbe/cxgbe_ethdev.c | 15 +++++++-------\n drivers/net/cxgbe/cxgbe_main.c | 34 ++++++++++++++++----------------\n drivers/net/cxgbe/cxgbevf_main.c | 10 +++++-----\n 4 files changed, 44 insertions(+), 42 deletions(-)", "diff": "diff --git a/drivers/net/cxgbe/cxgbe.h b/drivers/net/cxgbe/cxgbe.h\nindex 5a7490f914c8..951b3ed3e9b6 100644\n--- a/drivers/net/cxgbe/cxgbe.h\n+++ b/drivers/net/cxgbe/cxgbe.h\n@@ -52,7 +52,7 @@\n #define CXGBE_DEVARG_KEEP_OVLAN \"keep_ovlan\"\n #define CXGBE_DEVARG_FORCE_LINK_UP \"force_link_up\"\n \n-bool force_linkup(struct adapter *adap);\n+bool cxgbe_force_linkup(struct adapter *adap);\n int cxgbe_probe(struct adapter *adapter);\n int cxgbevf_probe(struct adapter *adapter);\n void cxgbe_get_speed_caps(struct port_info *pi, u32 *speed_caps);\n@@ -65,19 +65,20 @@ void cxgbevf_stats_get(struct port_info *pi, struct port_stats *stats);\n void cxgbe_stats_reset(struct port_info *pi);\n int cxgbe_poll_for_completion(struct sge_rspq *q, unsigned int us,\n \t\t\t unsigned int cnt, struct t4_completion *c);\n-int link_start(struct port_info *pi);\n-void init_rspq(struct adapter *adap, struct sge_rspq *q, unsigned int us,\n-\t unsigned int cnt, unsigned int size, unsigned int iqe_size);\n-int setup_sge_fwevtq(struct adapter *adapter);\n-int setup_sge_ctrl_txq(struct adapter *adapter);\n-void cfg_queues(struct rte_eth_dev *eth_dev);\n-int cfg_queue_count(struct rte_eth_dev *eth_dev);\n-int init_rss(struct adapter *adap);\n-int setup_rss(struct port_info *pi);\n+int cxgbe_link_start(struct port_info *pi);\n+void cxgbe_init_rspq(struct adapter *adap, struct sge_rspq *q, unsigned int us,\n+\t\t unsigned int cnt, unsigned int size,\n+\t\t unsigned int iqe_size);\n+int cxgbe_setup_sge_fwevtq(struct adapter *adapter);\n+int cxgbe_setup_sge_ctrl_txq(struct adapter *adapter);\n+void cxgbe_cfg_queues(struct rte_eth_dev *eth_dev);\n+int cxgbe_cfg_queue_count(struct rte_eth_dev *eth_dev);\n+int cxgbe_init_rss(struct adapter *adap);\n+int cxgbe_setup_rss(struct port_info *pi);\n void cxgbe_enable_rx_queues(struct port_info *pi);\n-void print_port_info(struct adapter *adap);\n-void print_adapter_info(struct adapter *adap);\n+void cxgbe_print_port_info(struct adapter *adap);\n+void cxgbe_print_adapter_info(struct adapter *adap);\n int cxgbe_get_devargs(struct rte_devargs *devargs, const char *key);\n-void configure_max_ethqsets(struct adapter *adapter);\n+void cxgbe_configure_max_ethqsets(struct adapter *adapter);\n \n #endif /* _CXGBE_H_ */\ndiff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c\nindex 833dd1f5f7cc..01d256da01db 100644\n--- a/drivers/net/cxgbe/cxgbe_ethdev.c\n+++ b/drivers/net/cxgbe/cxgbe_ethdev.c\n@@ -200,7 +200,8 @@ int cxgbe_dev_link_update(struct rte_eth_dev *eth_dev,\n \t\tcxgbe_poll(&s->fw_evtq, NULL, budget, &work_done);\n \n \t\t/* Exit if link status changed or always forced up */\n-\t\tif (pi->link_cfg.link_ok != old_link || force_linkup(adapter))\n+\t\tif (pi->link_cfg.link_ok != old_link ||\n+\t\t cxgbe_force_linkup(adapter))\n \t\t\tbreak;\n \n \t\tif (!wait_to_complete)\n@@ -209,7 +210,7 @@ int cxgbe_dev_link_update(struct rte_eth_dev *eth_dev,\n \t\trte_delay_ms(CXGBE_LINK_STATUS_POLL_MS);\n \t}\n \n-\tnew_link.link_status = force_linkup(adapter) ?\n+\tnew_link.link_status = cxgbe_force_linkup(adapter) ?\n \t\t\t ETH_LINK_UP : pi->link_cfg.link_ok;\n \tnew_link.link_autoneg = pi->link_cfg.autoneg;\n \tnew_link.link_duplex = ETH_LINK_FULL_DUPLEX;\n@@ -356,7 +357,7 @@ int cxgbe_dev_start(struct rte_eth_dev *eth_dev)\n \n \tcxgbe_enable_rx_queues(pi);\n \n-\terr = setup_rss(pi);\n+\terr = cxgbe_setup_rss(pi);\n \tif (err)\n \t\tgoto out;\n \n@@ -372,7 +373,7 @@ int cxgbe_dev_start(struct rte_eth_dev *eth_dev)\n \t\t\tgoto out;\n \t}\n \n-\terr = link_start(pi);\n+\terr = cxgbe_link_start(pi);\n \tif (err)\n \t\tgoto out;\n \n@@ -412,18 +413,18 @@ int cxgbe_dev_configure(struct rte_eth_dev *eth_dev)\n \tCXGBE_FUNC_TRACE();\n \n \tif (!(adapter->flags & FW_QUEUE_BOUND)) {\n-\t\terr = setup_sge_fwevtq(adapter);\n+\t\terr = cxgbe_setup_sge_fwevtq(adapter);\n \t\tif (err)\n \t\t\treturn err;\n \t\tadapter->flags |= FW_QUEUE_BOUND;\n \t\tif (is_pf4(adapter)) {\n-\t\t\terr = setup_sge_ctrl_txq(adapter);\n+\t\t\terr = cxgbe_setup_sge_ctrl_txq(adapter);\n \t\t\tif (err)\n \t\t\t\treturn err;\n \t\t}\n \t}\n \n-\terr = cfg_queue_count(eth_dev);\n+\terr = cxgbe_cfg_queue_count(eth_dev);\n \tif (err)\n \t\treturn err;\n \ndiff --git a/drivers/net/cxgbe/cxgbe_main.c b/drivers/net/cxgbe/cxgbe_main.c\nindex fd0707b95580..5e72e844734e 100644\n--- a/drivers/net/cxgbe/cxgbe_main.c\n+++ b/drivers/net/cxgbe/cxgbe_main.c\n@@ -116,7 +116,7 @@ static int fwevtq_handler(struct sge_rspq *q, const __be64 *rsp,\n /**\n * Setup sge control queues to pass control information.\n */\n-int setup_sge_ctrl_txq(struct adapter *adapter)\n+int cxgbe_setup_sge_ctrl_txq(struct adapter *adapter)\n {\n \tstruct sge *s = &adapter->sge;\n \tint err = 0, i = 0;\n@@ -190,7 +190,7 @@ int cxgbe_poll_for_completion(struct sge_rspq *q, unsigned int ms,\n \treturn -ETIMEDOUT;\n }\n \n-int setup_sge_fwevtq(struct adapter *adapter)\n+int cxgbe_setup_sge_fwevtq(struct adapter *adapter)\n {\n \tstruct sge *s = &adapter->sge;\n \tint err = 0;\n@@ -475,7 +475,7 @@ inline void init_rspq(struct adapter *adap, struct sge_rspq *q,\n \tq->size = size;\n }\n \n-int cfg_queue_count(struct rte_eth_dev *eth_dev)\n+int cxgbe_cfg_queue_count(struct rte_eth_dev *eth_dev)\n {\n \tstruct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);\n \tstruct adapter *adap = pi->adapter;\n@@ -502,7 +502,7 @@ int cfg_queue_count(struct rte_eth_dev *eth_dev)\n \treturn 0;\n }\n \n-void cfg_queues(struct rte_eth_dev *eth_dev)\n+void cxgbe_cfg_queues(struct rte_eth_dev *eth_dev)\n {\n \tstruct rte_config *config = rte_eal_get_configuration();\n \tstruct port_info *pi = (struct port_info *)(eth_dev->data->dev_private);\n@@ -596,7 +596,7 @@ static void setup_memwin(struct adapter *adap)\n \t\t\t\t\tMEMWIN_NIC));\n }\n \n-int init_rss(struct adapter *adap)\n+int cxgbe_init_rss(struct adapter *adap)\n {\n \tunsigned int i;\n \n@@ -623,7 +623,7 @@ int init_rss(struct adapter *adap)\n /**\n * Dump basic information about the adapter.\n */\n-void print_adapter_info(struct adapter *adap)\n+void cxgbe_print_adapter_info(struct adapter *adap)\n {\n \t/**\n \t * Hardware/Firmware/etc. Version/Revision IDs.\n@@ -631,7 +631,7 @@ void print_adapter_info(struct adapter *adap)\n \tt4_dump_version_info(adap);\n }\n \n-void print_port_info(struct adapter *adap)\n+void cxgbe_print_port_info(struct adapter *adap)\n {\n \tint i;\n \tchar buf[80];\n@@ -779,7 +779,7 @@ static void configure_pcie_ext_tag(struct adapter *adapter)\n }\n \n /* Figure out how many Queue Sets we can support */\n-void configure_max_ethqsets(struct adapter *adapter)\n+void cxgbe_configure_max_ethqsets(struct adapter *adapter)\n {\n \tunsigned int ethqsets;\n \n@@ -1268,7 +1268,7 @@ static int adap_init0(struct adapter *adap)\n \tt4_init_tp_params(adap);\n \tconfigure_pcie_ext_tag(adap);\n \tconfigure_vlan_types(adap);\n-\tconfigure_max_ethqsets(adap);\n+\tcxgbe_configure_max_ethqsets(adap);\n \n \tadap->params.drv_memwin = MEMWIN_NIC;\n \tadap->flags |= FW_OK;\n@@ -1322,7 +1322,7 @@ void t4_os_portmod_changed(const struct adapter *adap, int port_id)\n \t\t\t pi->port_id, pi->mod_type);\n }\n \n-inline bool force_linkup(struct adapter *adap)\n+bool cxgbe_force_linkup(struct adapter *adap)\n {\n \tstruct rte_pci_device *pdev = adap->pdev;\n \n@@ -1340,7 +1340,7 @@ inline bool force_linkup(struct adapter *adap)\n *\n * Performs the MAC and PHY actions needed to enable a port.\n */\n-int link_start(struct port_info *pi)\n+int cxgbe_link_start(struct port_info *pi)\n {\n \tstruct adapter *adapter = pi->adapter;\n \tu64 conf_offloads;\n@@ -1382,7 +1382,7 @@ int link_start(struct port_info *pi)\n \t\t\t\t\t true, true, false);\n \t}\n \n-\tif (ret == 0 && force_linkup(adapter))\n+\tif (ret == 0 && cxgbe_force_linkup(adapter))\n \t\tpi->eth_dev->data->dev_link.link_status = ETH_LINK_UP;\n \treturn ret;\n }\n@@ -1490,7 +1490,7 @@ int cxgbe_write_rss(const struct port_info *pi, const u16 *queues)\n * We always configure the RSS mapping for all ports since the mapping\n * table has plenty of entries.\n */\n-int setup_rss(struct port_info *pi)\n+int cxgbe_setup_rss(struct port_info *pi)\n {\n \tint j, err;\n \tstruct adapter *adapter = pi->adapter;\n@@ -1864,10 +1864,10 @@ int cxgbe_probe(struct adapter *adapter)\n \t\t}\n \t}\n \n-\tcfg_queues(adapter->eth_dev);\n+\tcxgbe_cfg_queues(adapter->eth_dev);\n \n-\tprint_adapter_info(adapter);\n-\tprint_port_info(adapter);\n+\tcxgbe_print_adapter_info(adapter);\n+\tcxgbe_print_port_info(adapter);\n \n \tadapter->clipt = t4_init_clip_tbl(adapter->clipt_start,\n \t\t\t\t\t adapter->clipt_end);\n@@ -1909,7 +1909,7 @@ int cxgbe_probe(struct adapter *adapter)\n \t\t\t \"Maskless filter support disabled. Continuing\\n\");\n \t}\n \n-\terr = init_rss(adapter);\n+\terr = cxgbe_init_rss(adapter);\n \tif (err)\n \t\tgoto out_free;\n \ndiff --git a/drivers/net/cxgbe/cxgbevf_main.c b/drivers/net/cxgbe/cxgbevf_main.c\nindex f440b43457e8..0ac2d98ebdd7 100644\n--- a/drivers/net/cxgbe/cxgbevf_main.c\n+++ b/drivers/net/cxgbe/cxgbevf_main.c\n@@ -50,7 +50,7 @@ static void size_nports_qsets(struct adapter *adapter)\n \t\tadapter->params.nports = pmask_nports;\n \t}\n \n-\tconfigure_max_ethqsets(adapter);\n+\tcxgbe_configure_max_ethqsets(adapter);\n \tif (adapter->sge.max_ethqsets < adapter->params.nports) {\n \t\tdev_warn(adapter->pdev_dev, \"only using %d of %d available\"\n \t\t\t \" virtual interfaces (too few Queue Sets)\\n\",\n@@ -268,16 +268,16 @@ int cxgbevf_probe(struct adapter *adapter)\n \t\t}\n \t}\n \n-\tcfg_queues(adapter->eth_dev);\n-\tprint_adapter_info(adapter);\n-\tprint_port_info(adapter);\n+\tcxgbe_cfg_queues(adapter->eth_dev);\n+\tcxgbe_print_adapter_info(adapter);\n+\tcxgbe_print_port_info(adapter);\n \n \tadapter->mpstcam = t4_init_mpstcam(adapter);\n \tif (!adapter->mpstcam)\n \t\tdev_warn(adapter,\n \t\t\t \"VF could not allocate mps tcam table. Continuing\\n\");\n \n-\terr = init_rss(adapter);\n+\terr = cxgbe_init_rss(adapter);\n \tif (err)\n \t\tgoto out_free;\n \treturn 0;\n", "prefixes": [] }