From patchwork Tue Oct 17 16:38:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nipun Gupta X-Patchwork-Id: 30468 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0F8021B7EE; Tue, 17 Oct 2017 12:23:30 +0200 (CEST) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0083.outbound.protection.outlook.com [104.47.38.83]) by dpdk.org (Postfix) with ESMTP id 8778E1B7EB for ; Tue, 17 Oct 2017 12:23:26 +0200 (CEST) Received: from BLUPR0301CA0027.namprd03.prod.outlook.com (10.162.113.165) by BN6PR03MB2689.namprd03.prod.outlook.com (10.173.144.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Tue, 17 Oct 2017 10:23:25 +0000 Received: from BL2FFO11OLC004.protection.gbl (2a01:111:f400:7c09::171) by BLUPR0301CA0027.outlook.office365.com (2a01:111:e400:5259::37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.77.21 via Frontend Transport; Tue, 17 Oct 2017 10:23:25 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; NXP1.onmicrosoft.com; dkim=none (message not signed) header.d=none;NXP1.onmicrosoft.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11OLC004.mail.protection.outlook.com (10.173.161.188) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Tue, 17 Oct 2017 10:23:25 +0000 Received: from b27504-OptiPlex-790.ap.freescale.net (b27504-OptiPlex-790.ap.freescale.net [10.232.132.60]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v9HANHXe024567; Tue, 17 Oct 2017 03:23:21 -0700 From: Nipun Gupta To: CC: , , , Nipun Gupta Date: Tue, 17 Oct 2017 22:08:31 +0530 Message-ID: <1508258314-11151-2-git-send-email-nipun.gupta@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1508258314-11151-1-git-send-email-nipun.gupta@nxp.com> References: <1507657887-11366-1-git-send-email-nipun.gupta@nxp.com> <1508258314-11151-1-git-send-email-nipun.gupta@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131527094053472664; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(336005)(39380400002)(376002)(346002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(51234002)(199003)(189002)(356003)(50986999)(50226002)(76176999)(6666003)(106466001)(2906002)(2351001)(8936002)(105606002)(33646002)(305945005)(81156014)(4326008)(5003940100001)(81166006)(498600001)(8676002)(104016004)(6916009)(16586007)(2950100002)(85426001)(53936002)(36756003)(54906003)(47776003)(77096006)(5660300001)(189998001)(48376002)(5890100001)(97736004)(68736007)(86362001)(69596002)(50466002)(316002)(8656003)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2689; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC004; 1:r/ziKe+qADmaXgmvb2kTTUvRHx/uw2pBbFt9FlMXARsqeNCNYWkqLOc16rrKEj2wHi6Nlk//CHw6dGjUTbPbVoqHOt8Qv7PDF2j9UhBZnJAojHrgS815/PvX7Lo9gU+M MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bbd5bf38-cc99-4172-7eb0-08d5154919c9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:BN6PR03MB2689; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 3:WPWaVqhXPGL+2URT1WaPWMzapPfbNiqhRpZmEPGYOH1FdESyFPoZGxTtBc4p70vfkMyESz0Oiui0jIwF4cD77HIyx1yZ6Uz+QK5z9PNFgkuia+y44wsw/tDk654XrqabM4oibKlgUuAa+ibH9cCL5RySEAkohd31cVvn7dYFob5rR6CFvZ3wqT2yS8G2OVwQ5vdaFewyS7UXVyMEXprREjGhDo5ojoICmUnWW3JNhQ4GF0t1AHDqP1IvC8slSBRyxPKe2m2isiCCBPpkkuDK3T1csGAv0Ah0GzI57GbmFretCM/W34zO/Aj1E8QkeDYC6VZzACcVbkWxFnoS3I6vjdnNl56r5RDN4Nttc938wnY=; 25:YUNxz9Vcq84dhFbTzbL50NPg6XUxeMGTyIgVPDX8Nwy9/pDXQvEEfVAINVMhy4JbJKHX7iqsVG8pkGFt7rotMZv/dERDg0v0EEn/Ka808sMc+dResGsCJ8gfTqHtR7hyzQ1WWTz5xzKnXoHH/2Nx+ybonIKPOkGCAg5IANDtGxpeGtQR5WyUfjBF1lQTOZKDld3or6FlGthZtdnankbX7JAjjqJFyuRUuKJrFoqVYg86SvRJuOzKiUQRKaIu2CAPXnrzNaYLnkbd2l0jx7IRTDWZN6M/BxJlQX9D6objclOIzMxHYb1xYuemEoa8K5GbB+ioR5oRTiRisi4wshS0qQ== X-MS-TrafficTypeDiagnostic: BN6PR03MB2689: X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 31:yZa0ItMvBGxuWHCiRNwQicQsnRVUG3D67Ib3VbQY6yAp3xm3yyyVA8flK4gU7ImoX9ExFR2E3zB8TjDzYDUqwgk4+wfIPa3rKbwNBpW3Sf0TEKtH5qbH8Yh94KwmfrV67jDAs1kkNggeSFAjT2jRTG/A/qBhLQFrc61yPIF7WJt7VgkHDPA8DukOrTSdnm7l7/f+fmUZMosd3mha/t6vY/lFXp5hBGTMsBntblWaXLU=; 4:3EQjNjlIoDuU528lNcCgIGXfrSoJf5NxcXqio8L6jME5DRbT9PaLd7haTVSeV+8Eccnf11Rfxw0HysFXx6ML6AnDCO2/11ACbQSXF5h+2EJkPv/x+Vc0waOfN1PKpsFJjtvNYIRheJdi76gLNeyLO00iEpzrzZApFqkRXaSXrwM7nQyPED0FUMEBXUemC7aE3NF08Sm4DGNV7QF+jzFk01bPA2prr2y8CELnZMEXI8AWRHnmR9b/A9r77znhnXRBMOeLjcByQpN+/9kt307FmQb/9Ogr3f5VFEY1utiAZIU= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(100000703101)(100105400095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(20161123565025)(20161123561025)(20161123559100)(20161123556025)(20161123563025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN6PR03MB2689; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN6PR03MB2689; X-Forefront-PRVS: 04631F8F77 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2689; 23:wfHEZDQZW6HjdggNpP+Lw3djP5XYNjfEX+xLKiZJz?= WgX8R45NsJI7wOa33g13Q2WechicydN2DkbQzrEzlWrx6F14E131Ndma2tFbErX7Fd31hcTbtjLYbjjIc3VCbUZibbutb0VPnF8h9ig16DiIIks8pVH7pimZfzxUQsRjHWK1T0H+PHhP3fH71ehXgvcvi/u2ACCbH+27tGRNmB3TbXM/YkyhXhFTg9iVlIGzb9uSCHF8cm2pB6jU62Glaiuker9e6wyYsjYQWT0UQwiLWd1pVCo0w3TF/eT9YUfF641sGasVHjvinhBJ9x6wQ9DLcr+iHSBAKD5cuFSxOLxLxgPX8dFkSbNDLdlQ8NalmYd4ucQnC8QVDrCvc3mSiHBhOfbi9y5Sd77VDZDJ2WY5cRQ/0HvmHrpigepw4nwAhuGqTjbry5op+ReQlxEt8lfwId2ujepbFJFSEkwI8XScn7WXOG2ELMj0CVmH5XnvtOwZ2V50CnsL+V9zXC2un1GYLIeCjq+HwuShiMd3S2nxVUurU3s59b0vo8UowKg4lkZ+RvwQjku9nrbIzxVX3siQlyfvin8nyg60iWlmaLsVff/m/riQ0TTIlTV5yLDMYEUKoQsFmVW6FRzshYKCXHOGZ21+uWZ5qi1RUi8s14sZVFpDnOOnWIBUC57AVUxbB/TEAFkdGxNEwj4VOviu1shkDJ51DCw7hIWVh7bx+RcIgKOY8wDhWT8yfyuv/NSv3hIRIMNRH+fmMfNEnnGA9UyzZ9vZjNs9VV6JDgfz1pwKNoLxUtTJRuGqZRh6IhaNvrjHt6dXlxeqo92zwjZVWH+WanjP5VdKEfnB1v65TBOlslKbf/eMfPSyEavZ9Eg4clGNE5O91n/CC97cW9VPZ5oxLx/VVBxZnyQ20cHvifaO4xJHW6DJZ7rSwkvJirstziNtAF7bsDVW9Rm9QkHY6WTmmroNvsNpwFUAq0uGudBjRycy28xM1jXJ49czYDCoVh+IErJN7fHocrbh3A2IwHmDQk07YS4KC+Tl4Rzdj+oVjSIhyY60h9RmywZCpJTzqOEk/nFzlDMf97v55hR+GHlcW8XiMu/aSpR3r92M2rK/upoB5DI+zzBIgNVlRjIiPFOZbwTxpGeTZMqh5SJtEhngZYv0/YX0phsODhmPDbk0NNEyGHIRQoZcQw8djjcO6VhDZMuVFbSkVm4WeXT8TWlMIE64L1nZKI/yIokA++v8RFUtmQ8sieKh2BchKDqn85s4fPKESo5yDOMO3FQdXMA4CezGOHFqgWb7PjT6UfVF7QIEmoKMnyFM/OqLjMSTA87gkrhahcFsrMsYnpv+hYv X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2689; 6:esyva4SGldzGmMdyw2QrfNKLEPC/wZaWcY19R+FdmKa7uvprs/OW65i+VlJ9WktTAwiCH+d8amERMGlmsSnONk6Piw1RFHfptyLa7k+xn5ND1IbZ+4lxE427YnSwt62SNwGvCuSb+BoSkpyyiQu4SU5yPCMwr5QPsbk9uX624vSFpOFNry9YUt+8GsjRCFRCURsiX3F945ontaKdtre5kpLEjuYi6x8cBdIVeHk01KH0yxj10nzwD9gDNUvTNJlFA2uEgHr4DAxnAz3dZgUdbaSvCChmEtFRokdLuo3mEs6+wI1uoTPHy/wVENIzB0soP5hD1/NQ+Krgpcx1QwpA4w==; 5:jnI/qp9zqXVfQZlQmOSeuOnby10QJccyPlz5KIhEslBkG+4PAxUJfc9bhAlQTwQv4NHDJA/JspVh/7m55R/Tj84W+TmqkRXgkVmSA2sImdXQ33gY5DOqWrgFqIa9Yjy1SrzQKlPx984Gnl+WLd+lNw==; 24:FnJXuOB26fq5ieJZyGNRFdYk9wFDP2uMf4ADR4YSMTDAkVRI/uwPJ5eHdCUrt5Or0HiSD+2cTo6ZjuyykK/DtCyfL3N/ukNg1NVOGzGjisY=; 7:aT9TVeBts1dQLvoH511I8yKd2mlg3pYG2h6Mv25C610jS1SufnvdpyBaJUfioDA43qvS0TYRNY0h9ZLN5sCqvE8+VOY5mO7mj/yVvtMECh7r0WQCQgBOxzR0HYIZAQJ6SrlqvFB772huAh9Kc6+lcRCrSoFtmvuYUrw8huRTZsyLHeC3Ix2dSy0hMCptwnOgR7nu56pB1Ew3uoyihJHO/TGbq0i/aapaFEZTk1mUVf4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Oct 2017 10:23:25.0040 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR03MB2689 Subject: [dpdk-dev] [PATCH v4 2/5] net/dpaa2: add API's to support event eth adapter 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" Signed-off-by: Nipun Gupta Acked-by: Hemant Agrawal --- Changes in v3: Check the queue schedule type before configuring MC (Hemant) drivers/net/dpaa2/dpaa2_ethdev.c | 62 +++++++++++++++++++++++++++++ drivers/net/dpaa2/dpaa2_ethdev.h | 15 +++++++ drivers/net/dpaa2/dpaa2_rxtx.c | 20 ++++++++++ drivers/net/dpaa2/rte_pmd_dpaa2_version.map | 7 ++++ 4 files changed, 104 insertions(+) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 1ac607c..14d79b9 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -1634,6 +1634,68 @@ int dpaa2_dev_stats_get(struct rte_eth_dev *dev, return 0; } +int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev, + int eth_rx_queue_id, + uint16_t dpcon_id, + const struct rte_event_eth_rx_adapter_queue_conf *queue_conf) +{ + struct dpaa2_dev_priv *eth_priv = dev->data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)eth_priv->hw; + struct dpaa2_queue *dpaa2_ethq = eth_priv->rx_vq[eth_rx_queue_id]; + uint8_t flow_id = dpaa2_ethq->flow_id; + struct dpni_queue cfg; + uint8_t options; + int ret; + + if (queue_conf->ev.sched_type == RTE_SCHED_TYPE_PARALLEL) + dpaa2_ethq->cb = dpaa2_dev_process_parallel_event; + else + return -EINVAL; + + memset(&cfg, 0, sizeof(struct dpni_queue)); + options = DPNI_QUEUE_OPT_DEST; + cfg.destination.type = DPNI_DEST_DPCON; + cfg.destination.id = dpcon_id; + cfg.destination.priority = queue_conf->ev.priority; + + options |= DPNI_QUEUE_OPT_USER_CTX; + cfg.user_context = (uint64_t)(dpaa2_ethq); + + ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX, + dpaa2_ethq->tc_index, flow_id, options, &cfg); + if (ret) { + RTE_LOG(ERR, PMD, "Error in dpni_set_queue: ret: %d\n", ret); + return ret; + } + + memcpy(&dpaa2_ethq->ev, &queue_conf->ev, sizeof(struct rte_event)); + + return 0; +} + +int dpaa2_eth_eventq_detach(const struct rte_eth_dev *dev, + int eth_rx_queue_id) +{ + struct dpaa2_dev_priv *eth_priv = dev->data->dev_private; + struct fsl_mc_io *dpni = (struct fsl_mc_io *)eth_priv->hw; + struct dpaa2_queue *dpaa2_ethq = eth_priv->rx_vq[eth_rx_queue_id]; + uint8_t flow_id = dpaa2_ethq->flow_id; + struct dpni_queue cfg; + uint8_t options; + int ret; + + memset(&cfg, 0, sizeof(struct dpni_queue)); + options = DPNI_QUEUE_OPT_DEST; + cfg.destination.type = DPNI_DEST_NONE; + + ret = dpni_set_queue(dpni, CMD_PRI_LOW, eth_priv->token, DPNI_QUEUE_RX, + dpaa2_ethq->tc_index, flow_id, options, &cfg); + if (ret) + RTE_LOG(ERR, PMD, "Error in dpni_set_queue: ret: %d\n", ret); + + return ret; +} + static struct eth_dev_ops dpaa2_ethdev_ops = { .dev_configure = dpaa2_eth_dev_configure, .dev_start = dpaa2_dev_start, diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 7b14ae0..b8e94aa 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -34,6 +34,8 @@ #ifndef _DPAA2_ETHDEV_H #define _DPAA2_ETHDEV_H +#include + #include #include @@ -100,8 +102,21 @@ int dpaa2_remove_flow_dist(struct rte_eth_dev *eth_dev, int dpaa2_attach_bp_list(struct dpaa2_dev_priv *priv, void *blist); +int dpaa2_eth_eventq_attach(const struct rte_eth_dev *dev, + int eth_rx_queue_id, + uint16_t dpcon_id, + const struct rte_event_eth_rx_adapter_queue_conf *queue_conf); + +int dpaa2_eth_eventq_detach(const struct rte_eth_dev *dev, + int eth_rx_queue_id); + uint16_t dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts); +void dpaa2_dev_process_parallel_event(struct qbman_swp *swp, + const struct qbman_fd *fd, + const struct qbman_result *dq, + struct dpaa2_queue *rxq, + struct rte_event *ev); uint16_t dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts); uint16_t dummy_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts); #endif /* _DPAA2_ETHDEV_H */ diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 7cfa73a..a317f7f 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -514,6 +514,26 @@ static inline int __attribute__((hot)) return num_rx; } +void __attribute__((hot)) +dpaa2_dev_process_parallel_event(struct qbman_swp *swp, + const struct qbman_fd *fd, + const struct qbman_result *dq, + struct dpaa2_queue *rxq, + struct rte_event *ev) +{ + ev->mbuf = eth_fd_to_mbuf(fd); + + ev->flow_id = rxq->ev.flow_id; + ev->sub_event_type = rxq->ev.sub_event_type; + ev->event_type = RTE_EVENT_TYPE_ETHDEV; + ev->op = RTE_EVENT_OP_NEW; + ev->sched_type = rxq->ev.sched_type; + ev->queue_id = rxq->ev.queue_id; + ev->priority = rxq->ev.priority; + + qbman_swp_dqrr_consume(swp, dq); +} + /* * Callback to handle sending packets through WRIOP based interface */ diff --git a/drivers/net/dpaa2/rte_pmd_dpaa2_version.map b/drivers/net/dpaa2/rte_pmd_dpaa2_version.map index 8591cc0..b741bc0 100644 --- a/drivers/net/dpaa2/rte_pmd_dpaa2_version.map +++ b/drivers/net/dpaa2/rte_pmd_dpaa2_version.map @@ -2,3 +2,10 @@ DPDK_17.05 { local: *; }; + +DPDK_17.11 { + global: + + dpaa2_eth_eventq_attach; + dpaa2_eth_eventq_detach; +};