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 62409C33C9E for ; Sat, 11 Jan 2020 10:05:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3862B2084D for ; Sat, 11 Jan 2020 10:05:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737114; bh=ZiKqarfD7gvBtHxUSYxjAwSapGh97upDC3yH7c6GbzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o8QnUEIu6gURDrB0NLU0+aKYEI1R0shKUn9v1ptQ0NOxLnWDuTQu4BrcJ3++6Fqjo +EIQLhT1D9XqsY9m9iFZ4BnBwi0UzaW8S1k2Dji5cfH0HvSKro7ZiUKCqUBSHZJ7Dc kcJyLZauvEFW3r82ylrRuLQ/pJYhnPqlgQrQdUTA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729216AbgAKKFN (ORCPT ); Sat, 11 Jan 2020 05:05:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:38170 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728907AbgAKKFN (ORCPT ); Sat, 11 Jan 2020 05:05:13 -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 E99312084D; Sat, 11 Jan 2020 10:05:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578737112; bh=ZiKqarfD7gvBtHxUSYxjAwSapGh97upDC3yH7c6GbzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qChkB7dUNqQM643vemX8/Uyf7KWp8nhKzD67wsW81/0Y798fsj12hz5m1kmUc5yV1 JqAI64NRTY2yvJW77XdotOdPkCkXZt0scJvGRkvXkWz9LWr1ISyYTBXeCxegRZVjhj 2P5bg4bOodryY4sYWIWegLnn02TNgRZWZudLdwHk= 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 4.9 69/91] bnx2x: Fix logic to get total no. of PFs per engine Date: Sat, 11 Jan 2020 10:50:02 +0100 Message-Id: <20200111094910.408624679@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094844.748507863@linuxfoundation.org> References: <20200111094844.748507863@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 2ec1c43270b7..bb36312c9696 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