From patchwork Fri Sep 1 08:06:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 28236 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 25A7399A1; Fri, 1 Sep 2017 10:08:15 +0200 (CEST) Received: from mail-wm0-f52.google.com (mail-wm0-f52.google.com [74.125.82.52]) by dpdk.org (Postfix) with ESMTP id 9DD617CE8 for ; Fri, 1 Sep 2017 10:08:08 +0200 (CEST) Received: by mail-wm0-f52.google.com with SMTP id 187so3719954wmn.1 for ; Fri, 01 Sep 2017 01:08:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=99DaHs6FFll15gDBN3WiNtrVwzzRuP1GCSDteEFmv/s=; b=pPmRBlqIhqUQgSIdzqLxn0HHyBNgwBNDRXl2/29dygIwobAbzw/o4j52rn4XNjIcSl /4fntD7PMBX9L65rzU5M2jwDvKiTk2VZCU2yFbCLLWQpxi8HujNDGtDywvKGuzvjwfaG AUrqFF/3L5kcO3l95gI4MsUGCxp9kxsn/zxKkqofogdSIjhk5tdwS5CyT9Hwm5Fn3s2P ROPoonZBEMGs7NTWSjxiGL3/0sqBb4H5DIBJzQlyHPa1jB71J8v/ACayJASJMjUnP2z7 BKmX3oRGgiIEKH77WAs3zmMhTFukPloKp23OcEWBzRBGHbLfRai38O4H01F9vBeQorVH vcRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=99DaHs6FFll15gDBN3WiNtrVwzzRuP1GCSDteEFmv/s=; b=DEQ8ErLANK2k3/WG7PvaG7AoGA1An8S1IYdsWzyk2H099pS+V/aheOE1TgiQ1GE5dy pw+dCMPlwGvKQmJb86Xf89NFfUQ7uGiGEOFHPAtQAYeVADdowRfQGq5uuTtj80JDWBkm 1+X+4CbsAFuDXNr+3e2apclS+4VOKRws8I+LNAEGVYlt5357NwCbyjelEOit11z2Wqt7 gVcl1b7ZGGhOE/xJaEViS4bwSjeraTBlgnOhdxR26VGNpQGV/HqFy4zJXG1eE0Npu690 FL9W89H3arnE9ktrcDPOne1DwoQHdj2dyLp4S/e8rXi1qwDxKAfXS7xzT2atsII2pudX rq5g== X-Gm-Message-State: AHPjjUhvDEnYyuTUPkiohoL4BBFirFjNCj3bf4B8dklAS8bEzBjOR6FS wDsgmiu9IeyLdCjRZ+E= X-Google-Smtp-Source: ADKCNb5Hlq6+TrINGbpvN8iyyHLOITv0Xibc7pT2Ut5DH1Ij05V5av2eRve2kI90uBdCtus2D7jjaA== X-Received: by 10.28.140.205 with SMTP id o196mr527774wmd.44.1504253288159; Fri, 01 Sep 2017 01:08:08 -0700 (PDT) Received: from 6wind.com (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id y23sm1434519wry.5.2017.09.01.01.08.07 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Sep 2017 01:08:07 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Fri, 1 Sep 2017 10:06:51 +0200 Message-Id: <76c39ee4c54067d32a7ac80cad8b54c113ec5bcc.1504252977.git.adrien.mazarguil@6wind.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2 36/51] net/mlx4: rename alarm field 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Make clear this field is related to interrupt handling. Signed-off-by: Adrien Mazarguil --- drivers/net/mlx4/mlx4.c | 14 +++++++------- drivers/net/mlx4/mlx4.h | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 21762cc..42606ed 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -2720,10 +2720,10 @@ priv_dev_status_handler(struct priv *priv, struct rte_eth_dev *dev, mlx4_link_update(dev, 0); if (((link->link_speed == 0) && link->link_status) || ((link->link_speed != 0) && !link->link_status)) { - if (!priv->pending_alarm) { + if (!priv->intr_alarm) { /* Inconsistent status, check again later. */ - priv->pending_alarm = 1; - rte_eal_alarm_set(MLX4_ALARM_TIMEOUT_US, + priv->intr_alarm = 1; + rte_eal_alarm_set(MLX4_INTR_ALARM_TIMEOUT, mlx4_dev_link_status_handler, dev); } @@ -2747,8 +2747,8 @@ mlx4_dev_link_status_handler(void *arg) uint32_t events; int ret; - assert(priv->pending_alarm == 1); - priv->pending_alarm = 0; + assert(priv->intr_alarm == 1); + priv->intr_alarm = 0; ret = priv_dev_status_handler(priv, dev, &events); if (ret > 0 && events & (1 << RTE_ETH_EVENT_INTR_LSC)) _rte_eth_dev_callback_process(dev, RTE_ETH_EVENT_INTR_LSC, @@ -2917,14 +2917,14 @@ priv_dev_link_interrupt_handler_uninstall(struct priv *priv, if (ret) return ret; } - if (priv->pending_alarm) + if (priv->intr_alarm) if (rte_eal_alarm_cancel(mlx4_dev_link_status_handler, dev)) { ERROR("rte_eal_alarm_cancel failed " " (rte_errno: %s)", strerror(rte_errno)); return -rte_errno; } - priv->pending_alarm = 0; + priv->intr_alarm = 0; return 0; } diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index ce827aa..47ea409 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -63,8 +63,8 @@ #define MLX4_PMD_TX_MP_CACHE 8 #endif -/* Alarm timeout. */ -#define MLX4_ALARM_TIMEOUT_US 100000 +/* Interrupt alarm timeout value in microseconds. */ +#define MLX4_INTR_ALARM_TIMEOUT 100000 /* Port parameter. */ #define MLX4_PMD_PORT_KVARG "port" @@ -162,7 +162,7 @@ struct priv { uint8_t port; /* Physical port number. */ unsigned int started:1; /* Device started, flows enabled. */ unsigned int vf:1; /* This is a VF device. */ - unsigned int pending_alarm:1; /* An alarm is pending. */ + unsigned int intr_alarm:1; /* An interrupt alarm is scheduled. */ unsigned int isolated:1; /* Toggle isolated mode. */ /* RX/TX queues. */ unsigned int rxqs_n; /* RX queues array size. */