From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>
Subject: [dpdk-dev] [PATCH v5 10/15] net/i40e: use rte_eth_linkstatus functions
Date: Tue, 16 Jan 2018 10:37:50 -0800 [thread overview]
Message-ID: <20180116183755.24542-11-stephen@networkplumber.org> (raw)
In-Reply-To: <20180116183755.24542-1-stephen@networkplumber.org>
Use new rte_linkstatus update API
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/i40e/i40e_ethdev.c | 43 +++++----------------------------------
drivers/net/i40e/i40e_ethdev_vf.c | 18 ++--------------
2 files changed, 7 insertions(+), 54 deletions(-)
diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index fc386154f0b9..517918624658 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -627,34 +627,6 @@ static struct rte_pci_driver rte_i40e_pmd = {
.remove = eth_i40e_pci_remove,
};
-static inline int
-rte_i40e_dev_atomic_read_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = link;
- struct rte_eth_link *src = &(dev->data->dev_link);
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
-static inline int
-rte_i40e_dev_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &(dev->data->dev_link);
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
RTE_PMD_REGISTER_PCI(net_i40e, rte_i40e_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map);
RTE_PMD_REGISTER_KMOD_DEP(net_i40e, "* igb_uio | uio_pci_generic | vfio-pci");
@@ -2327,17 +2299,16 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
#define MAX_REPEAT_TIME 10 /* 1s (10 * 100ms) in total */
struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct i40e_link_status link_status;
- struct rte_eth_link link, old;
+ struct rte_eth_link link;
int status;
unsigned rep_cnt = MAX_REPEAT_TIME;
bool enable_lse = dev->data->dev_conf.intr_conf.lsc ? true : false;
memset(&link, 0, sizeof(link));
- memset(&old, 0, sizeof(old));
- memset(&link_status, 0, sizeof(link_status));
- rte_i40e_dev_atomic_read_link_status(dev, &old);
do {
+ memset(&link_status, 0, sizeof(link_status));
+
/* Get link status information from hardware */
status = i40e_aq_get_link_info(hw, enable_lse,
&link_status, NULL);
@@ -2390,10 +2361,7 @@ i40e_dev_link_update(struct rte_eth_dev *dev,
ETH_LINK_SPEED_FIXED);
out:
- rte_i40e_dev_atomic_write_link_status(dev, &link);
- if (link.link_status == old.link_status)
- return -1;
-
+ rte_eth_linkstatus_set(dev, &link);
i40e_notify_all_vfs_link_status(dev);
return 0;
@@ -9854,9 +9822,8 @@ i40e_start_timecounters(struct rte_eth_dev *dev)
uint32_t tsync_inc_h;
/* Get current link speed. */
- memset(&link, 0, sizeof(link));
i40e_dev_link_update(dev, 1);
- rte_i40e_dev_atomic_read_link_status(dev, &link);
+ rte_eth_linkstatus_get(dev, &link);
switch (link.link_speed) {
case ETH_SPEED_NUM_40G:
diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index b96d77a0caed..0605fc107240 100644
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -1034,20 +1034,6 @@ static const struct rte_pci_id pci_id_i40evf_map[] = {
{ .vendor_id = 0, /* sentinel */ },
};
-static inline int
-i40evf_dev_atomic_write_link_status(struct rte_eth_dev *dev,
- struct rte_eth_link *link)
-{
- struct rte_eth_link *dst = &(dev->data->dev_link);
- struct rte_eth_link *src = link;
-
- if (rte_atomic64_cmpset((uint64_t *)dst, *(uint64_t *)dst,
- *(uint64_t *)src) == 0)
- return -1;
-
- return 0;
-}
-
/* Disable IRQ0 */
static inline void
i40evf_disable_irq0(struct i40e_hw *hw)
@@ -2069,6 +2055,7 @@ i40evf_dev_link_update(struct rte_eth_dev *dev,
* while Linux driver does not
*/
+ memset(&new_link, 0, sizeof(new_link));
/* Linux driver PF host */
switch (vf->link_speed) {
case I40E_LINK_SPEED_100MB:
@@ -2100,8 +2087,7 @@ i40evf_dev_link_update(struct rte_eth_dev *dev,
new_link.link_autoneg =
dev->data->dev_conf.link_speeds & ETH_LINK_SPEED_FIXED;
- i40evf_dev_atomic_write_link_status(dev, &new_link);
-
+ rte_eth_linkstatus_set(dev, &new_link);
return 0;
}
--
2.15.1
next prev parent reply other threads:[~2018-01-16 18:38 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-16 18:37 [dpdk-dev] [PATCH v5 00/15] common ethdev linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 01/15] eal: introduce atomic exchange operation Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 02/15] ethdev: add linkstatus get/set helper functions Stephen Hemminger
2018-01-17 7:49 ` Andrew Rybchenko
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 03/15] net/virtio: use eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 04/15] net/vmxnet3: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 05/15] net/dpaa2: " Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 06/15] net/nfp: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 07/15] net/e1000: use rte_eth_linkstatus helpers Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 08/15] net/ixgbe: use rte_eth_linkstatus functions Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 09/15] net/sfc: use new " Stephen Hemminger
2018-01-16 18:37 ` Stephen Hemminger [this message]
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 11/15] net/liquidio: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 12/15] net/thunderx: " Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 13/15] net/szedata: use _rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 14/15] net/octeontx: use rte_eth_linkstatus_set Stephen Hemminger
2018-01-16 18:37 ` [dpdk-dev] [PATCH v5 15/15] net/enic: " Stephen Hemminger
2018-01-17 5:19 ` [dpdk-dev] [PATCH v5 00/15] common ethdev linkstatus functions Shreyansh Jain
2018-01-17 7:56 ` Andrew Rybchenko
2018-01-17 14:32 ` Ferruh Yigit
2018-01-17 16:05 ` Stephen Hemminger
2018-01-17 16:18 ` Ferruh Yigit
2018-01-19 16:35 ` Ferruh Yigit
2018-01-21 18:35 ` Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 01/14] eal: introduce atomic exchange operation Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 02/14] ethdev: add linkstatus get/set helper functions Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 03/14] net/virtio: use ethdev linkstatus " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 04/14] net/vmxnet3: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 05/14] net/dpaa2: " Ferruh Yigit
2018-01-22 12:28 ` Shreyansh Jain
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 06/14] net/nfp: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 07/14] net/e1000: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 08/14] net/ixgbe: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 09/14] net/i40e: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 10/14] net/liquidio: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 11/14] net/thunderx: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 12/14] net/szedata2: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 13/14] net/octeontx: " Ferruh Yigit
2018-01-21 18:59 ` [dpdk-dev] [PATCH v6 14/14] net/enic: " Ferruh Yigit
2018-01-21 19:25 ` [dpdk-dev] [PATCH v6 01/14] eal: introduce atomic exchange operation Ferruh Yigit
2018-01-21 23:50 ` Thomas Monjalon
2018-01-22 16:56 ` Stephen Hemminger
2018-01-22 21:03 ` Thomas Monjalon
2018-01-22 21:48 ` Stephen Hemminger
2018-01-22 22:09 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180116183755.24542-11-stephen@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).