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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS 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 70989C169C4 for ; Mon, 11 Feb 2019 19:51:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 331A321B68 for ; Mon, 11 Feb 2019 19:51:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=Mellanox.com header.i=@Mellanox.com header.b="sQpsV1r3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732813AbfBKTvA (ORCPT ); Mon, 11 Feb 2019 14:51:00 -0500 Received: from mail-eopbgr20071.outbound.protection.outlook.com ([40.107.2.71]:48915 "EHLO EUR02-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728124AbfBKTvA (ORCPT ); Mon, 11 Feb 2019 14:51:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=HlC2dh+XXa3vpBocMQgD3F2R80R2PIKQalhLktv1sF4=; b=sQpsV1r3y/C+4YNPqpdGIkJ1wu2fGCc+T3IRnWklsKG8jwWFaAb6rPcU1/RUe6dwoYHTsibp8vgi3LR7tH/H15Yp6WXfgsaksxEdOknn++WY+yS5IBWV2NCMdSg8tArtT8aHZgfM4oQ+TK33gYK8V0zmvtgAjDwTiwcedIYcEI4= Received: from DBBPR05MB6570.eurprd05.prod.outlook.com (20.179.44.81) by DBBPR05MB6523.eurprd05.prod.outlook.com (20.179.43.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.19; Mon, 11 Feb 2019 19:50:56 +0000 Received: from DBBPR05MB6570.eurprd05.prod.outlook.com ([fe80::34e8:76a2:998f:581a]) by DBBPR05MB6570.eurprd05.prod.outlook.com ([fe80::34e8:76a2:998f:581a%7]) with mapi id 15.20.1601.023; Mon, 11 Feb 2019 19:50:56 +0000 From: Jason Gunthorpe To: Leon Romanovsky CC: Doug Ledford , Leon Romanovsky , RDMA mailing list , Moni Shoua , Saeed Mahameed , linux-netdev Subject: Re: [PATCH mlx5-next 2/2] net/mlx5: Factor out HCA capabilities functions Thread-Topic: [PATCH mlx5-next 2/2] net/mlx5: Factor out HCA capabilities functions Thread-Index: AQHUwgDQW5oscdw7ukWE1gIBKHDWvaXbAisA Date: Mon, 11 Feb 2019 19:50:55 +0000 Message-ID: <20190211195050.GL24706@mellanox.com> References: <20190211115608.22677-1-leon@kernel.org> <20190211115608.22677-3-leon@kernel.org> In-Reply-To: <20190211115608.22677-3-leon@kernel.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MWHPR1301CA0025.namprd13.prod.outlook.com (2603:10b6:301:29::38) To DBBPR05MB6570.eurprd05.prod.outlook.com (2603:10a6:10:d1::17) authentication-results: spf=none (sender IP is ) smtp.mailfrom=jgg@mellanox.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [174.3.196.123] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DBBPR05MB6523;6:3Gb1FFnJKd8tNW+oAeEKtA3Vgw2o5bXEMqkzUrtchDDTkAta1dcKIRcMHXfNHu5Ke0iHquCdwA9xY5EeGCnHSGeuYOV5A6GsnE8gNrF0Jn2h2o9MEBr5jvMa+JsOLDVmNVlItsi47HnGWLUXj45m7O1UVfr83pay//V0pF1LsgvJbkXvdyKh3LJEalFJJt5pkxZkbmOnNm5MG762aMriRSzF4XrQkOCgcyJl/2pIS+uyEI/TfEKg7dPXRJ+2paKCI2yJwPxfgSJi9o0AMz0x29xe8wfHcaiQ8crrSCIfvRoEjg1Ew8m6o6F5TXOhZovIDXvfIImBNfciNE4E+5QVvoF1GGCjoyJ0dN49svM+GkdK1EGeoJVh4L8BAV0KE1qDLCO2htz/Pwsj2MZ22/g1iVLeo6xaaICRckAHL9g4+0ohmFu5XDAL/9vGHRg00dUOpnlMEKJFgc0+3j4b8YLCIQ==;5:nb5eSlAACEROpDOUUDlRKh+DzYc/J0COeClWcSF3hzqRGg4nqrJihwdiCl/J1NLqL/V8HQUQT+utqxIDM9XhuV42LbPgAPTG8RHinMusGgQy9ZP/pZC1NRHRx/v2nemZkkafwJ3kSsK52IVkHGBq13nlGOA3ERnyJ+YnrKGNypdC3mpFEtJEii721uubIv11vaqmYjOYOlLjE2sLBWUuIw==;7:WNu7t5f8gHoFjSS4cgg8HF0fCKaCI+kvM1cdgGLHh8GTIUF+Psklgun9BWVTks/7LkSsiubLSZdKPRmFUKIKND31r5nHjShFufT5Ymg0QxjnPTdC0WIBZreTO6R77gR2DVMaGrzXeDFTO5jQthd3uQ== x-ms-office365-filtering-correlation-id: 7387b688-ab05-4f02-7d70-08d6905a3c8a x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020);SRVR:DBBPR05MB6523; x-ms-traffictypediagnostic: DBBPR05MB6523: x-microsoft-antispam-prvs: x-forefront-prvs: 0945B0CC72 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(346002)(376002)(366004)(136003)(39860400002)(396003)(199004)(189003)(6116002)(3846002)(106356001)(256004)(1076003)(105586002)(71190400001)(71200400001)(478600001)(68736007)(66066001)(54906003)(2906002)(316002)(14454004)(4326008)(86362001)(53936002)(6916009)(26005)(33656002)(99286004)(6506007)(76176011)(25786009)(36756003)(6246003)(229853002)(52116002)(386003)(97736004)(6512007)(81166006)(8676002)(8936002)(6436002)(6486002)(81156014)(476003)(2616005)(486006)(11346002)(186003)(446003)(102836004)(7736002)(305945005);DIR:OUT;SFP:1101;SCL:1;SRVR:DBBPR05MB6523;H:DBBPR05MB6570.eurprd05.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: fhnEIRcuT8hM/8MFzJ97FdQHomYxJ8twY0goE7RlI6iLcanZOmrbXMZ8QRjulDk2Iz6e4JkLEn7q2Y/Ki5GfhHTP+4LKrUHxY6vlEFnXCEfuSj+8lU2hZGxYbucq1M3jd2TQfT+d6mAOT3VJxeao8CRfKaCqMgNl2/Hr0bYfhp8MOeGHzErtmWLmW1H/RklzHjDOEJr5SBGra+qSrI1+5PFJOJqju6S02mxC0dM7IX5crZ4gQFHCK/os1AACUb1vRoP8jtjygrV8kuA1JV12ljZECyOUZwor4dzhkZ8iOqF7Skt/3qSVRVNlQCsU2vfVtrOvZZKPbcKlNvfkaRmhY7N4tSA6kBF7UPyGRNsw4tY7hM4V5CUSE56n0jLtmujI6uQ/VZUlf6mlIriqR8Q+WqQ2lsyK/CnaK7Av7JBFkvo= Content-Type: text/plain; charset="us-ascii" Content-ID: <598CB911B890F242AD7490A70F39A831@eurprd05.prod.outlook.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7387b688-ab05-4f02-7d70-08d6905a3c8a X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Feb 2019 19:50:55.6659 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR05MB6523 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Mon, Feb 11, 2019 at 01:56:08PM +0200, Leon Romanovsky wrote: > From: Leon Romanovsky >=20 > Combine all HCA capabilities setters under one function > and compile out the ODP related function in case kernel > was compiled without ODP support. >=20 > Signed-off-by: Leon Romanovsky > .../net/ethernet/mellanox/mlx5/core/main.c | 47 +++++++++++++------ > 1 file changed, 33 insertions(+), 14 deletions(-) >=20 > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net= /ethernet/mellanox/mlx5/core/main.c > index 6d45518edbdc..d7145ab6105d 100644 > +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c > @@ -459,6 +459,7 @@ static int handle_hca_cap_atomic(struct mlx5_core_dev= *dev) > return err; > } > =20 > +#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING > static int handle_hca_cap_odp(struct mlx5_core_dev *dev) > { > void *set_hca_cap; > @@ -502,6 +503,7 @@ static int handle_hca_cap_odp(struct mlx5_core_dev *d= ev) > kfree(set_ctx); > return err; > } > +#endif > =20 > static int handle_hca_cap(struct mlx5_core_dev *dev) > { > @@ -576,6 +578,35 @@ static int handle_hca_cap(struct mlx5_core_dev *dev) > return err; > } > =20 > +static int set_hca_cap(struct mlx5_core_dev *dev) > +{ > + struct pci_dev *pdev =3D dev->pdev; > + int err; > + > + err =3D handle_hca_cap(dev); > + if (err) { > + dev_err(&pdev->dev, "handle_hca_cap failed\n"); > + goto out; > + } > + > + err =3D handle_hca_cap_atomic(dev); > + if (err) { > + dev_err(&pdev->dev, "handle_hca_cap_atomic failed\n"); > + goto out; > + } > + > +#ifdef CONFIG_INFINIBAND_ON_DEMAND_PAGING > + err =3D handle_hca_cap_odp(dev); > + if (err) { > + dev_err(&pdev->dev, "handle_hca_cap_odp failed\n"); > + goto out; > + } > +#endif Adding=20 if (IS_ENABLED..)=20 return 0; To the top of handle_hca_cap_odp is alot better. Jason