From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <shemming@brocade.com>
Subject: [dpdk-dev] [PATCH 4/6] e1000: use eth_dev_{get,set}_link
Date: Wed, 14 May 2014 11:55:31 -0700 [thread overview]
Message-ID: <20140514185747.444552895@networkplumber.org> (raw)
In-Reply-To: <20140514185527.771828962@networkplumber.org>
[-- Attachment #1: igb-dev-link.patch --]
[-- Type: text/plain, Size: 5914 bytes --]
New common code can be used, eliminating driver code.
Signed-off-by: Stephen Hemminger <shemming@brocade.com>
--- a/lib/librte_pmd_e1000/em_ethdev.c 2014-05-14 11:26:30.381274255 -0700
+++ b/lib/librte_pmd_e1000/em_ethdev.c 2014-05-14 11:42:25.976657022 -0700
@@ -157,58 +157,6 @@ static struct eth_dev_ops eth_em_ops = {
.mac_addr_remove = eth_em_rar_clear,
};
-/**
- * Atomically reads the link status information from global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_em_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;
-}
-
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_em_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;
-}
-
static int
eth_em_dev_init(__attribute__((unused)) struct eth_driver *eth_drv,
struct rte_eth_dev *eth_dev)
@@ -597,7 +545,7 @@ eth_em_stop(struct rte_eth_dev *dev)
/* clear the recorded link status */
memset(&link, 0, sizeof(link));
- rte_em_dev_atomic_write_link_status(dev, &link);
+ rte_eth_dev_set_link(dev, &link);
}
static void
@@ -916,8 +864,8 @@ eth_em_link_update(struct rte_eth_dev *d
break;
rte_delay_ms(EM_LINK_UPDATE_CHECK_INTERVAL);
}
- memset(&link, 0, sizeof(link));
- rte_em_dev_atomic_read_link_status(dev, &link);
+
+ rte_eth_dev_get_link(dev, &link);
old = link;
/* Now we check if a transition has happened */
@@ -930,7 +878,7 @@ eth_em_link_update(struct rte_eth_dev *d
link.link_duplex = 0;
link.link_status = 0;
}
- rte_em_dev_atomic_write_link_status(dev, &link);
+ rte_eth_dev_set_link(dev, &link);
/* not changed */
if (old.link_status == link.link_status)
@@ -1281,8 +1229,7 @@ eth_em_interrupt_action(struct rte_eth_d
if (ret < 0)
return 0;
- memset(&link, 0, sizeof(link));
- rte_em_dev_atomic_read_link_status(dev, &link);
+ rte_eth_dev_get_link(dev, &link)
if (link.link_status) {
PMD_INIT_LOG(INFO,
" Port %d: Link Up - speed %u Mbps - %s\n",
--- a/lib/librte_pmd_e1000/igb_ethdev.c 2014-05-14 11:26:30.381274255 -0700
+++ b/lib/librte_pmd_e1000/igb_ethdev.c 2014-05-14 11:42:59.512754542 -0700
@@ -215,58 +215,6 @@ static struct eth_dev_ops igbvf_eth_dev_
.tx_queue_release = eth_igb_tx_queue_release,
};
-/**
- * Atomically reads the link status information from global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_igb_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;
-}
-
-/**
- * Atomically writes the link status information into global
- * structure rte_eth_dev.
- *
- * @param dev
- * - Pointer to the structure rte_eth_dev to read from.
- * - Pointer to the buffer to be saved with the link status.
- *
- * @return
- * - On success, zero.
- * - On failure, negative value.
- */
-static inline int
-rte_igb_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;
-}
-
static inline void
igb_intr_enable(struct rte_eth_dev *dev)
{
@@ -864,7 +812,7 @@ eth_igb_stop(struct rte_eth_dev *dev)
/* clear the recorded link status */
memset(&link, 0, sizeof(link));
- rte_igb_dev_atomic_write_link_status(dev, &link);
+ rte_eth_dev_set_link(dev, &link);
}
static void
@@ -890,7 +838,7 @@ eth_igb_close(struct rte_eth_dev *dev)
igb_dev_clear_queues(dev);
memset(&link, 0, sizeof(link));
- rte_igb_dev_atomic_write_link_status(dev, &link);
+ rte_eth_dev_set_link(dev, &link);
}
static int
@@ -1312,8 +1260,8 @@ eth_igb_link_update(struct rte_eth_dev *
break;
rte_delay_ms(IGB_LINK_UPDATE_CHECK_INTERVAL);
}
- memset(&link, 0, sizeof(link));
- rte_igb_dev_atomic_read_link_status(dev, &link);
+
+ rte_eth_dev_get_link(dev, &link);
old = link;
/* Now we check if a transition has happened */
@@ -1326,7 +1274,7 @@ eth_igb_link_update(struct rte_eth_dev *
link.link_duplex = 0;
link.link_status = 0;
}
- rte_igb_dev_atomic_write_link_status(dev, &link);
+ rte_eth_dev_set_link(dev, &link);
/* not changed */
if (old.link_status == link.link_status)
@@ -1718,8 +1666,7 @@ eth_igb_interrupt_action(struct rte_eth_
if (ret < 0)
return 0;
- memset(&link, 0, sizeof(link));
- rte_igb_dev_atomic_read_link_status(dev, &link);
+ rte_eth_dev_get_link(dev, &link);
if (link.link_status) {
PMD_INIT_LOG(INFO,
" Port %d: Link Up - speed %u Mbps - %s\n",
next prev parent reply other threads:[~2014-05-14 18:57 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-14 18:55 [dpdk-dev] [PATCH 0/6] Ethernet driver enhancements Stephen Hemminger
2014-05-14 18:55 ` [dpdk-dev] [PATCH 1/6] Subjec: ethdev: add macro to cover all checksum flags Stephen Hemminger
2014-05-14 18:55 ` [dpdk-dev] [PATCH 2/6] Subjet: ethdev: add common code to atomicly access link Stephen Hemminger
2014-05-15 8:43 ` Ivan Boule
2014-05-14 18:55 ` [dpdk-dev] [PATCH 3/6] ixgbe: use eth_dev_{get,set}_link Stephen Hemminger
2014-05-14 18:55 ` Stephen Hemminger [this message]
2014-05-14 18:55 ` [dpdk-dev] [PATCH 5/6] ether: allow setting mac address Stephen Hemminger
2014-05-15 9:04 ` Ivan Boule
2014-05-21 15:24 ` Ivan Boule
2014-05-14 18:55 ` [dpdk-dev] [PATCH 6/6] vmxnet3: replace Intel driver Stephen Hemminger
2014-05-15 17:14 ` 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=20140514185747.444552895@networkplumber.org \
--to=stephen@networkplumber.org \
--cc=dev@dpdk.org \
--cc=shemming@brocade.com \
/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).