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 66646A04DD; Tue, 20 Oct 2020 11:19:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 095F4C7F2; Tue, 20 Oct 2020 11:14:09 +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 4E632C31B for ; Tue, 20 Oct 2020 11:14:05 +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 D2CDC60085 for ; Tue, 20 Oct 2020 09:14:03 +0000 (UTC) Received: from us4-mdac16-72.ut7.mdlocal (unknown [10.7.64.191]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id D09458009B for ; Tue, 20 Oct 2020 09:14:03 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.7.66.41]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 6A98128004D for ; Tue, 20 Oct 2020 09:14:03 +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 1EA0A4C0060 for ; Tue, 20 Oct 2020 09:14:03 +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; Tue, 20 Oct 2020 10:13:59 +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; Tue, 20 Oct 2020 10:13:59 +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 09K9Dxme028327; Tue, 20 Oct 2020 10:13:59 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 179F11613AB; Tue, 20 Oct 2020 10:13:59 +0100 (BST) From: Andrew Rybchenko To: CC: Ivan Malov Date: Tue, 20 Oct 2020 10:12:45 +0100 Message-ID: <1603185222-14831-6-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1603185222-14831-1-git-send-email-arybchenko@solarflare.com> References: <1603183709-23420-1-git-send-email-arybchenko@solarflare.com> <1603185222-14831-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-25736.003 X-TM-AS-Result: No-1.175400-8.000000-10 X-TMASE-MatchedRID: 1DmCryjwV2XabBVcqlDcF7sHVDDM5xAPP6Tki+9nU39YwVHjLI3nekAc 6DyoS2rIrXMOxnDE+MQzbI1E6WnGTk4l7sir0CBC/bV/VOhrmoqByxVkfd04JMLlYljmBfZco8W MkQWv6iUoTQl7wNH8Po2j49Ftap9Ero1URZJFbJtrfft55rUxllvGCZxC1c9glo/yFibJ7GXOIV CKtNnYWbAmjnsVNiz6Qo41jQgk7qUphba8lPe+b9oVs05KV5nOVr9TVCbQbPvw7JxwU0EvZMqER OLb/+yO4/0Jvn0rwAJmtL4Dw+zNb0D/MIf9Orkd X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10-1.175400-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25736.003 X-MDID: 1603185243-mxlKdwOqS8bD X-PPE-DISP: 1603185243;mxlKdwOqS8bD Subject: [dpdk-dev] [PATCH v2 05/62] drivers: init/fini MAE on attach/detach 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" From: Ivan Malov These actions affect MAE supplementary resources which are libefx-internal. Signed-off-by: Ivan Malov Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/common/sfc_efx/efsys.h | 2 +- drivers/net/sfc/sfc_mae.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/common/sfc_efx/efsys.h b/drivers/common/sfc_efx/efsys.h index 8636e73b68..bbe9f2ef12 100644 --- a/drivers/common/sfc_efx/efsys.h +++ b/drivers/common/sfc_efx/efsys.h @@ -167,7 +167,7 @@ prefetch_read_once(const volatile void *addr) #define EFSYS_OPT_DESC_PROXY 0 -#define EFSYS_OPT_MAE 0 +#define EFSYS_OPT_MAE 1 /* ID */ diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c index 3ce654c19b..2a7ed6377a 100644 --- a/drivers/net/sfc/sfc_mae.c +++ b/drivers/net/sfc/sfc_mae.c @@ -21,6 +21,7 @@ sfc_mae_attach(struct sfc_adapter *sa) { const efx_nic_cfg_t *encp = efx_nic_cfg_get(sa->nic); struct sfc_mae *mae = &sa->mae; + int rc; sfc_log_init(sa, "entry"); @@ -29,21 +30,37 @@ sfc_mae_attach(struct sfc_adapter *sa) return 0; } + sfc_log_init(sa, "init MAE"); + rc = efx_mae_init(sa->nic); + if (rc != 0) + goto fail_mae_init; + mae->status = SFC_MAE_STATUS_SUPPORTED; sfc_log_init(sa, "done"); return 0; + +fail_mae_init: + sfc_log_init(sa, "failed %d", rc); + + return rc; } void sfc_mae_detach(struct sfc_adapter *sa) { struct sfc_mae *mae = &sa->mae; + enum sfc_mae_status status_prev = mae->status; sfc_log_init(sa, "entry"); mae->status = SFC_MAE_STATUS_UNKNOWN; + if (status_prev != SFC_MAE_STATUS_SUPPORTED) + return; + + efx_mae_fini(sa->nic); + sfc_log_init(sa, "done"); } -- 2.17.1