From patchwork Sat Jan 11 09:49:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 234201 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 89A60C33C9E for ; Sat, 11 Jan 2020 09:57:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5BAF02077C for ; Sat, 11 Jan 2020 09:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736666; bh=5IQQywv2xDBRw4N0f7mJESsiAz5u/PuZxZiBlyv7lsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=up/3NPSUlmf5wjLSOjTVse0/SgyK+8ve54ZuEY1UwWB2kiUY0L4w08uth9k5T2E5l 1lkQCNIwPLiYQKI70Qqs44R3gUDH2neBwwxqv2nUDnBH/iOWszkDq/cemDFsvqanfz NcLlqAgzD/4mkA24VYWkUiy6PVtdsgkOzM2Hzn7M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728837AbgAKJ5p (ORCPT ); Sat, 11 Jan 2020 04:57:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:50328 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728825AbgAKJ5p (ORCPT ); Sat, 11 Jan 2020 04:57:45 -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 CCBCD2077C; Sat, 11 Jan 2020 09:57:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578736665; bh=5IQQywv2xDBRw4N0f7mJESsiAz5u/PuZxZiBlyv7lsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g/nkbz9uEA09W9N5VB3cskjn9ElYEvUJsvHa95JWlA/V1DGh02twG5J8g/aRlhokC CTodqbaCEAO4j4iGV0e3LKF1X9Py9WVBcsnyiV2lhvsF7U3BFOrQIjq5o0Ln6pSuqm FvMbZMqRsgDZdd5OmNe/KqpYQuadMCC33c9ClvtU= 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.4 41/59] bnx2x: Fix logic to get total no. of PFs per engine Date: Sat, 11 Jan 2020 10:49:50 +0100 Message-Id: <20200111094846.292720439@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094835.417654274@linuxfoundation.org> References: <20200111094835.417654274@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 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 b7d32e8412f1..ec2122acc3c1 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h @@ -1107,7 +1107,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);