From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72492151CDE; Tue, 20 Feb 2024 20:59:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708462778; cv=none; b=RB/FBK5dBfWnxTeWgv+LzYGJFX+JYIjBkCWxb1DRyugM5niBEzOFJmoHrPfR6RJwRsk+bleWysXLoLrj/pS0CoAJev6KQn/quUMWkkp2E9QNS6O/YnH3JzaQbRJ6PYgC4+itsHh5mKitmGXa/GzJe/BybKikosKAjrmiudDesv8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708462778; c=relaxed/simple; bh=XuZ6G3GqekGmAT0f1I0Ec/zSshL3zOwNscNnaepgDyM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vl/kNkkNcXcfMH55w7Wk6mK6V40y+gYsMlQj+L57nb1kTzajYNU8BrQdoMat4OZvlL3NnWI3PoT3nZvkmiCIXnkUSXXVZ5J1yg3bUmdzPwaHzzHMJ1I/0neILIwu5orKWL4m4u8R4E/oz/eIk2bZZbWvgMVOnP6xvRlbwtGpja4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mtdCSxlg; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="mtdCSxlg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 868E0C433C7; Tue, 20 Feb 2024 20:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708462778; bh=XuZ6G3GqekGmAT0f1I0Ec/zSshL3zOwNscNnaepgDyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mtdCSxlg0ydlKInVZ4nTygc0s/1kgU2KGlvwSkNXvbjLkF5GMNPsb3KuhXPpCkWDm V5lTbCXsoM+ACuxzqQkeZNue1UH4tDA6Fz25yGD+PnGf/q90so/ngYFqF80fmwJOd5 vX8oVu6+oSnFAe0CzQoKncpzDQNHr+meDPLiYUBQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ivan Vecera , Jacob Keller , Wojciech Drewek , Tony Nguyen , Sasha Levin , Pucha Himasekhar Reddy Subject: [PATCH 6.1 033/197] i40e: Fix waiting for queues of all VSIs to be disabled Date: Tue, 20 Feb 2024 21:49:52 +0100 Message-ID: <20240220204842.070366108@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220204841.073267068@linuxfoundation.org> References: <20240220204841.073267068@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ivan Vecera [ Upstream commit c73729b64bb692186da080602cd13612783f52ac ] The function i40e_pf_wait_queues_disabled() iterates all PF's VSIs up to 'pf->hw.func_caps.num_vsis' but this is incorrect because the real number of VSIs can be up to 'pf->num_alloc_vsi' that can be higher. Fix this loop. Fixes: 69129dc39fac ("i40e: Modify Tx disable wait flow in case of DCB reconfiguration") Signed-off-by: Ivan Vecera Reviewed-by: Jacob Keller Reviewed-by: Wojciech Drewek Tested-by: Pucha Himasekhar Reddy (A Contingent worker at Intel) Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/i40e/i40e_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 63d43ef86f9b..76455405a6d8 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c @@ -5333,7 +5333,7 @@ static int i40e_pf_wait_queues_disabled(struct i40e_pf *pf) { int v, ret = 0; - for (v = 0; v < pf->hw.func_caps.num_vsis; v++) { + for (v = 0; v < pf->num_alloc_vsi; v++) { if (pf->vsi[v]) { ret = i40e_vsi_wait_queues_disabled(pf->vsi[v]); if (ret) -- 2.43.0