From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f195.google.com (mail-pf0-f195.google.com [209.85.192.195]) by dpdk.org (Postfix) with ESMTP id 414C51B1A9 for ; Tue, 23 Jan 2018 00:55:17 +0100 (CET) Received: by mail-pf0-f195.google.com with SMTP id k19so8344992pfj.5 for ; Mon, 22 Jan 2018 15:55:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/krfGMuG2pQrom7O0pO6aAyarIesemVthe+1hxG+4Hc=; b=JSR2LK6EFk202bSmWYCorhyDEV1ufxf+HcR14vkZ8nurTGGP/i/rUDtr6Gr2B5DKz8 r+7Y1bbHt3+n5Oa31mObf5xCbU969Reb1O2u2/PoCJJTg5xuhVdVphWPahW3eyii15be ieknEVnL7Wh03RsEttQ0nSC0tK9S8Q22TfuSXIixYr4N+hvM4MMPIeDGmKJklrgkcnQ+ TUCrpn+hEJlnxNb6SsoT1wJW1/sDWM50F0xX/RLgrww94bREKG70WZ6NDJrMqI3NlKMo kdA9hF9ePUf3x7fLss7wJhSrpi7eW8iByGGRF0tld5G/APgGvA3T66WGMJk+eI+FGJzR pgCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=/krfGMuG2pQrom7O0pO6aAyarIesemVthe+1hxG+4Hc=; b=beu8+0lvxOo9uFZbzArhEnFqez4ltAQGSdOshvdTdCBkIrkP6Ouz9xsli7wrYCGTA9 v/VCc7epRJJu1wehvS7AUfvVY96l41KSa41bm5IR+xPkV1pTGgY+mKt6tvtV/79kXlvD povavU8cQejqenstLGIwxeXDGPv0O937hRQ13aNykPZFtZguO/Zqo0fl2g/35EP72rEJ kd361NyWruY46pUQq3aZjxwI390KEk/vygrgFpfWdpbhKLrwlpHLSgYWPaK6EPCuBxoy IehFWtbx+Z87w7Hg3ylGZyFbu3KydFb4ARJYVxO8FYERCFYwpqH8Q7TPuJuTpEcOtuAk PKYA== X-Gm-Message-State: AKwxytfQufmY46iC/CdthSmVj6Wvfq2uVkOzyC2Wd8JQpwIXPGaZU0n8 TYPRSMKzXjbWJAs6Ens+u99XEZ0kK+Q= X-Google-Smtp-Source: AH8x227MlaXlB0DONN8XP7xkr43hPB6zMsslyraNDy4uAxEE4/py0bWeF5pYWOXjANnM8Msw2MrPzg== X-Received: by 10.99.128.66 with SMTP id j63mr7836988pgd.254.1516665316156; Mon, 22 Jan 2018 15:55:16 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id a24sm1623825pff.160.2018.01.22.15.55.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 15:55:15 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 22 Jan 2018 15:54:54 -0800 Message-Id: <20180122235458.28562-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180122235458.28562-1-stephen@networkplumber.org> References: <20180122235458.28562-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v7 11/15] net/liquidio: use rte_eth_linkstatus_set 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: Mon, 22 Jan 2018 23:55:17 -0000 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 | 53 ++++++--------------------------------- 1 file changed, 8 insertions(+), 45 deletions(-) diff --git a/drivers/net/liquidio/lio_ethdev.c b/drivers/net/liquidio/lio_ethdev.c index 843d023383f7..3aabefcbabe2 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,23 +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) { /* 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 */ @@ -982,12 +950,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.15.1