Received: by 2002:a05:6a10:c7c6:0:0:0:0 with SMTP id h6csp1646812pxy; Mon, 2 Aug 2021 07:01:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymS/c29UHT8qORLLnklYd1AioVwjx9ZhyjKehzlgHTgGTd402nlZeDySonVJfA2rUBjro+ X-Received: by 2002:aa7:d541:: with SMTP id u1mr4785953edr.138.1627912918483; Mon, 02 Aug 2021 07:01:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627912918; cv=none; d=google.com; s=arc-20160816; b=CldwYXAhPqxpwLTlU1Zt80AYp2r+aNyLtYUz8Ygr2lFxZAFmLY2ScAKfNfuGmnRz5K b2t0kujwrNgi37V0/wdqMvrA0AEOlRKnP9AWshGK5ehnjBUDuudoiXfqunPvYX0JCGU0 7vv8+/rqO3C/mrRW9HJbdG6ub1NkIZAVseAMCJQbe9wx7XPcfrD/+nOotGKuu5vEnIHk Ua9qCfBGDJZ6YySwj54ptroiOgp08oYX+624wNelL1eUyeTeUPsvapXn4pT8/FB5yZ1s pqWPhq5xMkbxDmiHuz0Hzrg9ySgxRFC+dYG6hQu2EedvVX5gteMwDK1/BmGxqHbqhXdB GLzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4qK1qKgWfEAuX3jvqDQoaPMUUM5BHpO6NwaLeviSJJk=; b=WuRgBzlNZfjogTgt2jmO/+utZTwdh6qTaWaYFzAzXeKwHnxAlrpUum2kekqAikI4JZ etH+JVvu+wXSbffoldP9FyM2dIBSAra2A4ecdepbRddADR+Xl56Wqvta9MByxETgHTjb JRsh+s9Iwfes2HcGuySKk9U6fjYIFtPC2kPpP98YpIiUoYHQ21dun/5OIjwkvASHV+H7 bsrba/z8sOCzsMUjM1MvNTZ+pnuqhhBZ0bDGayi4d7H1OT7ziBrKh6nkdLxLNboWAThI yNfBNJMJIHgdt0kIfrqi/yAuJjSkizHvboZV6iMkARWIYp2Va6G0RrC53MB+rac3G8IT BsVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oqesMmLn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m20si7158975edv.474.2021.08.02.07.01.35; Mon, 02 Aug 2021 07:01:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oqesMmLn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236856AbhHBN76 (ORCPT + 99 others); Mon, 2 Aug 2021 09:59:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:33052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235882AbhHBNyc (ORCPT ); Mon, 2 Aug 2021 09:54:32 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id C6A7260527; Mon, 2 Aug 2021 13:52:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1627912378; bh=zT1pm3HVlnomMr6unaHZszA+IgMFL0pf5w5LxSQZrJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oqesMmLn2SXecAkFXtPD0LxeYW1leGu1zQ5ygWLxsJJ+LVY5Efhfef3ZWQF0qZdDK bv589CuOTqZdqzmW/TExZp7RiVLykqlrgOJOnihWhHpyZ546yemdE4VLyzKE96WkWx hbYgw+kXPmzBp8TvwV+kUUx0l6yKYcvqj11LeBtE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Aleksandr Loktionov , Arkadiusz Kubalewski , Tony Brelinski , Tony Nguyen , Sasha Levin Subject: [PATCH 5.10 33/67] i40e: Fix logic of disabling queues Date: Mon, 2 Aug 2021 15:44:56 +0200 Message-Id: <20210802134340.152228134@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210802134339.023067817@linuxfoundation.org> References: <20210802134339.023067817@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arkadiusz Kubalewski [ Upstream commit 65662a8dcdd01342b71ee44234bcfd0162e195af ] Correct the message flow between driver and firmware when disabling queues. Previously in case of PF reset (due to required reinit after reconfig), the error like: "VSI seid 397 Tx ring 60 disable timeout" could show up occasionally. The error was not a real issue of hardware or firmware, it was caused by wrong sequence of messages invoked by the driver. Fixes: 41c445ff0f48 ("i40e: main driver core") Signed-off-by: Aleksandr Loktionov Signed-off-by: Arkadiusz Kubalewski Tested-by: Tony Brelinski Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/i40e/i40e_main.c | 58 ++++++++++++--------- 1 file changed, 34 insertions(+), 24 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 52e31f712a54..112a18dd13c4 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -4425,11 +4425,10 @@ int i40e_control_wait_tx_q(int seid, struct i40e_pf *pf, int pf_q, } /** - * i40e_vsi_control_tx - Start or stop a VSI's rings + * i40e_vsi_enable_tx - Start a VSI's rings * @vsi: the VSI being configured - * @enable: start or stop the rings **/ -static int i40e_vsi_control_tx(struct i40e_vsi *vsi, bool enable) +static int i40e_vsi_enable_tx(struct i40e_vsi *vsi) { struct i40e_pf *pf = vsi->back; int i, pf_q, ret = 0; @@ -4438,7 +4437,7 @@ static int i40e_vsi_control_tx(struct i40e_vsi *vsi, bool enable) for (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) { ret = i40e_control_wait_tx_q(vsi->seid, pf, pf_q, - false /*is xdp*/, enable); + false /*is xdp*/, true); if (ret) break; @@ -4447,7 +4446,7 @@ static int i40e_vsi_control_tx(struct i40e_vsi *vsi, bool enable) ret = i40e_control_wait_tx_q(vsi->seid, pf, pf_q + vsi->alloc_queue_pairs, - true /*is xdp*/, enable); + true /*is xdp*/, true); if (ret) break; } @@ -4545,32 +4544,25 @@ int i40e_control_wait_rx_q(struct i40e_pf *pf, int pf_q, bool enable) } /** - * i40e_vsi_control_rx - Start or stop a VSI's rings + * i40e_vsi_enable_rx - Start a VSI's rings * @vsi: the VSI being configured - * @enable: start or stop the rings **/ -static int i40e_vsi_control_rx(struct i40e_vsi *vsi, bool enable) +static int i40e_vsi_enable_rx(struct i40e_vsi *vsi) { struct i40e_pf *pf = vsi->back; int i, pf_q, ret = 0; pf_q = vsi->base_queue; for (i = 0; i < vsi->num_queue_pairs; i++, pf_q++) { - ret = i40e_control_wait_rx_q(pf, pf_q, enable); + ret = i40e_control_wait_rx_q(pf, pf_q, true); if (ret) { dev_info(&pf->pdev->dev, - "VSI seid %d Rx ring %d %sable timeout\n", - vsi->seid, pf_q, (enable ? "en" : "dis")); + "VSI seid %d Rx ring %d enable timeout\n", + vsi->seid, pf_q); break; } } - /* Due to HW errata, on Rx disable only, the register can indicate done - * before it really is. Needs 50ms to be sure - */ - if (!enable) - mdelay(50); - return ret; } @@ -4583,29 +4575,47 @@ int i40e_vsi_start_rings(struct i40e_vsi *vsi) int ret = 0; /* do rx first for enable and last for disable */ - ret = i40e_vsi_control_rx(vsi, true); + ret = i40e_vsi_enable_rx(vsi); if (ret) return ret; - ret = i40e_vsi_control_tx(vsi, true); + ret = i40e_vsi_enable_tx(vsi); return ret; } +#define I40E_DISABLE_TX_GAP_MSEC 50 + /** * i40e_vsi_stop_rings - Stop a VSI's rings * @vsi: the VSI being configured **/ void i40e_vsi_stop_rings(struct i40e_vsi *vsi) { + struct i40e_pf *pf = vsi->back; + int pf_q, err, q_end; + /* When port TX is suspended, don't wait */ if (test_bit(__I40E_PORT_SUSPENDED, vsi->back->state)) return i40e_vsi_stop_rings_no_wait(vsi); - /* do rx first for enable and last for disable - * Ignore return value, we need to shutdown whatever we can - */ - i40e_vsi_control_tx(vsi, false); - i40e_vsi_control_rx(vsi, false); + q_end = vsi->base_queue + vsi->num_queue_pairs; + for (pf_q = vsi->base_queue; pf_q < q_end; pf_q++) + i40e_pre_tx_queue_cfg(&pf->hw, (u32)pf_q, false); + + for (pf_q = vsi->base_queue; pf_q < q_end; pf_q++) { + err = i40e_control_wait_rx_q(pf, pf_q, false); + if (err) + dev_info(&pf->pdev->dev, + "VSI seid %d Rx ring %d dissable timeout\n", + vsi->seid, pf_q); + } + + msleep(I40E_DISABLE_TX_GAP_MSEC); + pf_q = vsi->base_queue; + for (pf_q = vsi->base_queue; pf_q < q_end; pf_q++) + wr32(&pf->hw, I40E_QTX_ENA(pf_q), 0); + + i40e_vsi_wait_queues_disabled(vsi); } /** -- 2.30.2