From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 196621B00C for ; Sun, 21 Jan 2018 20:00:20 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Jan 2018 11:00:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,392,1511856000"; d="scan'208";a="28253682" Received: from silpixa00372839.ir.intel.com (HELO silpixa00372839.ger.corp.intel.com) ([10.237.222.154]) by orsmga002.jf.intel.com with ESMTP; 21 Jan 2018 11:00:18 -0800 From: Ferruh Yigit To: Bruce Richardson , Konstantin Ananyev , Shijith Thotton , Srisivasubramanian Srinivasan Cc: dev@dpdk.org, Ferruh Yigit , Stephen Hemminger Date: Sun, 21 Jan 2018 18:59:52 +0000 Message-Id: <20180121185956.32970-10-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180121185956.32970-1-ferruh.yigit@intel.com> References: <20180116183755.24542-1-stephen@networkplumber.org> <20180121185956.32970-1-ferruh.yigit@intel.com> Subject: [dpdk-dev] [PATCH v6 10/14] net/liquidio: use ethdev linkstatus helper functions 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: , X-List-Received-Date: Sun, 21 Jan 2018 19:00:21 -0000 From: Stephen Hemminger Use the new link update API, and cleanup the logic in the the link update routine. Signed-off-by: Stephen Hemminger Tested-by: Shijith Thotton Reviewed-by: Ferruh Yigit --- drivers/net/liquidio/lio_ethdev.c | 56 +++++++-------------------------------- 1 file changed, 9 insertions(+), 47 deletions(-) diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c index 8f6ef6381..9adbcc12c 100644 --- a/drivers/net/liquidio/lio_ethdev.c +++ b/drivers/net/liquidio/lio_ethdev.c @@ -904,32 +904,6 @@ lio_dev_vlan_filter_set(struct rte_eth_dev *eth_dev, uint16_t vlan_id, int on) return 0; } -/** - * Atomically writes the link status information into global - * structure rte_eth_dev. - * - * @param eth_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 -lio_dev_atomic_write_link_status(struct rte_eth_dev *eth_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 uint64_t lio_hweight64(uint64_t w) { @@ -949,24 +923,17 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev, int wait_to_complete __rte_unused) { struct lio_device *lio_dev = LIO_DEV(eth_dev); - struct rte_eth_link link, old; - - /* Initialize */ - link.link_status = ETH_LINK_DOWN; - link.link_speed = ETH_SPEED_NUM_NONE; - link.link_duplex = ETH_LINK_HALF_DUPLEX; - link.link_autoneg = ETH_LINK_AUTONEG; - memset(&old, 0, sizeof(old)); + struct rte_eth_link link = { + .link_status = ETH_LINK_DOWN, + .link_speed = ETH_SPEED_NUM_NONE, + .link_duplex = ETH_LINK_HALF_DUPLEX, + .link_autoneg = ETH_LINK_AUTONEG, + }; /* Return what we found */ - if (lio_dev->linfo.link.s.link_up == 0) { + if (lio_dev->linfo.link.s.link_up == 0) /* Interface is down */ - if (lio_dev_atomic_write_link_status(eth_dev, &link)) - return -1; - if (link.link_status == old.link_status) - return -1; - return 0; - } + return rte_eth_linkstatus_set(eth_dev, &link); link.link_status = ETH_LINK_UP; /* Interface is up */ link.link_duplex = ETH_LINK_FULL_DUPLEX; @@ -982,12 +949,7 @@ lio_dev_link_update(struct rte_eth_dev *eth_dev, link.link_duplex = ETH_LINK_HALF_DUPLEX; } - if (lio_dev_atomic_write_link_status(eth_dev, &link)) - return -1; - - if (link.link_status == old.link_status) - return -1; - + rte_eth_linkstatus_set(eth_dev, &link); return 0; } -- 2.14.3