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 B2BE5A04AA; Tue, 8 Sep 2020 11:17:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6A3AD1C0DB; Tue, 8 Sep 2020 11:16:05 +0200 (CEST) Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com [67.231.154.164]) by dpdk.org (Postfix) with ESMTP id 38D511C0DB for ; Tue, 8 Sep 2020 11:16:03 +0200 (CEST) Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.144]) by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id CFCFA2007A for ; Tue, 8 Sep 2020 09:16:02 +0000 (UTC) Received: from us4-mdac16-49.at1.mdlocal (unknown [10.110.50.132]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 53AB6800E8 for ; Tue, 8 Sep 2020 09:16:02 +0000 (UTC) X-Virus-Scanned: Proofpoint Essentials engine Received: from mx1-us1.ppe-hosted.com (unknown [10.110.50.12]) by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 1AB2B40088 for ; Tue, 8 Sep 2020 09:14:54 +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 D79EB40070 for ; Tue, 8 Sep 2020 09:14:53 +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, 8 Sep 2020 10:14:49 +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, 8 Sep 2020 10:14:49 +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 0889EnJR032410 for ; Tue, 8 Sep 2020 10:14:49 +0100 Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1]) by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 4F6E41613A9 for ; Tue, 8 Sep 2020 10:14:49 +0100 (BST) From: Andrew Rybchenko To: Date: Tue, 8 Sep 2020 10:14:24 +0100 Message-ID: <1599556475-27820-5-git-send-email-arybchenko@solarflare.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1599556475-27820-1-git-send-email-arybchenko@solarflare.com> References: <1599556475-27820-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-25652.003 X-TM-AS-Result: No-3.301400-8.000000-10 X-TMASE-MatchedRID: mukClXrIO7yl+yWhjYUl7aiUivh0j2PvaeMaKzvXUpkGmHr1eMxt2YB5 w6KBECW1rdoLblq9S5oAhGIvsKa9H6qrJ2yPRGzpRaPXfvn+keqkdO7TbvbzY7qE5Z6/nd2c0/e OwruG1unXTKZZmtmwut4PjuOlRMxlS62nMBX/dwP4KPASpfWnuVsP0tBwe3qDkY8eITaSJPhnml iDOiSLQ/GrOL7GbikWgePt/FBezHC8gVUkX0SvF854hX4xV6jOfS0Ip2eEHnz3IzXlXlpamPoLR 4+zsDTtHtexZ1+/9PmlF4DxSfZVrRpfT1NXwKroGus3x7d8v+9Po3Kbq748ZmwoV7uXtxn/NffI vuoK0copYoYq9+gIB0gFvgko9aNFhQAl75DFpaYAA9BapWXaJtG+KyfdrZrRf3e2vVbH8zBmH8z Zfront8C+ksT6a9fy X-TM-AS-User-Approved-Sender: Yes X-TM-AS-User-Blocked-Sender: No X-TMASE-Result: 10--3.301400-8.000000 X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25652.003 X-MDID: 1599556562-8CnD5YJR2mdX Subject: [dpdk-dev] [PATCH 03/14] net/sfc: add dedicated header file with MCDI interface 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" MCDI helpers will be shared by net and vDPA drivers. Prepare to move it to common/sfc_efx. Signed-off-by: Andrew Rybchenko Reviewed-by: Andy Moreton --- drivers/net/sfc/sfc.h | 23 +--------------- drivers/net/sfc/sfc_mcdi.c | 1 + drivers/net/sfc/sfc_mcdi.h | 54 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 22 deletions(-) create mode 100644 drivers/net/sfc/sfc_mcdi.h diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h index cdff9be3ec..a530b12a8e 100644 --- a/drivers/net/sfc/sfc.h +++ b/drivers/net/sfc/sfc.h @@ -23,6 +23,7 @@ #include "sfc_debug.h" #include "sfc_filter.h" +#include "sfc_mcdi.h" #ifdef __cplusplus extern "C" { @@ -86,25 +87,6 @@ enum sfc_dev_filter_mode { SFC_DEV_FILTER_NMODES }; -enum sfc_mcdi_state { - SFC_MCDI_UNINITIALIZED = 0, - SFC_MCDI_INITIALIZED, - SFC_MCDI_BUSY, - SFC_MCDI_COMPLETED, - - SFC_MCDI_NSTATES -}; - -struct sfc_mcdi { - rte_spinlock_t lock; - efsys_mem_t mem; - enum sfc_mcdi_state state; - efx_mcdi_transport_t transport; - uint32_t logtype; - uint32_t proxy_handle; - efx_rc_t proxy_result; -}; - struct sfc_intr { efx_intr_type_t type; rte_intr_callback_fn handler; @@ -384,9 +366,6 @@ void sfc_stop(struct sfc_adapter *sa); void sfc_schedule_restart(struct sfc_adapter *sa); -int sfc_mcdi_init(struct sfc_adapter *sa); -void sfc_mcdi_fini(struct sfc_adapter *sa); - int sfc_configure(struct sfc_adapter *sa); void sfc_close(struct sfc_adapter *sa); diff --git a/drivers/net/sfc/sfc_mcdi.c b/drivers/net/sfc/sfc_mcdi.c index ec62ba95ff..9a51b3e030 100644 --- a/drivers/net/sfc/sfc_mcdi.c +++ b/drivers/net/sfc/sfc_mcdi.c @@ -13,6 +13,7 @@ #include "efx_mcdi.h" #include "efx_regs_mcdi.h" +#include "sfc_mcdi.h" #include "sfc.h" #include "sfc_debug.h" #include "sfc_log.h" diff --git a/drivers/net/sfc/sfc_mcdi.h b/drivers/net/sfc/sfc_mcdi.h new file mode 100644 index 0000000000..789a16d8bb --- /dev/null +++ b/drivers/net/sfc/sfc_mcdi.h @@ -0,0 +1,54 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * + * Copyright(c) 2019-2020 Xilinx, Inc. + * Copyright(c) 2016-2019 Solarflare Communications Inc. + * + * This software was jointly developed between OKTET Labs (under contract + * for Solarflare) and Solarflare Communications, Inc. + */ + +#ifndef _SFC_MCDI_H +#define _SFC_MCDI_H + +#include + +#include + +#include "efsys.h" +#include "efx.h" + + +#ifdef __cplusplus +extern "C" { +#endif + +enum sfc_mcdi_state { + SFC_MCDI_UNINITIALIZED = 0, + SFC_MCDI_INITIALIZED, + SFC_MCDI_BUSY, + SFC_MCDI_COMPLETED, + + SFC_MCDI_NSTATES +}; + +struct sfc_mcdi { + rte_spinlock_t lock; + efsys_mem_t mem; + enum sfc_mcdi_state state; + efx_mcdi_transport_t transport; + uint32_t logtype; + uint32_t proxy_handle; + efx_rc_t proxy_result; +}; + + +struct sfc_adapter; + +int sfc_mcdi_init(struct sfc_adapter *sa); +void sfc_mcdi_fini(struct sfc_adapter *sa); + +#ifdef __cplusplus +} +#endif + +#endif /* _SFC_MCDI_H */ -- 2.17.1