From patchwork Mon May 11 10:00:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh Bhagavatula X-Patchwork-Id: 70062 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A2747A0350; Mon, 11 May 2020 12:01:12 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BC4C1C1D5; Mon, 11 May 2020 12:01:12 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id C75931C01F for ; Mon, 11 May 2020 12:01:11 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04B9tnMw014435; Mon, 11 May 2020 03:01:09 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0818; bh=8jZhl7rz3MOZyBb+SQ6DEmj6S2zDxnYQw6gmUlXv7YQ=; b=lCDAQaKZhmAzR4UjkJFqYCXBPR26dNRSep1CBU0Yn71GaPQMTpQZW9NPcPZkLTZI6jU9 Q3xIuN16cpDiwjq1P5rMQ/x1tr8wFcKFWRIgfmBiyrvXNncuMJ7+rfQxfg2RINkTuDj4 HgNPW3Mrj2woDgMEKVf3o0FxATIsPAcsBzJbL0J3q4EY3w/N1gzKdyK4+GGxTzfmQoyY j1ToE1bPvlaoce+C2K5NCK1AWDluHKY/hUa4Oer6Gn2HZurHWrU2ay5wHoY5QrbBdpCO lixGP64X5gpSOu6xCmuq4vWIHj+e/pbeShsFCJ32JyUUtEOkZgRhDSZwobwwHQCbhX4J Zg== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 30wv1n5tqd-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 11 May 2020 03:01:09 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 11 May 2020 03:01:06 -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.2 via Frontend Transport; Mon, 11 May 2020 03:01:06 -0700 Received: from BG-LT7430.marvell.com (BG-LT7430.marvell.com [10.28.161.240]) by maili.marvell.com (Postfix) with ESMTP id 878323F7055; Mon, 11 May 2020 03:01:03 -0700 (PDT) From: To: , Nithin Dabilpuram , "Anoob Joseph" , Ray Kinsella , Neil Horman CC: , , Pavan Nikhilesh Date: Mon, 11 May 2020 15:30:57 +0530 Message-ID: <20200511100059.5035-1-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.676 definitions=2020-05-11_04:2020-05-11, 2020-05-11 signatures=0 Subject: [dpdk-dev] [PATCH 1/2] common/octeontx2: move internal symbols to INTERNAL section 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: Pavan Nikhilesh Move the internal symbols to INTERNAL sections so that any change in them is not reported as ABI breakage. Signed-off-by: Pavan Nikhilesh --- drivers/common/octeontx2/otx2_common.h | 8 ++++++++ drivers/common/octeontx2/otx2_dev.h | 3 +++ drivers/common/octeontx2/otx2_irq.h | 3 +++ drivers/common/octeontx2/otx2_mbox.h | 6 ++++++ drivers/common/octeontx2/otx2_sec_idev.h | 6 ++++++ .../octeontx2/rte_common_octeontx2_version.map | 16 +++------------- 6 files changed, 29 insertions(+), 13 deletions(-) diff --git a/drivers/common/octeontx2/otx2_common.h b/drivers/common/octeontx2/otx2_common.h index e62cdea07..174702687 100644 --- a/drivers/common/octeontx2/otx2_common.h +++ b/drivers/common/octeontx2/otx2_common.h @@ -62,13 +62,21 @@ struct otx2_idev_cfg { }; }; +__rte_internal struct otx2_idev_cfg *otx2_intra_dev_get_cfg(void); +__rte_internal void otx2_sso_pf_func_set(uint16_t sso_pf_func); +__rte_internal uint16_t otx2_sso_pf_func_get(void); +__rte_internal uint16_t otx2_npa_pf_func_get(void); +__rte_internal struct otx2_npa_lf *otx2_npa_lf_obj_get(void); +__rte_internal void otx2_npa_set_defaults(struct otx2_idev_cfg *idev); +__rte_internal int otx2_npa_lf_active(void *dev); +__rte_internal int otx2_npa_lf_obj_ref(void); /* Log */ diff --git a/drivers/common/octeontx2/otx2_dev.h b/drivers/common/octeontx2/otx2_dev.h index 13b75e118..cd4fe517d 100644 --- a/drivers/common/octeontx2/otx2_dev.h +++ b/drivers/common/octeontx2/otx2_dev.h @@ -94,6 +94,7 @@ struct otx2_dev { OTX2_DEV; }; +__rte_internal int otx2_dev_priv_init(struct rte_pci_device *pci_dev, void *otx2_dev); /* Common dev init and fini routines */ @@ -116,7 +117,9 @@ otx2_dev_init(struct rte_pci_device *pci_dev, void *otx2_dev) return otx2_dev_priv_init(pci_dev, otx2_dev); } +__rte_internal void otx2_dev_fini(struct rte_pci_device *pci_dev, void *otx2_dev); +__rte_internal int otx2_dev_active_vfs(void *otx2_dev); #define RVU_PFVF_PF_SHIFT 10 diff --git a/drivers/common/octeontx2/otx2_irq.h b/drivers/common/octeontx2/otx2_irq.h index 9d326276e..0683cf554 100644 --- a/drivers/common/octeontx2/otx2_irq.h +++ b/drivers/common/octeontx2/otx2_irq.h @@ -16,10 +16,13 @@ typedef struct { uint64_t bits[MAX_VFPF_DWORD_BITS]; } otx2_intr_t; +__rte_internal int otx2_register_irq(struct rte_intr_handle *intr_handle, rte_intr_callback_fn cb, void *data, unsigned int vec); +__rte_internal void otx2_unregister_irq(struct rte_intr_handle *intr_handle, rte_intr_callback_fn cb, void *data, unsigned int vec); +__rte_internal int otx2_disable_irqs(struct rte_intr_handle *intr_handle); #endif /* _OTX2_IRQ_H_ */ diff --git a/drivers/common/octeontx2/otx2_mbox.h b/drivers/common/octeontx2/otx2_mbox.h index 5351deaf2..8af8ada05 100644 --- a/drivers/common/octeontx2/otx2_mbox.h +++ b/drivers/common/octeontx2/otx2_mbox.h @@ -1582,19 +1582,25 @@ struct tim_enable_rsp { uint32_t __otx2_io currentbucket; }; +__rte_internal const char *otx2_mbox_id2name(uint16_t id); int otx2_mbox_id2size(uint16_t id); void otx2_mbox_reset(struct otx2_mbox *mbox, int devid); int otx2_mbox_init(struct otx2_mbox *mbox, uintptr_t hwbase, uintptr_t reg_base, int direction, int ndevsi, uint64_t intr_offset); void otx2_mbox_fini(struct otx2_mbox *mbox); +__rte_internal void otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid); +__rte_internal int otx2_mbox_wait_for_rsp(struct otx2_mbox *mbox, int devid); int otx2_mbox_wait_for_rsp_tmo(struct otx2_mbox *mbox, int devid, uint32_t tmo); +__rte_internal int otx2_mbox_get_rsp(struct otx2_mbox *mbox, int devid, void **msg); +__rte_internal int otx2_mbox_get_rsp_tmo(struct otx2_mbox *mbox, int devid, void **msg, uint32_t tmo); int otx2_mbox_get_availmem(struct otx2_mbox *mbox, int devid); +__rte_internal struct mbox_msghdr *otx2_mbox_alloc_msg_rsp(struct otx2_mbox *mbox, int devid, int size, int size_rsp); diff --git a/drivers/common/octeontx2/otx2_sec_idev.h b/drivers/common/octeontx2/otx2_sec_idev.h index c681f5094..89cdaf66a 100644 --- a/drivers/common/octeontx2/otx2_sec_idev.h +++ b/drivers/common/octeontx2/otx2_sec_idev.h @@ -22,16 +22,22 @@ struct otx2_sec_idev_cfg { rte_spinlock_t tx_cpt_lock; }; +__rte_internal uint8_t otx2_eth_dev_is_sec_capable(struct rte_eth_dev *eth_dev); +__rte_internal int otx2_sec_idev_cfg_init(int port_id); +__rte_internal int otx2_sec_idev_tx_cpt_qp_add(uint16_t port_id, struct otx2_cpt_qp *qp); +__rte_internal int otx2_sec_idev_tx_cpt_qp_remove(struct otx2_cpt_qp *qp); +__rte_internal int otx2_sec_idev_tx_cpt_qp_put(struct otx2_cpt_qp *qp); +__rte_internal int otx2_sec_idev_tx_cpt_qp_get(uint16_t port_id, struct otx2_cpt_qp **qp); #endif /* _OTX2_SEC_IDEV_H_ */ diff --git a/drivers/common/octeontx2/rte_common_octeontx2_version.map b/drivers/common/octeontx2/rte_common_octeontx2_version.map index 01279c339..94af2ed69 100644 --- a/drivers/common/octeontx2/rte_common_octeontx2_version.map +++ b/drivers/common/octeontx2/rte_common_octeontx2_version.map @@ -1,4 +1,4 @@ -DPDK_20.0 { +INTERNAL { global: otx2_dev_active_vfs; @@ -30,23 +30,13 @@ DPDK_20.0 { otx2_sso_pf_func_get; otx2_sso_pf_func_set; otx2_unregister_irq; - - local: *; -}; - -DPDK_21 { - global: - otx2_eth_dev_is_sec_capable; otx2_sec_idev_cfg_init; otx2_sec_idev_tx_cpt_qp_add; otx2_sec_idev_tx_cpt_qp_remove; otx2_sec_idev_tx_cpt_qp_get; otx2_sec_idev_tx_cpt_qp_put; -} DPDK_20.0; - -EXPERIMENTAL { - global: - otx2_logtype_ep; + + local: *; }; From patchwork Mon May 11 10:00:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh Bhagavatula X-Patchwork-Id: 70063 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B6463A0350; Mon, 11 May 2020 12:01:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B12F41C22A; Mon, 11 May 2020 12:01:16 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 83BEA1C222 for ; Mon, 11 May 2020 12:01:15 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 04B9xWsE003825; Mon, 11 May 2020 03:01:13 -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=pfpt0818; bh=CgGpWi9GPYaMBhOb9/Xw6SkN8y2CJiolDn1o5xepSes=; b=kfLBPbRW6YlhDdB4yR33nxz4aO3Fd+DERo4MPz5w5xAeHv/nnUgKIcwumiuR/fJFBbns VGmppGbjPulDI4Njc7sdihxXlydIFonahitxTNr9UC2z0GidP51umw40kYlgSUpks3Ss +8TCxsrMOs9UwEHr3DspZsHd4k6VAaVrJT+ylm1B8eYCAAOcXS3h2qY8pDWzt8GfeAYv ctSQ4KAPg+iX9gG7BumANYZres49f0QVYwXWJNI39qV4M9OWmK8RNRNZWX4q4M9In2Do GeEqMeCt7m1Kv6ikHyK75kVxHcMmzOyf1b7d497/9xiORKBGSAuIWpLlqz0lg922/CqA 6g== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 30wsvqe8qh-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 11 May 2020 03:01:13 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 11 May 2020 03:01:11 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 11 May 2020 03:01:10 -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.2 via Frontend Transport; Mon, 11 May 2020 03:01:10 -0700 Received: from BG-LT7430.marvell.com (BG-LT7430.marvell.com [10.28.161.240]) by maili.marvell.com (Postfix) with ESMTP id 1F7DD3F7040; Mon, 11 May 2020 03:01:07 -0700 (PDT) From: To: , Nithin Dabilpuram , "Ray Kinsella" , Neil Horman CC: , , Pavan Nikhilesh Date: Mon, 11 May 2020 15:30:58 +0530 Message-ID: <20200511100059.5035-2-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200511100059.5035-1-pbhagavatula@marvell.com> References: <20200511100059.5035-1-pbhagavatula@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216, 18.0.676 definitions=2020-05-11_04:2020-05-11, 2020-05-11 signatures=0 Subject: [dpdk-dev] [PATCH 2/2] mempool/octeontx2: move internal symbols to INTERNAL section 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: Pavan Nikhilesh Move the internal symbols to INTERNAL sections so that any change in them is not reported as ABI breakage. Signed-off-by: Pavan Nikhilesh --- drivers/mempool/octeontx2/otx2_mempool.h | 2 ++ drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mempool/octeontx2/otx2_mempool.h b/drivers/mempool/octeontx2/otx2_mempool.h index adcc0db24..8aa548248 100644 --- a/drivers/mempool/octeontx2/otx2_mempool.h +++ b/drivers/mempool/octeontx2/otx2_mempool.h @@ -206,7 +206,9 @@ npa_lf_aura_op_range_set(uint64_t aura_handle, uint64_t start_iova, } /* NPA LF */ +__rte_internal int otx2_npa_lf_init(struct rte_pci_device *pci_dev, void *otx2_dev); +__rte_internal int otx2_npa_lf_fini(void); /* IRQ */ diff --git a/drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map b/drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map index d4f81aed8..e6887ceb8 100644 --- a/drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map +++ b/drivers/mempool/octeontx2/rte_mempool_octeontx2_version.map @@ -1,4 +1,4 @@ -DPDK_20.0 { +INTERNAL { global: otx2_npa_lf_fini;