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=-20.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 73974C64E7A for ; Tue, 1 Dec 2020 22:43:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 12F42208DB for ; Tue, 1 Dec 2020 22:43:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=nvidia.com header.i=@nvidia.com header.b="PBXoJaO/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726841AbgLAWnu (ORCPT ); Tue, 1 Dec 2020 17:43:50 -0500 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:9922 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726817AbgLAWns (ORCPT ); Tue, 1 Dec 2020 17:43:48 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Tue, 01 Dec 2020 14:42:38 -0800 Received: from sx1.mtl.com (10.124.1.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Tue, 1 Dec 2020 22:42:31 +0000 From: Saeed Mahameed To: Jakub Kicinski CC: "David S. Miller" , , "Maxim Mikityanskiy" , Tariq Toukan , "Saeed Mahameed" Subject: [net-next 15/15] net/mlx5e: Fill mlx5e_create_cq_param in a function Date: Tue, 1 Dec 2020 14:42:08 -0800 Message-ID: <20201201224208.73295-16-saeedm@nvidia.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201224208.73295-1-saeedm@nvidia.com> References: <20201201224208.73295-1-saeedm@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain X-Originating-IP: [10.124.1.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1606862558; bh=Whn4lDkPyispat484yBSmN/X2sDSf2l1kOPBRDEDnO8=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Transfer-Encoding:Content-Type: X-Originating-IP:X-ClientProxiedBy; b=PBXoJaO/Vqei0QRI+I31/fpu+W1c++jWDlKapLIQyp3WxaHYpxPE9dDkPrSDCEYV6 mDM/RJMEyXiLeZFPg34kGTba2He6fymd/r6muRRr9cCRjCEMnhUdNTjYwQApkwigJN 64iwSmscdIfJmWfAucq61P9ESA+IXhHDZO2lpJ9HZLK2oo2tIySpcJVjgDFlCtxZ94 9IryCvIt4Qpn2T8S3LPQD3TQU9Sj1ohY1WFVjpQw438o7ZaAPXgQXgVrupozIkCMjZ DhibU5srCXYfDlSuL5ye9QTIM/hTDZh+smIUuHozKZXcmhFpMiDAQ5vrvc6U4h0q9Q IszSh75z7/Big== Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maxim Mikityanskiy Create a function to fill the fields of struct mlx5e_create_cq_param based on a channel. The purpose is code reuse between normal CQs, XSK CQs and the upcoming QoS CQs. Signed-off-by: Maxim Mikityanskiy Reviewed-by: Tariq Toukan Signed-off-by: Tariq Toukan Signed-off-by: Saeed Mahameed --- .../net/ethernet/mellanox/mlx5/core/en/params.h | 1 + .../ethernet/mellanox/mlx5/core/en/xsk/setup.c | 7 ++----- .../net/ethernet/mellanox/mlx5/core/en_main.c | 17 ++++++++++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h b/drivers/= net/ethernet/mellanox/mlx5/core/en/params.h index 3959254d4181..807147d97a0f 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/params.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/params.h @@ -111,6 +111,7 @@ u16 mlx5e_get_rq_headroom(struct mlx5_core_dev *mdev, =20 /* Build queue parameters */ =20 +void mlx5e_build_create_cq_param(struct mlx5e_create_cq_param *ccp, struct= mlx5e_channel *c); void mlx5e_build_rq_param(struct mlx5e_priv *priv, struct mlx5e_params *params, struct mlx5e_xsk_param *xsk, diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c b/drive= rs/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c index 7703e6553da6..d87c345878d3 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/xsk/setup.c @@ -48,14 +48,11 @@ int mlx5e_open_xsk(struct mlx5e_priv *priv, struct mlx5= e_params *params, struct mlx5e_xsk_param *xsk, struct xsk_buff_pool *pool, struct mlx5e_channel *c) { - struct mlx5e_create_cq_param ccp =3D {}; struct mlx5e_channel_param *cparam; + struct mlx5e_create_cq_param ccp; int err; =20 - ccp.napi =3D &c->napi; - ccp.ch_stats =3D c->stats; - ccp.node =3D cpu_to_node(c->cpu); - ccp.ix =3D c->ix; + mlx5e_build_create_cq_param(&ccp, c); =20 if (!mlx5e_validate_xsk_param(params, xsk, priv->mdev)) return -EINVAL; diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/ne= t/ethernet/mellanox/mlx5/core/en_main.c index 26be6eb44fed..e573a82ce037 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -1806,18 +1806,25 @@ static int mlx5e_set_tx_maxrate(struct net_device *= dev, int index, u32 rate) return err; } =20 +void mlx5e_build_create_cq_param(struct mlx5e_create_cq_param *ccp, struct= mlx5e_channel *c) +{ + *ccp =3D (struct mlx5e_create_cq_param) { + .napi =3D &c->napi, + .ch_stats =3D c->stats, + .node =3D cpu_to_node(c->cpu), + .ix =3D c->ix, + }; +} + static int mlx5e_open_queues(struct mlx5e_channel *c, struct mlx5e_params *params, struct mlx5e_channel_param *cparam) { struct dim_cq_moder icocq_moder =3D {0, 0}; - struct mlx5e_create_cq_param ccp =3D {}; + struct mlx5e_create_cq_param ccp; int err; =20 - ccp.napi =3D &c->napi; - ccp.ch_stats =3D c->stats; - ccp.node =3D cpu_to_node(c->cpu); - ccp.ix =3D c->ix; + mlx5e_build_create_cq_param(&ccp, c); =20 err =3D mlx5e_open_cq(c->priv, icocq_moder, &cparam->icosq.cqp, &ccp, &c->async_icosq.cq); --=20 2.26.2