From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E2D03A04B1; Thu, 24 Sep 2020 14:13:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 165E11DE12; Thu, 24 Sep 2020 14:12:57 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 06EA81DE00 for ; Thu, 24 Sep 2020 14:12:53 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.62]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 7AB6060096 for ; Thu, 24 Sep 2020 12:12:52 +0000 (UTC) Received: from us4-mdac16-68.ut7.mdlocal (unknown [10.7.64.187]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 7983F8009E for ; Thu, 24 Sep 2020 12:12:52 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.175]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 0018828005F for ; Thu, 24 Sep 2020 12:12:52 +0000 (UTC) Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id ABDC070007F for ; Thu, 24 Sep 2020 12:12:51 +0000 (UTC) Received: from ukex01.SolarFlarecom.com (10.17.10.4) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 24 Sep 2020 13:12:46 +0100 Received: from opal.uk.solarflarecom.com (10.17.10.1) by ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Thu, 24 Sep 2020 13:12:46 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (ukv-loginhost.uk.solarflarecom.com [10.17.10.39]) by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 08OCCkS4025901 for ; Thu, 24 Sep 2020 13:12:46 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 51B701613BE for ; Thu, 24 Sep 2020 13:12:46 +0100 (BST) From: Andrew Rybchenko To: Date: Thu, 24 Sep 2020 13:11:47 +0100 Message-ID: <1600949555-28043-13-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1600949555-28043-1-git-send-email-arybchenko@solarflare.com> References: <1600764594-14752-1-git-send-email-arybchenko@solarflare.com> <1600949555-28043-1-git-send-email-arybchenko@solarflare.com> MIME-Version: 1.0 Content-Type: text/plain X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.6.1012-25674.003 X-TM-AS-Result: No-1.583500-8.000000-10 X-TMASE-MatchedRID: 48f3rcDgjOUfLZjRGBdfQbzgL/eLACDEjs/yyyVHGh4aV9cxC+J6t+Z5 Gn23AeDZuA9fFHhyLzx7Okmvhl+K960iin8P0KjVPwKTD1v8YV5MkOX0UoduufdG7cmuMnEoltB o/Ez2R6fJ4tcwPl28ZqJJJims/s54DPIzF4wRfrAURSScn+QSXt0H8LFZNFG7CKFCmhdu5cUpxd faW7N4HuI4vM7P9jJIT0wX/W0Ngm8ycHQDSefcEB3iQvy24OiACMO49QkG0Cxmc48Ihirc5pMh6 vjiL7Ops677reRA/y0A5SS2XRjKFM+aZOIheolUvvUo0hZPhlzM/43UL1MJR56oP1a0mRIj X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--1.583500-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25674.003 X-MDID: 1600949572-YW6kLpyuJJ6f Subject: [dpdk-dev] [PATCH v3 12/60] common/sfc_efx/base: set NIC features in generic place X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" There is no point to duplicate it NIC family specific probe handlers. Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/common/sfc_efx/base/ef10_nic.c | 2 -- drivers/common/sfc_efx/base/efx_nic.c | 3 +++ drivers/common/sfc_efx/base/siena_nic.c | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/common/sfc_efx/base/ef10_nic.c b/drivers/common/sfc_efx/base/ef10_nic.c index 47329ff8dc..4796dd6b59 100644 --- a/drivers/common/sfc_efx/base/ef10_nic.c +++ b/drivers/common/sfc_efx/base/ef10_nic.c @@ -2098,8 +2098,6 @@ ef10_nic_probe( } #endif - encp->enc_features = enp->en_features; - return (0); #if EFSYS_OPT_MON_STATS diff --git a/drivers/common/sfc_efx/base/efx_nic.c b/drivers/common/sfc_efx/base/efx_nic.c index b5e36661c9..9d6961e2ff 100644 --- a/drivers/common/sfc_efx/base/efx_nic.c +++ b/drivers/common/sfc_efx/base/efx_nic.c @@ -318,6 +318,7 @@ efx_nic_probe( __in efx_nic_t *enp, __in efx_fw_variant_t efv) { + efx_nic_cfg_t *encp = &(enp->en_nic_cfg); const efx_nic_ops_t *enop; efx_rc_t rc; @@ -351,6 +352,8 @@ efx_nic_probe( if ((rc = enop->eno_probe(enp)) != 0) goto fail1; + encp->enc_features = enp->en_features; + if ((rc = efx_phy_probe(enp)) != 0) goto fail2; diff --git a/drivers/common/sfc_efx/base/siena_nic.c b/drivers/common/sfc_efx/base/siena_nic.c index bd5e8ceb8a..b9b6d1951c 100644 --- a/drivers/common/sfc_efx/base/siena_nic.c +++ b/drivers/common/sfc_efx/base/siena_nic.c @@ -301,7 +301,6 @@ siena_nic_probe( __in efx_nic_t *enp) { efx_port_t *epp = &(enp->en_port); - efx_nic_cfg_t *encp = &(enp->en_nic_cfg); siena_link_state_t sls; unsigned int mask; efx_oword_t oword; @@ -369,8 +368,6 @@ siena_nic_probe( goto fail12; #endif - encp->enc_features = enp->en_features; - return (0); #if EFSYS_OPT_MON_STATS -- 2.17.1