From patchwork Tue Jul 28 18:43:45 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: 74952 X-Patchwork-Delegate: jerinj@marvell.com 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 ADB7BA052B; Tue, 28 Jul 2020 20:43:58 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7516D2B8D; Tue, 28 Jul 2020 20:43:57 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 231042B8D; Tue, 28 Jul 2020 20:43:55 +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 06SIdYRN022362; Tue, 28 Jul 2020 11:43:55 -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=ka5Nw9hVvmEmDOR2xZmHmE6gjtDtRWr+jLIhjwKfQ/s=; b=DQimhqiyKaWJGohAdHTuG/d0jTv0CA9j/MHMSRiIl76P5EmX6GXUqE7JjrJoMfpatvPs Y7bvE9mHsMu9ZlIUx88bsA6eZBQ95/A3jlouokjANcCjiFQ3406/m4d/k3PLffy3crpW R0XI4ppFTU2sjuoVAyWVgvWePy+Wo7q2J2qwHwJRECesYxPHThGkQnelH1UUKPdyRka9 EQ7jAhJKjcm3nj6J6njp5qtNXFgawJuhnYC503T0CTOZM4+bArVHmKmfnXzOU+OCMhGM bUDE1zhqcpdi7Oi6XnKZq8f9myTy9DeQvVGIxr2HNhfPqyudH+Y+emfh+5SN9hAN/uvZ Dw== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0a-0016f401.pphosted.com with ESMTP id 32gj3qwc0w-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 28 Jul 2020 11:43:55 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Jul 2020 11:43: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.2 via Frontend Transport; Tue, 28 Jul 2020 11:43:54 -0700 Received: from BG-LT7430.marvell.com (BG-LT7430.marvell.com [10.28.161.240]) by maili.marvell.com (Postfix) with ESMTP id 4B6883F703F; Tue, 28 Jul 2020 11:43:51 -0700 (PDT) From: To: , Harman Kalra CC: , Pavan Nikhilesh , Date: Wed, 29 Jul 2020 00:13:45 +0530 Message-ID: <20200728184347.3105-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.235, 18.0.687 definitions=2020-07-28_15:2020-07-28, 2020-07-28 signatures=0 Subject: [dpdk-dev] [PATCH 1/2] mempool/octeontx: fix aura to pool mapping 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 When sending commands to Kernel FPA PF driver, it expects the aura to be in the range of 0 to 16 for a given FPA pool. In OCTEON TX we map a pool,aura pair as single mempool handle, always set the aura id to 0 for a given FPA pool. Fixes: 179c7e893f64 ("mempool/octeontx: fix pool to aura mapping") Cc: stable@dpdk.org Signed-off-by: Pavan Nikhilesh --- drivers/mempool/octeontx/octeontx_fpavf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.1 diff --git a/drivers/mempool/octeontx/octeontx_fpavf.c b/drivers/mempool/octeontx/octeontx_fpavf.c index 339da7824..94dc5cd81 100644 --- a/drivers/mempool/octeontx/octeontx_fpavf.c +++ b/drivers/mempool/octeontx/octeontx_fpavf.c @@ -259,7 +259,7 @@ octeontx_fpapf_pool_setup(unsigned int gpool, unsigned int buf_size, POOL_LTYPE(0x2) | POOL_STYPE(0) | POOL_SET_NAT_ALIGN | POOL_ENA; - cfg.aid = FPA_AURA_IDX(gpool); + cfg.aid = 0; cfg.pool_cfg = reg; cfg.pool_stack_base = phys_addr; cfg.pool_stack_end = phys_addr + memsz; @@ -345,7 +345,7 @@ octeontx_fpapf_aura_attach(unsigned int gpool_index) hdr.vfid = gpool_index; hdr.res_code = 0; memset(&cfg, 0x0, sizeof(struct octeontx_mbox_fpa_cfg)); - cfg.aid = FPA_AURA_IDX(gpool_index); + cfg.aid = 0; ret = octeontx_mbox_send(&hdr, &cfg, sizeof(struct octeontx_mbox_fpa_cfg), @@ -374,7 +374,7 @@ octeontx_fpapf_aura_detach(unsigned int gpool_index) goto err; } - cfg.aid = FPA_AURA_IDX(gpool_index); + cfg.aid = 0; hdr.coproc = FPA_COPROC; hdr.msg = FPA_DETACHAURA; hdr.vfid = gpool_index; From patchwork Tue Jul 28 18:43:46 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: 74953 X-Patchwork-Delegate: jerinj@marvell.com 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 3BB4DA052B; Tue, 28 Jul 2020 20:44:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0B3E41BFF5; Tue, 28 Jul 2020 20:44:02 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 782011BFF2; Tue, 28 Jul 2020 20:44:00 +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 06SIdYRO022362; Tue, 28 Jul 2020 11:43:59 -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=in/7CdFTW5WTAOxXTSHwY8rOIX0cnL4RaB9gnP0a/dY=; b=WVFP2JTJs3xCFgiFMm6tnzMK/R7MxfZSdm5nofILLo4YJMFCajTm+mGrsSFinmjTPcDp xK/HwffZPp+YsPKY5zFE7tK7dNrki8bKs4ne4leoSHRA2Z9QHgHlnziFp7uNNh4GEwqe QRsfOvjQ3FXSH0sXHfr9B6w39ojmWlVhDBzQ7F3qaXwrf+740feu9DSRck/tyN7u7+cI cI2I3h38hif9TnLVaYrP8UtVCxdHg1lHyBjoq3yLnJ/X4aPgtr38B5BZ+MjFSj+toXo8 Rh5CkjxRHy868KVMbZu4IyRGgmhsIbeo+pwS9zN+EHDk5Ac6Gwpm4DXu5yGyfy2COYhv zw== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 32gj3qwc1d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 28 Jul 2020 11:43:59 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Jul 2020 11:43:58 -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.2; Tue, 28 Jul 2020 11:43:57 -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.2 via Frontend Transport; Tue, 28 Jul 2020 11:43:57 -0700 Received: from BG-LT7430.marvell.com (BG-LT7430.marvell.com [10.28.161.240]) by maili.marvell.com (Postfix) with ESMTP id 8238E3F703F; Tue, 28 Jul 2020 11:43:55 -0700 (PDT) From: To: , Harman Kalra CC: , Pavan Nikhilesh , Date: Wed, 29 Jul 2020 00:13:46 +0530 Message-ID: <20200728184347.3105-2-pbhagavatula@marvell.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200728184347.3105-1-pbhagavatula@marvell.com> References: <20200728184347.3105-1-pbhagavatula@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.235, 18.0.687 definitions=2020-07-28_15:2020-07-28, 2020-07-28 signatures=0 Subject: [dpdk-dev] [PATCH 2/2] net/octeontx: fix Tx xmit command preparation 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 When building send command for a given descriptor it expects it to contain the AURA identifier of the pool that it belongs to rather than the pool identifier itself. Fixes: 7f4116bdbb1c ("net/octeontx: add framework for Rx/Tx offloads") Cc: stable@dpdk.org Signed-off-by: Pavan Nikhilesh --- drivers/net/octeontx/octeontx_rxtx.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/octeontx/octeontx_rxtx.h b/drivers/net/octeontx/octeontx_rxtx.h index 8b46105b6..4dcd94530 100644 --- a/drivers/net/octeontx/octeontx_rxtx.h +++ b/drivers/net/octeontx/octeontx_rxtx.h @@ -337,8 +337,7 @@ __octeontx_xmit_prepare(struct rte_mbuf *tx_pkt, uint64_t *cmd_buf, __mempool_check_cookies(tx_pkt->pool, (void **)&tx_pkt, 1, 0); /* Get the gaura Id */ - gaura_id = octeontx_fpa_bufpool_gpool((uintptr_t) - tx_pkt->pool->pool_id); + gaura_id = octeontx_fpa_bufpool_gaura((uintptr_t)tx_pkt->pool->pool_id); /* Setup PKO_SEND_BUFLINK_S */ cmd_buf[nb_desc++] = PKO_SEND_BUFLINK_SUBDC | @@ -373,7 +372,7 @@ __octeontx_xmit_mseg_prepare(struct rte_mbuf *tx_pkt, uint64_t *cmd_buf, /* To handle case where mbufs belong to diff pools, like * fragmentation */ - gaura_id = octeontx_fpa_bufpool_gpool((uintptr_t) + gaura_id = octeontx_fpa_bufpool_gaura((uintptr_t) tx_pkt->pool->pool_id); /* Setup PKO_SEND_GATHER_S */