From patchwork Tue Aug 1 16:54:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrien Mazarguil X-Patchwork-Id: 27351 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 B63EAA281; Tue, 1 Aug 2017 18:56:08 +0200 (CEST) Received: from mail-wr0-f171.google.com (mail-wr0-f171.google.com [209.85.128.171]) by dpdk.org (Postfix) with ESMTP id 15208A174 for ; Tue, 1 Aug 2017 18:55:40 +0200 (CEST) Received: by mail-wr0-f171.google.com with SMTP id v105so9279390wrb.0 for ; Tue, 01 Aug 2017 09:55:40 -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=hf6fSMcgLT1BAlZITQAiOp+OSdQHzNu4PkoZzW83E50=; b=kWft6Hik3nV5Exym7WSmMJZy6q+fqgHIgiuDr8fRtNoCDhuc6/7EKkB2QqH+g+Ft3P LVJdVJu9xcHlxIFWHj0GOBfopDihM/CPbyDqySpfWC3BiWsuU9yO2cuRCwhbCjN7D0hw 9DDTru58J71ODN4yQozkIajT2WSt04M+KvOdpEYD5qOVDvkwJj/LHEoUsDUvsq4TF3qY 0B918Gt3voGWSFxbguCub4lV7JEet8m577pqwpgDbn9U9YQJhoHjx+XB4J8UIpbC2ih7 wcaC/1D7peO/8LXd45mw47yTWgdxfbY9ROu/6myzEUfKP4HkUhHfNaz5h5V/oxYF5/em nfBQ== 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=hf6fSMcgLT1BAlZITQAiOp+OSdQHzNu4PkoZzW83E50=; b=eNK4b5olI+dW0H384pDXLQtbK0geshxYG0qPX0iSszRgQk9PD5eDrv5aCkSNbTGUoD HHFA9CrCOtU07qPxd13sCDks+xQWDwDskvtxwee6oSD6QYYmd7SGLNfoh9GIbCyPo9EX vJLUZTt/ERXTA/Teqye76vYXZosqMxvaPKXs7qvljfUpvQFk1YIOuzmX5OCNVAefaAZo +qvZ26oVdKoxMYrrUNplojuxD+AtqdzvyN9qelBg9mCcMj1eEp1/NuxmlSu4Y9NgM3BT ACDnGvOswfcVV9JrajBVK6AyVsh6usbWPM02/e0artVy1s0r+vvH1yoXn3zOFsIbwGyf JJ5w== X-Gm-Message-State: AIVw112UNYTJURLoPbY6rkXLImaPBLURqtlUa85Ukl1YfWq7i3ixdQkV frAJAiz2ryxoLvVtmRY= X-Received: by 10.223.183.12 with SMTP id l12mr14597318wre.103.1501606540467; Tue, 01 Aug 2017 09:55:40 -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 r30sm28997287wrc.95.2017.08.01.09.55.39 for (version=TLS1_2 cipher=AES128-SHA bits=128/128); Tue, 01 Aug 2017 09:55:39 -0700 (PDT) From: Adrien Mazarguil To: dev@dpdk.org Date: Tue, 1 Aug 2017 18:54:22 +0200 Message-Id: X-Mailer: git-send-email 2.1.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v1 35/48] 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 7fc9b4c..9f1eb4e 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -2791,10 +2791,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); } @@ -2818,8 +2818,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, @@ -2988,14 +2988,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 087c831..ed0e6cd 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. */