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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 E21CDC33C9E for ; Sat, 11 Jan 2020 10:26:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3B0E20842 for ; Sat, 11 Jan 2020 10:26:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738389; bh=rhu6SgIU4Jf84dJDb9M6A5CRq7H1WHm+VPuEYMX5PrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=imLtVxK+6700klJC12UaxeqNj8LW5Y8nPtsmPgN446/+A7Zkq6cN+1wslEIIBMe8z ehAXnHPIjtlsbMRmCFlVdqTDK/l9C0O4bSN5upDhBQ2CSs/NysWNcVEODxOUByAGAT Y9ih/x51vmGFSx1Z00xrTUnsyF1doLfgyVLm6YUI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730637AbgAKK03 (ORCPT ); Sat, 11 Jan 2020 05:26:29 -0500 Received: from mail.kernel.org ([198.145.29.99]:59098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729047AbgAKK02 (ORCPT ); Sat, 11 Jan 2020 05:26:28 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 40B5A20842; Sat, 11 Jan 2020 10:26:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738388; bh=rhu6SgIU4Jf84dJDb9M6A5CRq7H1WHm+VPuEYMX5PrY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FyzQV/xKGvMH6z2ds0dB5suV0lGSPil5rhjHuA6IJEIlijMe4WZFTBTjvC0kZixE2 +tsXoJvrbZ1bzAbQcp+eZ/x90B466/BIHqyWBKxoGf+bj97lFVqsBogluCDrJlY16c O20UcUFTui93lKfeaMr7r2CNl7VeYu705Dkr2Ogs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Manish Chopra , Ariel Elior , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.4 084/165] bnx2x: Fix logic to get total no. of PFs per engine Date: Sat, 11 Jan 2020 10:50:03 +0100 Message-Id: <20200111094928.190090958@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094921.347491861@linuxfoundation.org> References: <20200111094921.347491861@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 8b08cb18e363..3f63ffd7561b 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h @@ -1109,7 +1109,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