From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 8E83BA051C
for <public@inbox.dpdk.org>; Tue, 11 Feb 2020 12:24:54 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 863782B9C;
Tue, 11 Feb 2020 12:24:54 +0100 (CET)
Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com
[209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 4DD692B9C
for <stable@dpdk.org>; Tue, 11 Feb 2020 12:24:53 +0100 (CET)
Received: by mail-wm1-f68.google.com with SMTP id a6so3065278wme.2
for <stable@dpdk.org>; Tue, 11 Feb 2020 03:24:53 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=s3t+36JUeL7wM/FDv9/FQpUHDgt11j3WrHgHnkWGzYg=;
b=HnrqKeDZNJ5IRf7ikRw7U+xWOXFoVW/TV5zE4uLhMEi5JXb99A4wsCFXpp23hpxsoa
ccqMw4FFzYTpBvEZyX2OO4XiMW93rpBnDmrVBjV5R79itM2KOdkp5k1PsV+218PO+wZG
+VFpmUny6LKaqH4q09mYU42wbdSBxdfYrNfM0IY3NLmTi+pLAZ6ZNpIvWuP6WwAv8ndl
mKg0xnERHv98nqF+4J0oG/lBqdf8SCSDxgrVrEBzo2cFzq52e5EkThbgGvZ9uRXD3SIE
FwZV5k902YIt47o152t+68NdnEaLC/AiwR6iLiqEhbEJIHRp6dXH76ZryAcqcB2P1wrM
jQiw==
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:mime-version:content-transfer-encoding;
bh=s3t+36JUeL7wM/FDv9/FQpUHDgt11j3WrHgHnkWGzYg=;
b=fzgt44opKSbb+GI3tyFPOWDQ2/j+6ZBfvAG9cBljLvfT6v2ruhsLZphH/3oVTM0x8h
QJj9q40PD2qmenD3zKqif9vQZOiK1M7wTKULbiRbB+EZ8+654TKpA9Lnal0R2mXstCxa
6nW2xiW+UUoLrLPdgDBeXipzNkLS9lykGqPG04gquiZbmWHKTwRxS9Xqhi54QroqOBD/
HD63BYufH32YDBcu23hAo+Bqj09k92KF1mjiC/TItTJ5H2j+9IUiKyrRl7mk6GoyDI49
sFrdPbpJymXIvgOo9w1NgUy151GON8LWauwgWPQ64VmnWc2yMcTpXOD72eFd4SsHOrL6
jtoQ==
X-Gm-Message-State: APjAAAWljQAJkprcwSc/dXWokuxIqptTX+uYH7WazRdBeWHdjew2P0aC
9QIVnp3d4lqMUtVtao1SkXZaAnaCyvc=
X-Google-Smtp-Source: APXvYqz9E6pSD1KR7o4wN2t7WcOWeSXdmezCKEgREpSehNCR1rrEvRK0XiLhEvUlSEMVA3duc9oPrQ==
X-Received: by 2002:a7b:cb8e:: with SMTP id m14mr5312002wmi.66.1581420293046;
Tue, 11 Feb 2020 03:24:53 -0800 (PST)
Received: from localhost ([88.98.246.218])
by smtp.gmail.com with ESMTPSA id y185sm3557322wmg.2.2020.02.11.03.24.52
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 11 Feb 2020 03:24:52 -0800 (PST)
From: luca.boccassi@gmail.com
To: Lunyuan Cui <lunyuanx.cui@intel.com>
Cc: Xiaolong Ye <xiaolong.ye@intel.com>,
Konstantin Ananyev <konstantin.ananyev@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Tue, 11 Feb 2020 11:19:42 +0000
Message-Id: <20200211112216.3929-36-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com>
References: <20200211112216.3929-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/ixgbe: fix link up in FreeBSD' has been
queued to stable release 19.11.1
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 19.11.1
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Thanks.
Luca Boccassi
---
>From fa44fc9e922a653453e32a23c5371d38ba21ceff Mon Sep 17 00:00:00 2001
From: Lunyuan Cui <lunyuanx.cui@intel.com>
Date: Mon, 16 Dec 2019 02:24:18 +0000
Subject: [PATCH] net/ixgbe: fix link up in FreeBSD
[ upstream commit ba7b12dd64e4e08f52ce9dd62f7c52f6fc455e10 ]
In FreeBSD environment, nic_uio drivers do not support interrupts,
rte_intr_callback_register() will fail to register interrupts.
We cannot make link status to change from down to up by interrupt
callback. So we need to wait for the controller to acquire link
when ports start. Through multiple tests, 5s should be enough.
Fixes: b9bd0f09fa15 ("ethdev: fix link status query")
Signed-off-by: Lunyuan Cui <lunyuanx.cui@intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
drivers/net/ixgbe/ixgbe_ethdev.c | 36 ++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index a3f550c534..fba8c51595 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -378,6 +378,7 @@ static int ixgbe_dev_udp_tunnel_port_del(struct rte_eth_dev *dev,
struct rte_eth_udp_tunnel *udp_tunnel);
static int ixgbe_filter_restore(struct rte_eth_dev *dev);
static void ixgbe_l2_tunnel_conf(struct rte_eth_dev *dev);
+static int ixgbe_wait_for_link_up(struct ixgbe_hw *hw);
/*
* Define VF Stats MACRO for Non "cleared on read" register
@@ -2801,6 +2802,11 @@ skip_link_setup:
"please call hierarchy_commit() "
"before starting the port");
+ /* wait for the controller to acquire link */
+ err = ixgbe_wait_for_link_up(hw);
+ if (err)
+ goto error;
+
/*
* Update link status right before return, because it may
* start link configuration process in a separate thread.
@@ -4114,6 +4120,36 @@ ixgbe_dev_setup_link_alarm_handler(void *param)
intr->flags &= ~IXGBE_FLAG_NEED_LINK_CONFIG;
}
+/*
+ * In freebsd environment, nic_uio drivers do not support interrupts,
+ * rte_intr_callback_register() will fail to register interrupts.
+ * We can not make link status to change from down to up by interrupt
+ * callback. So we need to wait for the controller to acquire link
+ * when ports start.
+ * It returns 0 on link up.
+ */
+static int
+ixgbe_wait_for_link_up(struct ixgbe_hw *hw)
+{
+#ifdef RTE_EXEC_ENV_FREEBSD
+ const int nb_iter = 25;
+#else
+ const int nb_iter = 0;
+#endif
+ int err, i, link_up = 0;
+ uint32_t speed = 0;
+
+ for (i = 0; i < nb_iter; i++) {
+ err = ixgbe_check_link(hw, &speed, &link_up, 0);
+ if (err)
+ return err;
+ if (link_up)
+ return 0;
+ msec_delay(200);
+ }
+ return 0;
+}
+
/* return 0 means link status changed, -1 means not changed */
int
ixgbe_dev_link_update_share(struct rte_eth_dev *dev,
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-02-11 11:17:40.391637479 +0000
+++ 0036-net-ixgbe-fix-link-up-in-FreeBSD.patch 2020-02-11 11:17:38.368000748 +0000
@@ -1,8 +1,10 @@
-From ba7b12dd64e4e08f52ce9dd62f7c52f6fc455e10 Mon Sep 17 00:00:00 2001
+From fa44fc9e922a653453e32a23c5371d38ba21ceff Mon Sep 17 00:00:00 2001
From: Lunyuan Cui <lunyuanx.cui@intel.com>
Date: Mon, 16 Dec 2019 02:24:18 +0000
Subject: [PATCH] net/ixgbe: fix link up in FreeBSD
+[ upstream commit ba7b12dd64e4e08f52ce9dd62f7c52f6fc455e10 ]
+
In FreeBSD environment, nic_uio drivers do not support interrupts,
rte_intr_callback_register() will fail to register interrupts.
We cannot make link status to change from down to up by interrupt
@@ -10,7 +12,6 @@
when ports start. Through multiple tests, 5s should be enough.
Fixes: b9bd0f09fa15 ("ethdev: fix link status query")
-Cc: stable@dpdk.org
Signed-off-by: Lunyuan Cui <lunyuanx.cui@intel.com>
Acked-by: Xiaolong Ye <xiaolong.ye@intel.com>