From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com (mail-pf0-f194.google.com [209.85.192.194]) by dpdk.org (Postfix) with ESMTP id D484A1B372 for ; Tue, 16 Jan 2018 19:26:14 +0100 (CET) Received: by mail-pf0-f194.google.com with SMTP id e76so10128648pfk.1 for ; Tue, 16 Jan 2018 10:26:14 -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=GiwioZ5lmDpg5wyaoq3SOB9xldNWKipN1201d3H6kcY=; b=Gm8eNh5N8/bILK9Vv8t2+5HtVuPyi7VYd784qD7PbQCCevPXf7b5SqVTHLN/KiT6O3 7uKd7+CSRrH28x1kQFyM/iqSkZHquaWtidzJUwMdcXkljki3qy3MQ655eeCib1avAJmT DhvjwAWB+Se4fYKVENmgcNVWya5whtF8ui6kdpexgktTSQkz0CYqUwUxQr/7teCUV5OF EeIcdQITO6V7Og3r8X1fK3tMhlsgWEuGFYlbPDN/2Ei6GVUh3F8a3/y+fzdgzUMflJaW fYzJSl74FuGY6qP1ZOUMhFpPFErCZOkXZ4faV5EkF1CZznPXYLobfeB4spegN/HebwLb u/uw== 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=GiwioZ5lmDpg5wyaoq3SOB9xldNWKipN1201d3H6kcY=; b=j2sw24EdhbAqJn8TPqTwkl33k6/InHaxXYm/kn1bbea7uXkA8ATsa+XVewKuNRsaR3 H3e6HXnmBRCisq8ACS4WTLW02EXOVJ9b8p+pXeJnaKQE3otVMYScBpjwrwgfCYYa15MU QXXOVaUqE/6sgwZcz0WozRCD6OgpqSeFhFJF15JSMqC0+G7X3kJYZio6NFzkFzvUWBlz 36w6Qvu15qI/UMDTvw0d21hWtnrCvXUI+XWJJj/Ekg7cNtuHo00Z0pHY1wG1WZFsJve2 IQRKJ20rzfOgD5f8BgKaD7PL8u39ztrdQm74wo4Mg5zwAu25HC1UXThSQ/GD62pRW1UD IACg== X-Gm-Message-State: AKwxyteunydwDs5DZgd2t9KAaMDBbSAuthtUMYPIsLtFTMeOiNx8A8x5 UV5vJ/JfyI5RAKSZ7pUBzbUFOSFD0sY= X-Google-Smtp-Source: ACJfBotEB9n8zYnXJCcacab9fkjg2VADWP7n4EzjVb30qegkUdJPGy5RtB3aLtj85FrGvjFCTRur2A== X-Received: by 10.99.120.203 with SMTP id t194mr4687374pgc.39.1516127173646; Tue, 16 Jan 2018 10:26:13 -0800 (PST) Received: from xeon-e3.lan (204-195-18-133.wavecable.com. [204.195.18.133]) by smtp.gmail.com with ESMTPSA id x17sm3940497pge.50.2018.01.16.10.26.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jan 2018 10:26:12 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 16 Jan 2018 10:25:52 -0800 Message-Id: <20180116182558.6254-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180116182558.6254-1-stephen@networkplumber.org> References: <20180116182558.6254-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v4 09/15] net/sfc: use new rte_eth_linkstatus 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: Tue, 16 Jan 2018 18:26:15 -0000 Use the new API (_rte_eth_linkstatus_set) to handle link status update. Signed-off-by: Stephen Hemminger --- drivers/net/sfc/sfc_ethdev.c | 21 +++------------------ drivers/net/sfc/sfc_ev.c | 20 ++------------------ 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/drivers/net/sfc/sfc_ethdev.c b/drivers/net/sfc/sfc_ethdev.c index 2f5f86f84877..7b16c51c578c 100644 --- a/drivers/net/sfc/sfc_ethdev.c +++ b/drivers/net/sfc/sfc_ethdev.c @@ -238,22 +238,12 @@ static int sfc_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete) { struct sfc_adapter *sa = dev->data->dev_private; - struct rte_eth_link *dev_link = &dev->data->dev_link; - struct rte_eth_link old_link; struct rte_eth_link current_link; sfc_log_init(sa, "entry"); -retry: - EFX_STATIC_ASSERT(sizeof(*dev_link) == sizeof(rte_atomic64_t)); - *(int64_t *)&old_link = rte_atomic64_read((rte_atomic64_t *)dev_link); - if (sa->state != SFC_ADAPTER_STARTED) { sfc_port_link_mode_to_info(EFX_LINK_UNKNOWN, ¤t_link); - if (!rte_atomic64_cmpset((volatile uint64_t *)dev_link, - *(uint64_t *)&old_link, - *(uint64_t *)¤t_link)) - goto retry; } else if (wait_to_complete) { efx_link_mode_t link_mode; @@ -261,21 +251,16 @@ sfc_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete) link_mode = EFX_LINK_UNKNOWN; sfc_port_link_mode_to_info(link_mode, ¤t_link); - if (!rte_atomic64_cmpset((volatile uint64_t *)dev_link, - *(uint64_t *)&old_link, - *(uint64_t *)¤t_link)) - goto retry; } else { sfc_ev_mgmt_qpoll(sa); - *(int64_t *)¤t_link = - rte_atomic64_read((rte_atomic64_t *)dev_link); + rte_eth_linkstatus_get(dev, ¤t_link); } - if (old_link.link_status != current_link.link_status) + if (rte_eth_linkstatus_set(dev, ¤t_link)) sfc_info(sa, "Link status is %s", current_link.link_status ? "UP" : "DOWN"); - return old_link.link_status == current_link.link_status ? 0 : -1; + return 0; } static void diff --git a/drivers/net/sfc/sfc_ev.c b/drivers/net/sfc/sfc_ev.c index a16dc27b380e..80c249f7526c 100644 --- a/drivers/net/sfc/sfc_ev.c +++ b/drivers/net/sfc/sfc_ev.c @@ -404,27 +404,11 @@ sfc_ev_link_change(void *arg, efx_link_mode_t link_mode) { struct sfc_evq *evq = arg; struct sfc_adapter *sa = evq->sa; - struct rte_eth_link *dev_link = &sa->eth_dev->data->dev_link; struct rte_eth_link new_link; - uint64_t new_link_u64; - uint64_t old_link_u64; - - EFX_STATIC_ASSERT(sizeof(*dev_link) == sizeof(rte_atomic64_t)); sfc_port_link_mode_to_info(link_mode, &new_link); - - new_link_u64 = *(uint64_t *)&new_link; - do { - old_link_u64 = rte_atomic64_read((rte_atomic64_t *)dev_link); - if (old_link_u64 == new_link_u64) - break; - - if (rte_atomic64_cmpset((volatile uint64_t *)dev_link, - old_link_u64, new_link_u64)) { - evq->sa->port.lsc_seq++; - break; - } - } while (B_TRUE); + if (rte_eth_linkstatus_set(sa->eth_dev, &new_link)) + evq->sa->port.lsc_seq++; return B_FALSE; } -- 2.15.1