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 2EBC712EBEA; Tue, 25 Jun 2024 09:41: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=1719308498; cv=none; b=J0DUjlpTjqvi66SiSz/sfMInazlezCk3PNf51xvTh4pB6UXy/UHCIFIw/UCPjUm6WRkxw+5Xg3f2LdidJxiTn+AY1TZyutS1frahA+XkoXgzMTJhMRIQ/8fE9eL+aHE1TGysBERgiRZkF6hx/w9LMAhjB5wX2kIVLL/CwCOJN18= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719308498; c=relaxed/simple; bh=nDbBk0aCWFSgaDGzlI7nrYYHg7o4cD2HVDWl0sVZY9M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jmoaedIGey+csrJ5O9Id3b6BXeIOCdbK3HaNsXnSKCqV6nBpOOjbbjjv55qesH32SuLp/6KCuDMi3mEvukNA+ACEDiMiDKn8P1Kl31Q8L7NE8leKpq11lPthfUHZJtN7fWOkviIu6MkJnMJVbLp49TDB3Q5ciiOJqrbLvOUp+fw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=x7X4u6iq; 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="x7X4u6iq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A810DC32781; Tue, 25 Jun 2024 09:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1719308498; bh=nDbBk0aCWFSgaDGzlI7nrYYHg7o4cD2HVDWl0sVZY9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=x7X4u6iqC2CRCUM/W0N6wm8SNM0AYUi3GzOyLrWyr2MAdOixWMzmqHlr25WbBL/UJ U81GotwRSwUoD0xGWBW2rKZSbTXHyNTbYRzb4DrFLf6qn6nc/kpngrwAuZqf/iDpnN PEF/W4unOQodiaXq8pA8L/FGnLsGY4ztOXLtwdGE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Selvin Xavier , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.9 142/250] RDMA/bnxt_re: Fix the max msix vectors macro Date: Tue, 25 Jun 2024 11:31:40 +0200 Message-ID: <20240625085553.509199172@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240625085548.033507125@linuxfoundation.org> References: <20240625085548.033507125@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.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Selvin Xavier [ Upstream commit 056620da899527c14cf36e5019a0decaf4cf0f79 ] bnxt_re no longer decide the number of MSI-x vectors used by itself. Its decided by bnxt_en now. So when bnxt_en changes this value, system crash is seen. Depend on the max value reported by bnxt_en instead of using the its own macros. Fixes: 303432211324 ("bnxt_en: Remove runtime interrupt vector allocation") Signed-off-by: Selvin Xavier Link: https://lore.kernel.org/r/1716195418-11767-1-git-send-email-selvin.xavier@broadcom.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/bnxt_re/bnxt_re.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/infiniband/hw/bnxt_re/bnxt_re.h b/drivers/infiniband/hw/bnxt_re/bnxt_re.h index 9dca451ed5221..6974922e5609a 100644 --- a/drivers/infiniband/hw/bnxt_re/bnxt_re.h +++ b/drivers/infiniband/hw/bnxt_re/bnxt_re.h @@ -107,8 +107,6 @@ struct bnxt_re_gsi_context { struct bnxt_re_sqp_entries *sqp_tbl; }; -#define BNXT_RE_MIN_MSIX 2 -#define BNXT_RE_MAX_MSIX 9 #define BNXT_RE_AEQ_IDX 0 #define BNXT_RE_NQ_IDX 1 #define BNXT_RE_GEN_P5_MAX_VF 64 @@ -168,7 +166,7 @@ struct bnxt_re_dev { struct bnxt_qplib_rcfw rcfw; /* NQ */ - struct bnxt_qplib_nq nq[BNXT_RE_MAX_MSIX]; + struct bnxt_qplib_nq nq[BNXT_MAX_ROCE_MSIX]; /* Device Resources */ struct bnxt_qplib_dev_attr dev_attr; -- 2.43.0