From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 797EBA0C4B; Tue, 2 Nov 2021 19:42:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2769841103; Tue, 2 Nov 2021 19:42:28 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id C7C2B41100 for ; Tue, 2 Nov 2021 19:42:25 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with ESMTP id 1A2HXBeF030442 for ; Tue, 2 Nov 2021 11:42:23 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=YmOfpQ3wqsoS/DUG0/fyvQn7Pa4Q3Op+ZwOM7494dEQ=; b=H/qB48oMR58cL/buktF2sZvqVPOoyulA2T2ZGnreO3CJLEnBZ32wVhzpeNEDQYccsYwB kR0qOGiUCss+Bt5g4iVKVc2BSRoiOez/rYNSmABOtEIOhoCv4LQ12RCVSkAx4GCSIaD/ V42zxByzsZuhUE1MrHsEup/2gT+On7KLDubAUMdGbc7N0Fb1sIAWXTb8IwcAM0f1WPrc 8mJwNw+14KppdTRCVVYXkPu2au1YjAiWeuvHPfEroxGDu7tmlnmG9vtyttSPof19SoE9 sK/uESGEAN90rGXNjcFPNtEjLHFZTYrmBVn/KX79blLImNNtkNP1yj8M29XKDKVIK2vy gw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3c35mbhyt2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 02 Nov 2021 11:42:23 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Tue, 2 Nov 2021 11:42:22 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Tue, 2 Nov 2021 11:42:22 -0700 Received: from localhost.localdomain (unknown [10.28.34.39]) by maili.marvell.com (Postfix) with ESMTP id C8D493F7043; Tue, 2 Nov 2021 11:42:20 -0700 (PDT) From: Tomasz Duszynski To: CC: , Jakub Palider , "Tomasz Duszynski" Date: Tue, 2 Nov 2021 19:41:31 +0100 Message-ID: <20211102184134.3012344-2-tduszynski@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211102184134.3012344-1-tduszynski@marvell.com> References: <20211102184134.3012344-1-tduszynski@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: g_HrHOsLotFV9pufWqTg8FW2FIAovqhb X-Proofpoint-ORIG-GUID: g_HrHOsLotFV9pufWqTg8FW2FIAovqhb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-11-02_08,2021-11-02_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 1/4] raw/cnxk_bphy: remove deps from internal headers X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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: Jakub Palider This patch resolves problem with internal header inclusion. In addition prevents C++ name mangling. Signed-off-by: Jakub Palider Reviewed-by: Tomasz Duszynski Reviewed-by: Jerin Jacob Kollanukkaran --- drivers/raw/cnxk_bphy/cnxk_bphy_irq.c | 2 +- drivers/raw/cnxk_bphy/cnxk_bphy_irq.h | 18 +++++------------- drivers/raw/cnxk_bphy/rte_pmd_bphy.h | 18 ++++++++++++++++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.c b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.c index a328029aad..bbe7f74def 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.c +++ b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.c @@ -90,7 +90,7 @@ cnxk_bphy_intr_unregister(uint16_t dev_id, int irq_num) plt_err("Missing irq chip"); } -struct bphy_mem * +struct cnxk_bphy_mem * cnxk_bphy_mem_get(uint16_t dev_id) { struct bphy_device *bphy_dev = cnxk_bphy_get_bphy_dev_by_dev_id(dev_id); diff --git a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h index 63d7285055..dab0f23188 100644 --- a/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h +++ b/drivers/raw/cnxk_bphy/cnxk_bphy_irq.h @@ -5,17 +5,9 @@ #ifndef _CNXK_BPHY_IRQ_ #define _CNXK_BPHY_IRQ_ -#include -#include - #include -typedef void (*cnxk_bphy_intr_handler_t)(int irq_num, void *isr_data); - -struct bphy_mem { - struct rte_mem_resource res0; - struct rte_mem_resource res2; -}; +#include "rte_pmd_bphy.h" struct bphy_irq_queue { /* queue holds up to one response */ @@ -26,17 +18,17 @@ struct bphy_device { #define BPHY_QUEUE_CNT 1 struct roc_bphy bphy; struct roc_bphy_irq_chip *irq_chip; - struct bphy_mem mem; + struct cnxk_bphy_mem mem; /* bphy irq interface supports single queue only */ struct bphy_irq_queue queues[BPHY_QUEUE_CNT]; }; int cnxk_bphy_intr_init(uint16_t dev_id); void cnxk_bphy_intr_fini(uint16_t dev_id); -struct bphy_mem *cnxk_bphy_mem_get(uint16_t dev_id); +struct cnxk_bphy_mem *cnxk_bphy_mem_get(uint16_t dev_id); int cnxk_bphy_intr_register(uint16_t dev_id, int irq_num, - cnxk_bphy_intr_handler_t handler, - void *isr_data, int cpu); + cnxk_bphy_intr_handler_t handler, void *isr_data, + int cpu); void cnxk_bphy_intr_unregister(uint16_t dev_id, int irq_num); uint64_t cnxk_bphy_irq_max_get(uint16_t dev_id); diff --git a/drivers/raw/cnxk_bphy/rte_pmd_bphy.h b/drivers/raw/cnxk_bphy/rte_pmd_bphy.h index 4458342287..726ff412a2 100644 --- a/drivers/raw/cnxk_bphy/rte_pmd_bphy.h +++ b/drivers/raw/cnxk_bphy/rte_pmd_bphy.h @@ -5,9 +5,13 @@ #ifndef _CNXK_BPHY_H_ #define _CNXK_BPHY_H_ +#include #include +#include -#include "cnxk_bphy_irq.h" +#ifdef __cplusplus +extern "C" { +#endif enum cnxk_bphy_cgx_msg_type { CNXK_BPHY_CGX_MSG_TYPE_GET_LINKINFO, @@ -107,9 +111,15 @@ struct cnxk_bphy_cgx_msg { void *data; }; -#define cnxk_bphy_mem bphy_mem #define CNXK_BPHY_DEF_QUEUE 0 +typedef void (*cnxk_bphy_intr_handler_t)(int irq_num, void *isr_data); + +struct cnxk_bphy_mem { + struct rte_mem_resource res0; + struct rte_mem_resource res2; +}; + enum cnxk_bphy_irq_msg_type { CNXK_BPHY_IRQ_MSG_TYPE_INIT, CNXK_BPHY_IRQ_MSG_TYPE_FINI, @@ -383,4 +393,8 @@ rte_pmd_bphy_cgx_set_fec(uint16_t dev_id, uint16_t lmac, return __rte_pmd_bphy_enq_deq(dev_id, lmac, &msg, NULL, 0); } +#ifdef __cplusplus +} +#endif + #endif /* _CNXK_BPHY_H_ */ -- 2.25.1