From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C41F1C2D0C6 for ; Fri, 27 Dec 2019 18:05:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 97F1B20CC7 for ; Fri, 27 Dec 2019 18:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577469932; bh=Nip9aVX8e8y6eoB1GOjy/sZosxX8qCKCPq23dD8hLSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RFQMJ3hrB7s3+ANKm6YkEsWpFWTn5yQ2DCTR4/GsBK1In611jE+rhx6tT5lyU07zR Kzst1L6rjeIejVAljSsvFLqfVAgMd+nhbwJdSldYYwoX+vIe3UD6UvWbDiwSa4U54n QDTY3Mb1ESvPGxVGo9Ae3FBUmeGODkEKQfsuhQaY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727984AbfL0SF3 (ORCPT ); Fri, 27 Dec 2019 13:05:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:60174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728454AbfL0SDD (ORCPT ); Fri, 27 Dec 2019 13:03:03 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EDCFB222D9; Fri, 27 Dec 2019 18:03:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1577469782; bh=Nip9aVX8e8y6eoB1GOjy/sZosxX8qCKCPq23dD8hLSo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tQTTOShNu+GrKL/zNoeba+e72XAZgIL9ehjyx3uxEumcph7kOLqUQoxpJcsTbplKM KN7TG+L+me1CSOEPRa4lWaGT8MrRYMc++zKeeTAeu2cCC0ZQGUJtHN9zNcF4Tt7ciw q6n4jqgQEUqwyMiHa2fAyw0LMIhrw+atx4ytMcsY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Manish Chopra , Ariel Elior , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 32/57] bnx2x: Fix logic to get total no. of PFs per engine Date: Fri, 27 Dec 2019 13:01:57 -0500 Message-Id: <20191227180222.7076-32-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191227180222.7076-1-sashal@kernel.org> References: <20191227180222.7076-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Manish Chopra [ Upstream commit ee699f89bdbaa19c399804504241b5c531b48888 ] Driver doesn't calculate total number of PFs configured on a given engine correctly which messed up resources in the PFs loaded on that engine, leading driver to exceed configuration of resources (like vlan filters etc.) beyond the limit per engine, which ended up with asserts from the firmware. Signed-off-by: Manish Chopra Signed-off-by: Ariel Elior Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h index 4e091a11daaf..52bce009d096 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h @@ -1112,7 +1112,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp) for (i = 0; i < E1H_FUNC_MAX / 2; i++) { u32 func_config = MF_CFG_RD(bp, - func_mf_config[BP_PORT(bp) + 2 * i]. + func_mf_config[BP_PATH(bp) + 2 * i]. config); func_num += ((func_config & FUNC_MF_CFG_FUNC_HIDE) ? 0 : 1); -- 2.20.1