From patchwork Thu Oct 28 22:14:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Fialko X-Patchwork-Id: 103201 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E084FA0547; Fri, 29 Oct 2021 00:15:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8ED940DDB; Fri, 29 Oct 2021 00:15:49 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 8B2A940395; Fri, 29 Oct 2021 00:15:48 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19SHumGl021914; Thu, 28 Oct 2021 15:15:46 -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=7jvZIKaq9LQVp1qg7/2p30ja3AtvitL2NnxUH93NUdg=; b=Y9W5gOfKwi6xu1LLLF6J5UV7v4lFKzX1eW7WgM0qD7LWWfBNarEA8jfV0mtq2mJY5lBd d7Qa01nDd7CQtIPy/+1vTo1Yrq5sV5Iwg5YH7n/R1ayxkPJYxCYMKEk3Yj+3nX7TOREb 8+oz/vZVQGe1IyYUA9LIgDQ/jVpzvBNuE4AiV+tz0cEdlevb0aG6gcjqq3qwk+S/+EjN 1XO7vazuJ/c0zxRTkV11nCXWnrAI0ng+m9tbH2pusstNWA8LQ7rpUKUFTz+nHJ3Ww96e E+5rnBVCX0Mvh6pzU39dl3oxHpdrdUmyL/14heqpLQ30wFuQgwo0iWAQ6BBUbvf7yyhH Dw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com with ESMTP id 3byd2fe0hn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 28 Oct 2021 15:15:46 -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.18; Thu, 28 Oct 2021 15:15:44 -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; Thu, 28 Oct 2021 15:15:44 -0700 Received: from localhost.localdomain (unknown [10.28.34.39]) by maili.marvell.com (Postfix) with ESMTP id E33F93F70C5; Thu, 28 Oct 2021 15:15:42 -0700 (PDT) From: Volodymyr Fialko To: , Ashwin Sekhar T K , Pavan Nikhilesh CC: , Volodymyr Fialko , Date: Fri, 29 Oct 2021 00:14:44 +0200 Message-ID: <20211028221446.2455303-2-vfialko@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028221446.2455303-1-vfialko@marvell.com> References: <20211028221446.2455303-1-vfialko@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: _aJBmY42xSRe-bOMmEkCIH2QsrhEGfPH X-Proofpoint-GUID: _aJBmY42xSRe-bOMmEkCIH2QsrhEGfPH 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-10-28_05,2021-10-26_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 1/3] mempool/cnxk: fix max pools argument parsing 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" roc_idev_npa_maxpools_set expects max_pools original value, not the aura Fixes: 0a50a5aad299 ("mempool/cnxk: add device probe/remove") Cc: stable@dpdk.org Signed-off-by: Volodymyr Fialko Reviewed-by: Jerin Jacob Kollanukkaran --- drivers/mempool/cnxk/cnxk_mempool.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/mempool/cnxk/cnxk_mempool.c b/drivers/mempool/cnxk/cnxk_mempool.c index dc36be54f6..828bf3fc36 100644 --- a/drivers/mempool/cnxk/cnxk_mempool.c +++ b/drivers/mempool/cnxk/cnxk_mempool.c @@ -31,25 +31,25 @@ npa_aura_size_to_u32(uint8_t val) } static int -parse_max_pools(const char *key, const char *value, void *extra_args) +parse_max_pools_handler(const char *key, const char *value, void *extra_args) { RTE_SET_USED(key); uint32_t val; - val = atoi(value); + val = rte_align32pow2(atoi(value)); if (val < npa_aura_size_to_u32(NPA_AURA_SZ_128)) val = 128; if (val > npa_aura_size_to_u32(NPA_AURA_SZ_1M)) val = BIT_ULL(20); - *(uint8_t *)extra_args = rte_log2_u32(val) - 6; + *(uint32_t *)extra_args = val; return 0; } -static inline uint8_t -parse_aura_size(struct rte_devargs *devargs) +static inline uint32_t +parse_max_pools(struct rte_devargs *devargs) { - uint8_t aura_sz = NPA_AURA_SZ_128; + uint32_t max_pools = npa_aura_size_to_u32(NPA_AURA_SZ_128); struct rte_kvargs *kvlist; if (devargs == NULL) @@ -58,11 +58,11 @@ parse_aura_size(struct rte_devargs *devargs) if (kvlist == NULL) goto exit; - rte_kvargs_process(kvlist, CNXK_NPA_MAX_POOLS_PARAM, &parse_max_pools, - &aura_sz); + rte_kvargs_process(kvlist, CNXK_NPA_MAX_POOLS_PARAM, + &parse_max_pools_handler, &max_pools); rte_kvargs_free(kvlist); exit: - return aura_sz; + return max_pools; } static inline char * @@ -92,7 +92,7 @@ npa_init(struct rte_pci_device *pci_dev) dev = mz->addr; dev->pci_dev = pci_dev; - roc_idev_npa_maxpools_set(parse_aura_size(pci_dev->device.devargs)); + roc_idev_npa_maxpools_set(parse_max_pools(pci_dev->device.devargs)); rc = roc_npa_dev_init(dev); if (rc) goto mz_free; From patchwork Thu Oct 28 22:14:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Fialko X-Patchwork-Id: 103202 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 04D65A0547; Fri, 29 Oct 2021 00:15:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E8CF4410FE; Fri, 29 Oct 2021 00:15:55 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 2A0CD40395 for ; Fri, 29 Oct 2021 00:15:55 +0200 (CEST) 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 SMTP id 19SIi5YE027066; Thu, 28 Oct 2021 15:15:52 -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=hKZpQQlQ7UV2pMWJNMzkpGWgmA5DG0FwcfWFYTYVfJw=; b=F+WhqaOzB7hrPHkxdloEKs1Z9qyLcqXbbyDtp0dc1WyaXz7Pb/whI+NrGBcMkQwaKAZM FQH3po2Fv3o2qJ6do6bEmXAuvoppC3WO5hPeYw91UCmf59zLkpbgDLBjFAsMGKe4HJIZ tEiW8UMEV804EyjKpsEGFl36CsjfRZGU+P57IZmSNlS+X6bwqMg2Bd6sUspE5ZuSpK7S KNnf3jwOakL4qyDy2Y2CIXZH8X7ZMWHdiB7YY9E02ZLBU1ZJJlzcdjbHQXwh0puxnK7C yaFNcSFiTtBlk2fY7eXecNn6Xvs+tfbE/ShPnilcAIN+Q7HEvcZK44qUoPFARcbf6ZLW BQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com with ESMTP id 3byrpg3e5k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 28 Oct 2021 15:15:51 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 28 Oct 2021 15:15:50 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 28 Oct 2021 15:15:50 -0700 Received: from localhost.localdomain (unknown [10.28.34.39]) by maili.marvell.com (Postfix) with ESMTP id 2BD353F70C0; Thu, 28 Oct 2021 15:15:47 -0700 (PDT) From: Volodymyr Fialko To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Ray Kinsella CC: , Volodymyr Fialko Date: Fri, 29 Oct 2021 00:14:45 +0200 Message-ID: <20211028221446.2455303-3-vfialko@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028221446.2455303-1-vfialko@marvell.com> References: <20211028221446.2455303-1-vfialko@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: P_51YTFhoiRlDrXus-svPBzkWZ8KnMyI X-Proofpoint-GUID: P_51YTFhoiRlDrXus-svPBzkWZ8KnMyI 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-10-28_06,2021-10-26_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 2/3] common/cnxk: add roc npa init callback support 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" Add support for registering callback for roc npa init Signed-off-by: Volodymyr Fialko Reviewed-by: Jerin Jacob --- drivers/common/cnxk/roc_npa.c | 18 ++++++++++++++++++ drivers/common/cnxk/roc_npa.h | 4 ++++ drivers/common/cnxk/version.map | 1 + 3 files changed, 23 insertions(+) diff --git a/drivers/common/cnxk/roc_npa.c b/drivers/common/cnxk/roc_npa.c index a0d2cc8f19..f16950e611 100644 --- a/drivers/common/cnxk/roc_npa.c +++ b/drivers/common/cnxk/roc_npa.c @@ -5,6 +5,18 @@ #include "roc_api.h" #include "roc_priv.h" +static roc_npa_lf_init_cb_t lf_init_cb; + +int +roc_npa_lf_init_cb_register(roc_npa_lf_init_cb_t cb) +{ + if (lf_init_cb != NULL) + return -EEXIST; + + lf_init_cb = cb; + return 0; +} + void roc_npa_aura_op_range_set(uint64_t aura_handle, uint64_t start_iova, uint64_t end_iova) @@ -694,6 +706,12 @@ npa_lf_init(struct dev *dev, struct plt_pci_device *pci_dev) if (__atomic_fetch_add(&idev->npa_refcnt, 1, __ATOMIC_SEQ_CST) != 0) return 0; + if (lf_init_cb) { + rc = (*lf_init_cb)(pci_dev); + if (rc) + goto fail; + } + rc = npa_attach(dev->mbox); if (rc) goto fail; diff --git a/drivers/common/cnxk/roc_npa.h b/drivers/common/cnxk/roc_npa.h index 1cf50e5c4e..46350fdb48 100644 --- a/drivers/common/cnxk/roc_npa.h +++ b/drivers/common/cnxk/roc_npa.h @@ -648,6 +648,10 @@ void __roc_api roc_npa_aura_op_range_set(uint64_t aura_handle, uint64_t start_iova, uint64_t end_iova); +/* Init callbacks */ +typedef int (*roc_npa_lf_init_cb_t)(struct plt_pci_device *pci_dev); +int __roc_api roc_npa_lf_init_cb_register(roc_npa_lf_init_cb_t cb); + /* Debug */ int __roc_api roc_npa_ctx_dump(void); int __roc_api roc_npa_dump(void); diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map index d9ad940ce7..ffa030a41f 100644 --- a/drivers/common/cnxk/version.map +++ b/drivers/common/cnxk/version.map @@ -285,6 +285,7 @@ INTERNAL { roc_npa_dev_fini; roc_npa_dev_init; roc_npa_dump; + roc_npa_lf_init_cb_register; roc_npa_pool_create; roc_npa_pool_destroy; roc_npa_pool_op_pc_reset; From patchwork Thu Oct 28 22:14:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Volodymyr Fialko X-Patchwork-Id: 103203 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B80DCA0547; Fri, 29 Oct 2021 00:16:00 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D6B494111A; Fri, 29 Oct 2021 00:15:57 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id BCF0641104 for ; Fri, 29 Oct 2021 00:15:56 +0200 (CEST) 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 SMTP id 19SIi5YG027066 for ; Thu, 28 Oct 2021 15:15:55 -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=lyAL94UwsqqGUm9r3dVn+h2dZZdNFxuLzY/Qtm1WdYs=; b=T12cXyvj1/8ZA8CAmR39gjYYtMPePxHOJsp/KOC4ejSMjun2fk3eEgrgXEoX9UjWRZdp M5y3E7edbwXHpGpMO76fYW0GGAhKdYB5JV5rzPXCCBtrescLJ2e7V4Chy+LAQRrnnFuS seGfMFfyFMd03wVUCyHHQielYNF70yRg/fNgNlsQlcoAPr0MVnQA5ljGkLJC2Y0T2fQM SCNefh/A0GuVNIl6q0Zc0/oekcdinNk3+PQX1QIUxq38Z6dJXKikOxmxFUIUWNnDXFoQ 4CCllKIZuqBCHbNAuIkKREq/kaqPxS0o++oNtkVa4wmWDuj+C0/HOjnY99UQeZmecmCV gQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com with ESMTP id 3byrpg3e5s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 28 Oct 2021 15:15:55 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 28 Oct 2021 15:15:54 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Thu, 28 Oct 2021 15:15:54 -0700 Received: from localhost.localdomain (unknown [10.28.34.39]) by maili.marvell.com (Postfix) with ESMTP id C2BA93F70C0; Thu, 28 Oct 2021 15:15:52 -0700 (PDT) From: Volodymyr Fialko To: , Ashwin Sekhar T K , Pavan Nikhilesh CC: , Volodymyr Fialko Date: Fri, 29 Oct 2021 00:14:46 +0200 Message-ID: <20211028221446.2455303-4-vfialko@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211028221446.2455303-1-vfialko@marvell.com> References: <20211028221446.2455303-1-vfialko@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: tZpG0T_uvy5OolC7B8EpuiDWO08LSN4n X-Proofpoint-GUID: tZpG0T_uvy5OolC7B8EpuiDWO08LSN4n 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-10-28_06,2021-10-26_01,2020-04-07_01 Subject: [dpdk-dev] [PATCH 3/3] mempool/cnxk: parse max pools during npa initialization 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" Register callback for max_pools argument parsing Signed-off-by: Volodymyr Fialko Reviewed-by: Jerin Jacob --- drivers/mempool/cnxk/cnxk_mempool.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/mempool/cnxk/cnxk_mempool.c b/drivers/mempool/cnxk/cnxk_mempool.c index 828bf3fc36..beefb90048 100644 --- a/drivers/mempool/cnxk/cnxk_mempool.c +++ b/drivers/mempool/cnxk/cnxk_mempool.c @@ -65,6 +65,13 @@ parse_max_pools(struct rte_devargs *devargs) return max_pools; } +static int +cnxk_mempool_plt_parse_devargs(struct rte_pci_device *pci_dev) +{ + roc_idev_npa_maxpools_set(parse_max_pools(pci_dev->device.devargs)); + return 0; +} + static inline char * npa_dev_to_name(struct rte_pci_device *pci_dev, char *name) { @@ -92,7 +99,6 @@ npa_init(struct rte_pci_device *pci_dev) dev = mz->addr; dev->pci_dev = pci_dev; - roc_idev_npa_maxpools_set(parse_max_pools(pci_dev->device.devargs)); rc = roc_npa_dev_init(dev); if (rc) goto mz_free; @@ -188,3 +194,8 @@ RTE_PMD_REGISTER_PCI_TABLE(mempool_cnxk, npa_pci_map); RTE_PMD_REGISTER_KMOD_DEP(mempool_cnxk, "vfio-pci"); RTE_PMD_REGISTER_PARAM_STRING(mempool_cnxk, CNXK_NPA_MAX_POOLS_PARAM "=<128-1048576>"); + +RTE_INIT(cnxk_mempool_parse_devargs) +{ + roc_npa_lf_init_cb_register(cnxk_mempool_plt_parse_devargs); +}