From patchwork Mon Jan 15 11:38:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 124511 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp639954lje; Mon, 15 Jan 2018 03:39:19 -0800 (PST) X-Google-Smtp-Source: ACJfBosXnmqj8DQdu6UY4fC7J47GE6MKDeO9A9aHF2A5lcZgk3tT5UJRGtYCoevxdNw5Uy0MXhGr X-Received: by 10.80.192.72 with SMTP id u8mr8583749edd.109.1516016359896; Mon, 15 Jan 2018 03:39:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516016359; cv=none; d=google.com; s=arc-20160816; b=JEsVZOrNr1FMk2mh+CIaIgJCAA65btnpIHBbIZCKB9HjD3aL/oMwxkP4HOwyJWnRpu MYbYWykk4kkzJi1OELQVnCuBZenH2YSn0xXuzFQyamuS37B/+Pcq0lCIdjikEDFCJq7m ScA9ITVMEt+p0edbBMlNskzAyCNiISmvdtDd7Kr5W6MgcDWGulxgvX2gAJ4qDpPi6Q69 l5ESNJwn3Nbkn5Ps8uoXuKamuhuPoFEQinOccdpizvEjwKM3BvEVy7GF4fqPiRJMAUUs 5FNb4ikRfBTwff6t8zLL9qjl6dCh3XeUUZggzRNS31+vh/0iM/+GOzlgW0y2oDXkaioF qrpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:message-id:date:cc:to:from :arc-authentication-results; bh=IwQ10d49f+zVlO+RxBYm7nwqnGr3MKYkWeoXCDi5Zw4=; b=j/2M1iA1cAgRlafGtaREPGT/WEnaJiu0GpJw1RJWOzrFsuEukgkEz6ebDyCvxsyGOi 0TpxHwgbyG7lL07kQsFSHYRIdrj8CLgJ7y0b1V9LyjwiiQy8yWhLsY3KW4h6ahHEumyT c5HYcmMMqX4T9Zayr1MsHQJUgk/lvRXnjkMpjD9ojzp7iF58nRhZjbGDnaistgFv1kEk 6pFmc9zTZ0xxPFFbQaIZEp07197DX3C7QSPXLWEoUBZ2c43xQweeFn5hyjDsqyVanF4D hWfAjP8NWufs5+tZOS890mOY1RwMCqobXG8iHEpMxr/QUpedV/5qh7lnrhXt9RcA/k5r Hldg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id q27si5538069edd.522.2018.01.15.03.39.19; Mon, 15 Jan 2018 03:39:19 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 710CB3772; Mon, 15 Jan 2018 12:39:19 +0100 (CET) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0084.outbound.protection.outlook.com [104.47.32.84]) by dpdk.org (Postfix) with ESMTP id 0BE32325F for ; Mon, 15 Jan 2018 12:39:17 +0100 (CET) Received: from CY1PR03CA0025.namprd03.prod.outlook.com (10.174.128.35) by DM5PR03MB2698.namprd03.prod.outlook.com (10.168.197.136) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Mon, 15 Jan 2018 11:39:15 +0000 Received: from BL2FFO11FD010.protection.gbl (2a01:111:f400:7c09::188) by CY1PR03CA0025.outlook.office365.com (2603:10b6:600::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Mon, 15 Jan 2018 11:39:15 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; intel.com; dkim=none (message not signed) header.d=none; intel.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11FD010.mail.protection.outlook.com (10.173.161.16) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Mon, 15 Jan 2018 11:39:15 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0FBdCEp020011; Mon, 15 Jan 2018 04:39:13 -0700 From: Hemant Agrawal To: CC: Date: Mon, 15 Jan 2018 17:08:02 +0530 Message-ID: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131604899555000830; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(396003)(39380400002)(39860400002)(346002)(376002)(2980300002)(1110001)(1109001)(339900001)(3190300001)(189003)(199004)(2906002)(81166006)(305945005)(8936002)(36756003)(105606002)(68736007)(356003)(50226002)(498600001)(51416003)(77096006)(8676002)(81156014)(4326008)(5660300001)(97736004)(48376002)(53936002)(59450400001)(86362001)(16586007)(6666003)(2351001)(104016004)(47776003)(106466001)(6916009)(316002)(50466002)(85426001)(334744003); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2698; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD010; 1:UVAi32h6zKVcDh0gOwiIEixK7rD9SQMPOx3PY51asCxJHV2D9c/lhnhHxddie15XOx72MNqoyOkEQpQQLLxUZinLO+5mFenexRQEO+bAym2Le+XBGUPj7YEP3MYkvrtL MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7f56b971-7f65-4db2-41fe-08d55c0c9b24 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:DM5PR03MB2698; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 3:NTQsBgnxoIig6E3bzVFnTLyTBsmNLiJOPUg8ks5XGv4baLyMYXE9DcdldbiLLIqE8VmIO7eIJi3t8M47fzVtWkXvFFKwT7w2kHCr/LM7qOK7CY+D4WWDzf+0avDL/cDAGV5GAPvkqut9UtKzmzlWrU1tQ2tiM6YOoFZV9vLE0y2K/12PuL0ssvJHZWPetqlRKP3wKXqj/H+m/IN/MeqKfufYRIWVKN2WG4Z2wHNS/w72EVBH7EX40PX4UJW0DrnO/EWJTWZl0OISZl0qkjT6/E8yvEtOpXQqVorbNCBSfG2VhvvJ5Z+FIZBQxW5fS/mtsUvjz8wVAnPJkH5p/I+nHedxwbK0lSFRXuLZxPttG44=; 25:NtQT/ctUNtbl38CpCzkbrS7GvQXUVmp6CHAhCFq1h/NKdwFQeLn/VFOSmmwM8CjI5czP+zJxRoKC7dW+G933h/JgKQ7pNm+8AYGi6Bo39GOuXcC9NbsnmsjihsNvcvcbY5E1IMUWMT/VV0WyGmNoUy+8+gqxX002iWUAbDOt1m612WqL1Ml0hiI7In8oEW02rYkhECJorIc+wjcf996HWEXMwGcL5NoKzBoGqq1jz3dzGaztiS3Y7Ycsopzl7trDtaaMwgO9X6esr6KtA2M93MVLloclRUoQrsSfdr98Zz1IBiQ/aq8B/B8uuSoK7Ku6TDeP0WtRCp/dAK8PQ1R5gA== X-MS-TrafficTypeDiagnostic: DM5PR03MB2698: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 31:xP14zcNKQGY2D5qdZ+dhwHndez/zHZz/Isn/y60xfqSt9Y+E+mVhEY3dO/R/3taHGLqz0uwyIPnfbbqdpUufDsQhVdCult79KnkdH3xy6K5V1GF95J9ho/M0BuKEApv65/d7oncSsIApOZSoUxHS/QmfbAf3+uozoYbpgJ242jbcd/6vlL/duzLvUuj7PJThGQiUM5uVFmKoOmp1phEKzbT1lJqSeR0KI8CuchMqyhc=; 4:CYrIWkEEMRyqIR19Uj4AbNMtgnE5MjRh3rDzWZLy141zrBhv4qI7p1ricX8WzveZR2hger11X5XllcqLoCbJD1aog9Pm72HXnP3a3qD3OsiRFoevQfqArW79EQBz02AzsgCn29qhqiDqx4hOGvTaYfSDjGWxSHlrsWWNN0Okntw3rNcijUebSWiuD5UUN7eRM3OFyLcoYKvkf6PTBIKXGla1frAtzaplmb3Y90rXnlh34kRFFQs9rhpbFNTYSVXVv9HxGvXgYQmsOtDqwEh8Smgs4VOkH22ISONMEyxOVfCGYKH7pxhxa+pxT5okkGxPre5MgkJP6AQAifi9WJyDXmeYyoMFItAc8aOc97rakm8= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3231023)(944501161)(3002001)(6055026)(6096035)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703151042153)(20161123563025)(20161123556025)(20161123565025)(20161123561025)(201708071742011); SRVR:DM5PR03MB2698; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:DM5PR03MB2698; X-Forefront-PRVS: 0553CBB77A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2698; 23:NMkg7N46jA7M3nTE6isLfsyF9sAqH41w0B4qKnztv?= K3aJyau0g+8JTYU6el2ADqMFqc3tZXia10VjdaGVrg9bLOXLFmR5GIrZVvARyP3hMzesqV9eR2DlEvPuDT0xSKK/Y9SsgSZ32uhKmtwpa1rbpIObFXh4SzaHgm8eT/aqXtBjn7j/gFnwLO8AF0cNuzcJxvVyddGnnlSrfr0AYrrLIXBgY2xgfbBTjwJjPT4qUUvCH1hjaUHkRsPv2gyLH332PcCyWN/c9Jq0E4DlFzNq0a/Whq7A49lrprOxP6s5WINJtJ05XdpU6n9dYzxeMFyeSDiIEcdBHrixJR0BhnpneQ/jve79XmD/GylwteTzXHK9yWuzVBl3BGP5LV85CrNT585ybJbH+S5TurdOuR8/KWa1cPWmUhIlS2Tt85Trit8YknBZsgZVMmmB5QFCwm6Z08SEM8ZJTQy0l/vp07Y4npYhIkKUr6jaafzrwEaJmQLZgaIYAcG8T6oGWBhn7hRMHEYv5ZDfOYyTtK4gvRm3uSFMBuOHpr50zssk6ja+Ds5FpaAWVLJ8MsO084oyfeFPkh9c27NOCA/lcXplgb/zdABzouyCH3V4J6CK9392ntatrYKsVJtkfpvRC1wQ7StA2GaoJgHRYu6ltO7eKwMOJWdGTYix+l3cpCkvPHNAEOWMyK09Kxd3YGgknSkSgcHcWnpstnSotLNTkg6eZ8tXDlUlYQyr5TNOCYgsDfaWq/C/ZnqiIqoF2UEqlTIEu6u/vCN+NcLQA3GFgcTfHJyxoNXGpEjVH9r9gY0QgKgktYuXngpkkxL2/sanXYls0/rJv0KNnkLoaMKG0AeH50N1TqSLpSvA/0aZcCDBhooycTXgLaUZpvLunauv/qPYL/ZaZ+HCAvw1WDbjm30YAPO7cr4oU/zz84YO64s5R1IGei9awA6Go2E3IxSFH8KKIDXO1PCItb33ZopfEzVkDmRFptg1DegwVkpquv/ELwSycVAkB5o2tnNGcosdPWaEh/QCykz9ylNnAeON4lJWHGAxBW5uK/ZFcuCYTftt8VCso8= X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2698; 6:Sc7V5UouprGNthXUdpohHoTIvtjrTWV6AvihP6g5Nk7kldPgIKGYOhvWqqbwq1IMWa2UuQaG4za4ttA3dTdO/ThYNd9KRT12w/UjhMQF9AoA50aO/SvkCxPAGEwxfnXbP3cYqMLr91+iO/ODcmL22jjlsK68Wk6QDY/TvxEvParEwFcXM1mub+7+NzwmTXqTTTvLYN3ZAeR0QZnvG9I7Kv6QBDnvZ0PV9j+qSTuYSw79McNzC59wZfydxvOqY9nL+v+0bsAsxEAaDK4MMoVDGDZrscZK4kz95z1d2dmubH2gRnZ30kesO3WkdOVI4j2Ra2m1XnQbQ6Fl/HkFFU1xLD4EhPiNI02YuzFW/g0lztw=; 5:/BeyHkeFj+pGk8LFRJKAVxpZx3tttR/MMT9OiH3+k+dAG8dx174U6Tr66X1ZozZAlrdOzgckVcK+Uhtp94b3QIysdlxwDGXRNbIClIH8/jZ4+K+qCrNQhq+EeQg4RxHDlLzFa6mmcwxofydmqrb4oiqzenYq2Odx585ev+cYDEk=; 24:1/KodpsmhxJLf8lQpSz0/OeJwXWUJh5QoOo9bj4Ng+TzZJ+fNYGsgtMfocFVm4l+0vzWiWNcLD+yr2KId6V9luwvLgect7YfvhMtiv4fo8U=; 7:pxUp37N1MkQKI8GNEaKsdt246m7avmvDDf6Sjk/u98a5v295cVSEhotGUJgREsU6DABBbKTnwYbgZYQd4AvzZBvqXqYg7xara+DI39tHSAnO7yf9fi9OTVL4Bg7qQSkCVtHG9ItCez2I8o7QPR81mu77tH6DPo5UolSmVgeat4zEovfOkh/EbHpmaiy8RX2I0arKnMzWaKt80XfcZJfDhAEXIcYdMmuZ88hXYTV5S0ZUfK7aO6KlJb1F3JoXsblm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2018 11:39:15.3440 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f56b971-7f65-4db2-41fe-08d55c0c9b24 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2698 Subject: [dpdk-dev] [PATCH 1/5] net/dpaa2: support more than 16 burst size in Rx func 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" This patch enhances the Rx function to support more than 16 burst size. Signed-off-by: Hemant Agrawal --- drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 5 +- drivers/net/dpaa2/dpaa2_rxtx.c | 140 ++++++++++++++++++++++++-------- 2 files changed, 108 insertions(+), 37 deletions(-) -- 2.7.4 diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index 2e79399..97e61bb 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -95,8 +95,9 @@ struct dpaa2_dpbp_dev { struct queue_storage_info_t { struct qbman_result *dq_storage[NUM_DQS_PER_QUEUE]; struct qbman_result *active_dqs; - int active_dpio_id; - int toggle; + uint8_t active_dpio_id; + uint8_t toggle; + uint8_t last_num_pkts; }; struct dpaa2_queue; diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index 53466c3..efad728 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -495,12 +495,12 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) { /* Function receive frames for a given device and VQ*/ struct dpaa2_queue *dpaa2_q = (struct dpaa2_queue *)queue; - struct qbman_result *dq_storage; + struct qbman_result *dq_storage, *dq_storage1 = 0; uint32_t fqid = dpaa2_q->fqid; - int ret, num_rx = 0; - uint8_t is_last = 0, status; + int ret, num_rx = 0, next_pull = 0, num_pulled, num_to_pull; + uint8_t pending, is_repeat, status; struct qbman_swp *swp; - const struct qbman_fd *fd[DPAA2_DQRR_RING_SIZE], *next_fd; + const struct qbman_fd *fd, *next_fd; struct qbman_pull_desc pulldesc; struct queue_storage_info_t *q_storage = dpaa2_q->q_storage; struct rte_eth_dev *dev = dpaa2_q->dev; @@ -513,37 +513,51 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) } } swp = DPAA2_PER_LCORE_PORTAL; - if (!q_storage->active_dqs) { + + /* if the original request for this q was from another portal */ + if (unlikely(DPAA2_PER_LCORE_DPIO->index != + q_storage->active_dpio_id)) { + if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) { + while (!qbman_check_command_complete(get_swp_active_dqs + (DPAA2_PER_LCORE_DPIO->index))) + ; + clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index); + } + q_storage->active_dpio_id = DPAA2_PER_LCORE_DPIO->index; + } + + if (unlikely(!q_storage->active_dqs)) { q_storage->toggle = 0; dq_storage = q_storage->dq_storage[q_storage->toggle]; + q_storage->last_num_pkts = (nb_pkts > DPAA2_DQRR_RING_SIZE) ? + DPAA2_DQRR_RING_SIZE : nb_pkts; qbman_pull_desc_clear(&pulldesc); qbman_pull_desc_set_numframes(&pulldesc, - (nb_pkts > DPAA2_DQRR_RING_SIZE) ? - DPAA2_DQRR_RING_SIZE : nb_pkts); + q_storage->last_num_pkts); qbman_pull_desc_set_fq(&pulldesc, fqid); qbman_pull_desc_set_storage(&pulldesc, dq_storage, (dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1); - if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) { - while (!qbman_check_command_complete( - get_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index))) - ; - clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index); - } while (1) { if (qbman_swp_pull(swp, &pulldesc)) { - PMD_RX_LOG(WARNING, "VDQ command is not issued." - "QBMAN is busy\n"); + PMD_RX_LOG(WARNING, + "VDQ command not issued.QBMAN busy\n"); /* Portal was busy, try again */ continue; } break; } q_storage->active_dqs = dq_storage; - q_storage->active_dpio_id = DPAA2_PER_LCORE_DPIO->index; set_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index, dq_storage); } + + /* pkt to pull in current pull request */ + num_to_pull = q_storage->last_num_pkts; + + /* Number of packet requested is more than current pull request */ + if (nb_pkts > num_to_pull) + next_pull = nb_pkts - num_to_pull; + dq_storage = q_storage->active_dqs; - rte_prefetch0((void *)((uint64_t)(dq_storage + 1))); /* Check if the previous issued command is completed. * Also seems like the SWP is shared between the Ethernet Driver * and the SEC driver. @@ -552,7 +566,49 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) ; if (dq_storage == get_swp_active_dqs(q_storage->active_dpio_id)) clear_swp_active_dqs(q_storage->active_dpio_id); - while (!is_last) { + +repeat: + is_repeat = 0; + + /* issue the deq command one more time to get another set of packets */ + if (next_pull) { + q_storage->toggle ^= 1; + dq_storage1 = q_storage->dq_storage[q_storage->toggle]; + qbman_pull_desc_clear(&pulldesc); + + if (next_pull > DPAA2_DQRR_RING_SIZE) { + qbman_pull_desc_set_numframes(&pulldesc, + DPAA2_DQRR_RING_SIZE); + next_pull = next_pull - DPAA2_DQRR_RING_SIZE; + q_storage->last_num_pkts = DPAA2_DQRR_RING_SIZE; + } else { + qbman_pull_desc_set_numframes(&pulldesc, next_pull); + q_storage->last_num_pkts = next_pull; + next_pull = 0; + } + qbman_pull_desc_set_fq(&pulldesc, fqid); + qbman_pull_desc_set_storage(&pulldesc, dq_storage1, + (dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage1)), 1); + while (1) { + if (qbman_swp_pull(swp, &pulldesc)) { + PMD_RX_LOG(WARNING, + "VDQ command not issued.QBMAN busy\n"); + /* Portal was busy, try again */ + continue; + } + break; + } + is_repeat = 1; + q_storage->active_dqs = dq_storage1; + set_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index, dq_storage1); + } + + rte_prefetch0((void *)((uint64_t)(dq_storage + 1))); + + num_pulled = 0; + pending = 1; + + do { /* Loop until the dq_storage is updated with * new token by QBMAN */ @@ -563,23 +619,23 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) * setting Condition for Loop termination */ if (qbman_result_DQ_is_pull_complete(dq_storage)) { - is_last = 1; + pending = 0; /* Check for valid frame. */ - status = (uint8_t)qbman_result_DQ_flags(dq_storage); + status = qbman_result_DQ_flags(dq_storage); if (unlikely((status & QBMAN_DQ_STAT_VALIDFRAME) == 0)) continue; } - fd[num_rx] = qbman_result_DQ_fd(dq_storage); + fd = qbman_result_DQ_fd(dq_storage); next_fd = qbman_result_DQ_fd(dq_storage + 1); /* Prefetch Annotation address for the parse results */ - rte_prefetch0((void *)((uint64_t)DPAA2_GET_FD_ADDR(next_fd) + rte_prefetch0((void *)(DPAA2_GET_FD_ADDR(next_fd) + DPAA2_FD_PTA_SIZE + 16)); - if (unlikely(DPAA2_FD_GET_FORMAT(fd[num_rx]) == qbman_fd_sg)) - bufs[num_rx] = eth_sg_fd_to_mbuf(fd[num_rx]); + if (unlikely(DPAA2_FD_GET_FORMAT(fd) == qbman_fd_sg)) + bufs[num_rx] = eth_sg_fd_to_mbuf(fd); else - bufs[num_rx] = eth_fd_to_mbuf(fd[num_rx]); + bufs[num_rx] = eth_fd_to_mbuf(fd); bufs[num_rx]->port = dev->data->port_id; if (dev->data->dev_conf.rxmode.hw_vlan_strip) @@ -587,22 +643,37 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) dq_storage++; num_rx++; - } + num_pulled++; + } while (pending); - if (check_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index)) { - while (!qbman_check_command_complete( - get_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index))) - ; - clear_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index); + /* Another VDQ request pending and this request returned full */ + if (is_repeat) { + /* all packets pulled from this pull request */ + if (num_pulled == num_to_pull) { + /* pkt to pull in current pull request */ + num_to_pull = q_storage->last_num_pkts; + + dq_storage = dq_storage1; + + while (!qbman_check_command_complete(dq_storage)) + ; + goto repeat; + } else { + /* if this request did not returned all pkts */ + goto next_time; + } } + q_storage->toggle ^= 1; dq_storage = q_storage->dq_storage[q_storage->toggle]; + q_storage->last_num_pkts = (nb_pkts > DPAA2_DQRR_RING_SIZE) ? + DPAA2_DQRR_RING_SIZE : nb_pkts; qbman_pull_desc_clear(&pulldesc); - qbman_pull_desc_set_numframes(&pulldesc, DPAA2_DQRR_RING_SIZE); + qbman_pull_desc_set_numframes(&pulldesc, q_storage->last_num_pkts); qbman_pull_desc_set_fq(&pulldesc, fqid); qbman_pull_desc_set_storage(&pulldesc, dq_storage, (dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1); - /* Issue a volatile dequeue command. */ + /* issue a volatile dequeue command for next pull */ while (1) { if (qbman_swp_pull(swp, &pulldesc)) { PMD_RX_LOG(WARNING, "VDQ command is not issued." @@ -612,12 +683,11 @@ dpaa2_dev_prefetch_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) break; } q_storage->active_dqs = dq_storage; - q_storage->active_dpio_id = DPAA2_PER_LCORE_DPIO->index; set_swp_active_dqs(DPAA2_PER_LCORE_DPIO->index, dq_storage); +next_time: dpaa2_q->rx_pkts += num_rx; - /* Return the total number of packets received to DPAA2 app */ return num_rx; } From patchwork Mon Jan 15 11:38:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 124512 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp639971lje; Mon, 15 Jan 2018 03:39:26 -0800 (PST) X-Google-Smtp-Source: ACJfBovnl+Egz6f86eRjMs2UWkByUB/ECUTfL30AhjvCLfTZ8ZGteyrCywov2doIi/O/7Lla6PoU X-Received: by 10.28.51.12 with SMTP id z12mr7217307wmz.16.1516016366594; Mon, 15 Jan 2018 03:39:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516016366; cv=none; d=google.com; s=arc-20160816; b=wJY7sHdrdOsn5CWx/bch4Y60EQtXCjxEWYsqR6SrI9tQUaNe0PxcnCg+Vit4kmBniO qLbdcDJXaEfAB0b+bGXzLvXzv+la5BOEXbKoxgSdCfZw4DhAvozBu1F0eAIXs5jpX35F 2CwE0MdZTtXxfNVbSMJkLDdY8xBIeSeqHwfiDjVGQ18xaT9YzO1AZM7fLtc3SgKUjNgY i9MnOvB6qiQn0asDqFXeDMAwup0iwufIbolFBnWy/J3v2qmCA1rtrbP5jijI2NOP3T1c Dcjwiw8g3MIVhjW7rEyt0fJL5QUXQH3DMKAmg2a3vYoHLMECP+zLcelyX6akm5XXXTZN UxSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:arc-authentication-results; bh=uClS3EeEoTAF2Z9ij5N4Q998PFOIVsirj9NWIk55xsI=; b=I5yR5zELQqRXAY9mH41Z/GwDs5kU7yOasyuIPk6FKmZTCx5fsqv80A3qggidsD/VoB WKQ6Jx2QpvZTd9HAQkTaLKfs/5Ebzwpn37BYK2rdRGZzAhv4nYeE59Vlew69tSR6h51c O0sJa/mhShUoNoxRgcvCRXUyEMCZYSRiQsp/LHDf34gUGmqP72nn1Z6krbyDyCtnsFDk A5ZCRJ84pXLdKmRUy1XYH3lOylpnoPI0IA0Rlko6gdvnKLsaQTZmmt2TTh2WjN90nTKl Lwbo3DM4ubtIcHuXrrc8iGLr5fAQmZ5bjZ81KY5RbOAf8GUifCQeEsF0eAy4mwmv3ZLs ixPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id e25si13859721wre.192.2018.01.15.03.39.26; Mon, 15 Jan 2018 03:39:26 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B9CEFA48D; Mon, 15 Jan 2018 12:39:20 +0100 (CET) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0046.outbound.protection.outlook.com [104.47.33.46]) by dpdk.org (Postfix) with ESMTP id AFCEA325F for ; Mon, 15 Jan 2018 12:39:17 +0100 (CET) Received: from CY1PR03CA0003.namprd03.prod.outlook.com (10.174.128.13) by CY1PR03MB2362.namprd03.prod.outlook.com (10.166.207.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Mon, 15 Jan 2018 11:39:17 +0000 Received: from BY2FFO11FD006.protection.gbl (2a01:111:f400:7c0c::113) by CY1PR03CA0003.outlook.office365.com (2603:10b6:600::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Mon, 15 Jan 2018 11:39:16 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; intel.com; dkim=none (message not signed) header.d=none; intel.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD006.mail.protection.outlook.com (10.1.14.127) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Mon, 15 Jan 2018 11:39:16 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0FBdCEq020011; Mon, 15 Jan 2018 04:39:14 -0700 From: Hemant Agrawal To: CC: Date: Mon, 15 Jan 2018 17:08:03 +0530 Message-ID: <1516016286-11942-2-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> References: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131604899566450535; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(39380400002)(346002)(2980300002)(1110001)(1109001)(339900001)(3190300001)(189003)(199004)(2351001)(47776003)(51416003)(50226002)(8676002)(316002)(105606002)(8936002)(81156014)(6916009)(68736007)(81166006)(106466001)(356003)(498600001)(76176011)(16586007)(6666003)(2906002)(104016004)(50466002)(97736004)(2950100002)(48376002)(36756003)(85426001)(4326008)(77096006)(86362001)(53936002)(305945005)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2362; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD006; 1:bJPYtaXTXArm8YSNND5GYdhzua/ipSIye9RLJw71XZe8ooEmAHfW0/I9K+uX8Cb54ziSmAFWwjjMmJxsx++K9iVogLA8DEJEkUJPzuV1nlAIH/89l021Tbe/powI1QL+ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ad3d6c2-cf18-48a5-f767-08d55c0c9bd2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:CY1PR03MB2362; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 3:AswsEvevAl6sg+i1ZcFqfsY3bWOGPP945+x26gQeieTVJqDTg3e0Dw2/KrCzx8W5dUh5AtyI7QflOG9cOwe3p6dtDOtsTmtAeWQXf3TFzluewgO+gsYWwTNfUt7ASSNArQXSelAuBdrhhiXuoAkuoBtoXtMc8dLPndoL1cCP3SgvMoNo62VO2BFIhjWhMKVIDGRQl5UsxNS/IQjIWChw1LvxIl9FXKkJdzeOeiRuct9zIrpg9uBhKRYItQfIKi5lM19VqT4D9NEP6vXoEgVKt7QNh6Fw96Q2SwchToP504yY98jarKN1ERYxrHwYZvKo4RdmnZAdhWGxYIs1KM324ab7gmcqfwF7evacUyGXDwg=; 25:/HLV655U16EguAqlbnRgX4rc80yGSOO5Q+C9RTCUdYb1HyRR4SArvmwhQJzFLdJ3PV6RhPGp4PFXvf12tGFhtDQuBy0qA97bycKr9E6jWYsVSMRE9QXKG+vHQTSGmlPdGL5l24uND2nufN0162Zx64lHbjyKahnwld7u+gybYYlVVvoE9d1qZ27+VhfoSoJ+nuHYRpi+yWm8Uk05AxIUlqPe4uWmkjSUT4Lbsvna9N9aJ5fvRQI4WWGMqFzpmb1yIYzYdOVt7iicYy2FrESQE8NesCw2eVfpr6nchbIc/tH64+Jizo5LqEZt9dcb96JD+otCb+2yySsONSKKdrdi3w== X-MS-TrafficTypeDiagnostic: CY1PR03MB2362: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 31:LlK3TGfU8KbsY5UtRGywP2g0LuE2YDwphsIbGX4CpiB3RqQl77g4I+74cfSmj70bSw6AXU2DfTuHuSwUUyAZxii0Hf2EnpdEpzMeFMebOmQEymKvnzgoGDmuRLIQ/XXsTd7QVD/FJHBmoYAM0l8evJTbxuGqag5BuSkLj7EhIidJcgaL/c0TeuFJOWB9LJdiUF+K1kxtu/Iwv+wmM7o1tkXzMzA+V3lCBHxT+Ui3WmE=; 4:3JDzcR5CAADruUPeiicwQJRVH2sFWVVlCt/s8+LHjq3jkWCOiRp2R0hRHYxZ3hTYFXHmmCPYk7ri8xmjws0q7Y4w+di2bQI0/KQAGZM0H3rLcpUzVk/XF2vImQu9Kju3d4fGOtk6TGRA66A+4iH5K9uPU9n1oxwLM3IQUUtA3k0+pe7CURjWuGC0vK2yCigddk+30vN6tWIQ7o/Py2OATSUYNqNARmeM6jd+FBd+O+cgdr+C/InxkPe/tzgWWkZiCdMgt4K/LMO+zSfg+I9iXtbUr2N9H44IH25wL0hutCqEzUixVQY9GQ3zG3CyABTE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231023)(944501161)(6055026)(6096035)(20161123556025)(20161123559100)(20161123563025)(201703131430075)(201703131433075)(201703131448075)(201703151042153)(20161123565025)(20161123561025)(201708071742011); SRVR:CY1PR03MB2362; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CY1PR03MB2362; X-Forefront-PRVS: 0553CBB77A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2362; 23:7WRU5BHG2IJoySwkxsjRRzgt4XiRe0/P2fQ9s/Om8?= RuPJ/oUI+75Z3QcO8xyZQYGfZLMJh2TjDeBQXeo7nktvRPXrNDk2BBSNclj7bBA7VHnUtETZwxSNHR3g1/B9iIAR/gUQ4WDzx8X2yzMh9uLymx6flHAfc6iYAvNEcPDz5DFBbhE9ncS9lVH65CnFF2U28meCqVv/I9NXfBsfqRnm87Pqfm/Wn23nY8AcrRQZmOMnkzNP8gZwZ4SDtGwmDbztKYHzlUdmc91OcuSBf6D170ebIAvLuZ3OPwCCnxraiPvkTMWnio6gb9DcZLTpD0r5OpaLl2L6Ek0K0O8fLWwuYOaAWNnAGA5ro4aeSwNMLjucuKMCsHg8Dy+4YRkyls56Qczlb/u56EG0B63rGek1YsVwLPTJr6VG9dikrPNtBVtX25fzeomhA7izH4256vO4chCfA1hOT9LSy77HAe24T75s7BihLybntQ6nzYXKdYzQzVfTcbrh8JqS5fl6DOZ2uJSBb0KF9ee+SU36BdGmhRP70di3t4pOt2vMgMZTcC7A4uG1Xn65agRQBCI8Lz/AvYBhe/ru1A+qyZdAvbHphtGgy+pRAsB3PgA+FcxBrgQrNR2wqtkDEXE8vQ7Spx1zVNwBQP38sQmDGr7Sn3uNcXA7fbKmMQio3wOk37HUXQzym9H0Fho92IyqLpcwLI65n/uEdGi8fGZu2WorLBe6OV2kdxIIVjR+Uw1fFfxaNWkHy1XzSu5eRZKQMvZ6ye5pGK2wQR41Tol4BKzFb0guIp4356IIgEKlsovHTBzMtpAaavnmhqyqOskviv8p6yOsM+5hYFMTNksLl3F41lYiEAZa2W5dPdAMWTsLBTWI6NacRvoXqKn30z8+gWX1GyaBJdpIFpyxiXQxXYNpn5udHjrNnLshHTx9eXrwLGkzhu03s3fxK8SdjEl1iRGVkQv3QlPstKA5yCbfvBhvQ88/mq19b4P/OjvEeHrDuKyXbcWmKOHX3yjT4na8lgO6yiByc3n8Tv0jLErYgnYQhvzlxPxyVqmkSW25Ti1MI3ooX4= X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 6:ME6sQzxflsDuR02QvaFvK7dFIuWgT23ajGPlgk1v1vDJTL44gHXtYs8RaGi+6tWkrzUybkIO26KofjnIXfXN+6naoJz3lpzsSe/W7pXNZAjgBO8YLDhrL16eVvVVA+BgEsoXk57SaiKmqOR2vsekvnV9x9QSfViroFLg1FDD4U5XsRJFGz1ah9EXRJfvQFk1uVL2as9bww8AiLAZuT9VzZ/eJveZkP0AlxgytpNeGCHqZWSx4BL7w2xurvCMB/9KN/2ZuNKgLBUqyDq+96zoBJ5DNB6rw6OYCVmhj+5N0GCkhkNvnLZzRM4USKqjmkJ2CSeTbL4L6k2mRv52h57gMQ9Dd+WOglXZVixKRZ0D2FE=; 5:E7+E4kpX36rkB4xtRL5VoCWxCSfXKYwaAZmo7MvvjHuHegk7eaHfWQbRgfcGbzQvEbvtNx85YeRapXo2J+Ig+TjXIaWm9LYw6IHl0AMeAqtYiXDmlio6HxA3YJrwrHAWF2t1A9/ez9nuhwZCfLBcHrrbvniijANNRDAffXT0uw4=; 24:4u43Ps4SfHtFgQaSPRoSG9Gt5Ua7YREG+6rXQaaXkJc0FLL9Dy6tdCN1FanhbIAv/x/2YMSVAfhCD6E7R2KY76m+X4vWSfIeNnIbbRUgEnI=; 7:r8iFZs9tRR3YUMH/i3i/dN2KkrZe9NhSeZWGuaqPSIoPOF5kA9ysz6DZqqktfDXEhrsoM7WwIuH16S4Hm1o4VzAStybR6gg8/TUA2F/D8uQlgCJe2O/HN7eOnnWu+37VVyH4gM/Pxl+aaDCZoT9WgSmnFt/rkWDu4b3nX7W7kZO56atbuQi+eA4+pu19fuK3tj5SSTMh1QqBG9Gum30p6LF0AsCIDwoiVh+/ohJjYnFqlLkkZ4Uv3R7Jb9emS2/m SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2018 11:39:16.4422 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ad3d6c2-cf18-48a5-f767-08d55c0c9bd2 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2362 Subject: [dpdk-dev] [PATCH 2/5] net/dpaa2: optimize Rx/Tx path 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" Merge the offload with parse function to save on instructions. Signed-off-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_rxtx.c | 57 +++++++++++++----------------------------- 1 file changed, 17 insertions(+), 40 deletions(-) -- 2.7.4 diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index efad728..89b7c1a 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -164,15 +164,24 @@ dpaa2_dev_rx_parse_slow(uint64_t hw_annot_addr) return pkt_type; } - static inline uint32_t __attribute__((hot)) -dpaa2_dev_rx_parse(uint64_t hw_annot_addr) +dpaa2_dev_rx_parse(struct rte_mbuf *mbuf, uint64_t hw_annot_addr) { struct dpaa2_annot_hdr *annotation = (struct dpaa2_annot_hdr *)hw_annot_addr; PMD_RX_LOG(DEBUG, "annotation = 0x%lx ", annotation->word4); + /* Check offloads first */ + if (BIT_ISSET_AT_POS(annotation->word3, + L2_VLAN_1_PRESENT | L2_VLAN_N_PRESENT)) + mbuf->ol_flags |= PKT_RX_VLAN; + + if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L3CE)) + mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; + else if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE)) + mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD; + /* Return some common types from parse processing */ switch (annotation->word4) { case DPAA2_L3_IPv4: @@ -199,23 +208,6 @@ dpaa2_dev_rx_parse(uint64_t hw_annot_addr) return dpaa2_dev_rx_parse_slow(hw_annot_addr); } -static inline void __attribute__((hot)) -dpaa2_dev_rx_offload(uint64_t hw_annot_addr, struct rte_mbuf *mbuf) -{ - struct dpaa2_annot_hdr *annotation = - (struct dpaa2_annot_hdr *)hw_annot_addr; - - if (BIT_ISSET_AT_POS(annotation->word3, - L2_VLAN_1_PRESENT | L2_VLAN_N_PRESENT)) - mbuf->ol_flags |= PKT_RX_VLAN; - - if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L3CE)) - mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; - - if (BIT_ISSET_AT_POS(annotation->word8, DPAA2_ETH_FAS_L4CE)) - mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD; -} - static inline struct rte_mbuf *__attribute__((hot)) eth_sg_fd_to_mbuf(const struct qbman_fd *fd) { @@ -247,14 +239,11 @@ eth_sg_fd_to_mbuf(const struct qbman_fd *fd) if (dpaa2_svr_family == SVR_LX2160A) dpaa2_dev_rx_parse_frc(first_seg, DPAA2_GET_FD_FRC_PARSE_SUM(fd)); - else { - first_seg->packet_type = dpaa2_dev_rx_parse( + else + first_seg->packet_type = dpaa2_dev_rx_parse(first_seg, (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + DPAA2_FD_PTA_SIZE); - dpaa2_dev_rx_offload((uint64_t)DPAA2_IOVA_TO_VADDR( - DPAA2_GET_FD_ADDR(fd)) + - DPAA2_FD_PTA_SIZE, first_seg); - } + rte_mbuf_refcnt_set(first_seg, 1); cur_seg = first_seg; while (!DPAA2_SG_IS_FINAL(sge)) { @@ -306,14 +295,10 @@ eth_fd_to_mbuf(const struct qbman_fd *fd) if (dpaa2_svr_family == SVR_LX2160A) dpaa2_dev_rx_parse_frc(mbuf, DPAA2_GET_FD_FRC_PARSE_SUM(fd)); - else { - mbuf->packet_type = dpaa2_dev_rx_parse( + else + mbuf->packet_type = dpaa2_dev_rx_parse(mbuf, (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + DPAA2_FD_PTA_SIZE); - dpaa2_dev_rx_offload((uint64_t)DPAA2_IOVA_TO_VADDR( - DPAA2_GET_FD_ADDR(fd)) + - DPAA2_FD_PTA_SIZE, mbuf); - } PMD_RX_LOG(DEBUG, "to mbuf - mbuf =%p, mbuf->buf_addr =%p, off = %d," "fd_off=%d fd =%lx, meta = %d bpid =%d, len=%d\n", @@ -333,10 +318,6 @@ eth_mbuf_to_sg_fd(struct rte_mbuf *mbuf, struct qbman_sge *sgt, *sge = NULL; int i; - /* First Prepare FD to be transmited*/ - /* Resetting the buffer pool id and offset field*/ - fd->simple.bpid_offset = 0; - if (unlikely(mbuf->ol_flags & PKT_TX_VLAN_PKT)) { int ret = rte_vlan_insert(&mbuf); if (ret) @@ -415,8 +396,6 @@ eth_mbuf_to_fd(struct rte_mbuf *mbuf, return; } } - /*Resetting the buffer pool id and offset field*/ - fd->simple.bpid_offset = 0; DPAA2_MBUF_TO_CONTIG_FD(mbuf, fd, bpid); @@ -472,9 +451,6 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf, m->packet_type = mbuf->packet_type; m->tx_offload = mbuf->tx_offload; - /*Resetting the buffer pool id and offset field*/ - fd->simple.bpid_offset = 0; - DPAA2_MBUF_TO_CONTIG_FD(m, fd, bpid); PMD_TX_LOG(DEBUG, " mbuf %p BMAN buf addr %p", @@ -764,6 +740,7 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts) frames_to_send = (nb_pkts >> 3) ? MAX_TX_RING_SLOTS : nb_pkts; for (loop = 0; loop < frames_to_send; loop++) { + fd_arr[loop].simple.bpid_offset = 0; fd_arr[loop].simple.frc = 0; DPAA2_RESET_FD_CTRL((&fd_arr[loop])); DPAA2_SET_FD_FLC((&fd_arr[loop]), NULL); From patchwork Mon Jan 15 11:38:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 124513 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp640016lje; Mon, 15 Jan 2018 03:39:35 -0800 (PST) X-Google-Smtp-Source: ACJfBovdlu9acgVE9a7v4PeJ99PIMgbybZOGGKj/ZvSMe/okuosZj5JKQDR9S7szVOc21s38QSvv X-Received: by 10.80.228.74 with SMTP id e10mr9386017edm.20.1516016375420; Mon, 15 Jan 2018 03:39:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516016375; cv=none; d=google.com; s=arc-20160816; b=vpCkHQL08U75YX41CH2UGe0pPZ2/5kakiJzd9u02uPV3xEtedHnIHIXG72Zv8ta6Ij xASeRovs9wO+j5A8XFtDd3mrGFS5Zvr2LkrcWMp0IGe6GzSJeJVRn1cu1OHtQdbtwHdq OqnyQ2JnZnL+bHpB0qBDrmf821SE1hLHoNxB0FdSAVPU3iJQ8pDnRU5Va+rtDfQ76S5p jB2qlXsamOccny000pyZGktMOGMvnYoK6E9DEBZCcLYXJ6jC5mLya0rCCZpUylj0bE+/ r341/6/Js9MwpIxobkFoEJETNnkRNC7z51HjDIOP+5sMw5uQ/ICNqf+AHVsCpaSzUPAN 9wgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:arc-authentication-results; bh=eKgQOuLjn58hcdVl3swe6XgZolQYecmrHrH3qAH3g5E=; b=PMiduu3Ail21YLff9FYnRjFUxTy3XV4alLjEVUVtB+71dOYRuH1wl2bnmvmIbO6LHJ zCOZw751sjz85ERmnkL7OzYgBqDMEJJMJHT328av+PnY8NZ8Os5MJZsdJzSX37eTU3qO uUKs7wn+ozS2HBQ2vrQ5C87Gjxxk2NwAxIjZzKUB0/+HTBfUdel8z7zdZMaeOkwIX0XR gtFsrNj2l8+YiO3JNDH/B4bbFIwgfdyw2jeTqxH90fIpNT4nf4oJ7fWyRSVnpg9b+GBW gyoScnv+91peguKkyziPIEQnqd0OK0SRjsCVJUI+v8Q7LkddoVQRlDkHuOb4W+2z6pha vKHg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id o63si3881940edb.23.2018.01.15.03.39.35; Mon, 15 Jan 2018 03:39:35 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BE528A49F; Mon, 15 Jan 2018 12:39:22 +0100 (CET) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0081.outbound.protection.outlook.com [104.47.32.81]) by dpdk.org (Postfix) with ESMTP id D761331FC for ; Mon, 15 Jan 2018 12:39:21 +0100 (CET) Received: from BN3PR03CA0114.namprd03.prod.outlook.com (10.174.66.32) by CO2PR03MB2360.namprd03.prod.outlook.com (10.166.93.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Mon, 15 Jan 2018 11:39:20 +0000 Received: from BN1AFFO11FD027.protection.gbl (2a01:111:f400:7c10::195) by BN3PR03CA0114.outlook.office365.com (2603:10b6:400:4::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Mon, 15 Jan 2018 11:39:20 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; intel.com; dkim=none (message not signed) header.d=none; intel.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD027.mail.protection.outlook.com (10.58.52.87) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Mon, 15 Jan 2018 11:39:18 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0FBdCEr020011; Mon, 15 Jan 2018 04:39:16 -0700 From: Hemant Agrawal To: CC: Date: Mon, 15 Jan 2018 17:08:04 +0530 Message-ID: <1516016286-11942-3-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> References: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131604899595025071; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(346002)(39380400002)(39860400002)(376002)(396003)(2980300002)(1110001)(1109001)(339900001)(3190300001)(45074003)(189003)(199004)(316002)(2351001)(6916009)(106466001)(6666003)(2906002)(8936002)(8676002)(36756003)(77096006)(81156014)(81166006)(50226002)(105606002)(16586007)(2950100002)(51416003)(4326008)(76176011)(498600001)(5660300001)(50466002)(47776003)(305945005)(68736007)(53936002)(59450400001)(85426001)(356003)(104016004)(86362001)(97736004)(48376002); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR03MB2360; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD027; 1:Okc1L0a1GACbfnlYkDUpIf6zVShY/z6GkjI6VDQ8S59xViwkZb2feoiOMw8Oi8k5lHiHMxFcovmLZWl5c7R4crkr7upZ20+x6VoaESSBctJhk94Jp5SY7SFsw4Om05EP MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0609fcfc-532b-486e-faaf-08d55c0c9d86 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:CO2PR03MB2360; X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2360; 3:O1qhMY/8kLp6QbRZzs60JVqBRvkNuRWgaV4Hj90fjOLbijWNViWVTEJJJrEjMoYbun+kFXWEGKrs+J4f8vPWUoioD7VkTy6rC1J9FEe7Aj0hPvQpyUOeNDoQ09lKt4rKt746w9Vi2GORa7GgLiL1ccDkFgW+B7LvFKn2zsvaZC5HsiPxhkQFuFLQCKtAOs+cmc8dMFBI/U/+Xy9yFZsx4NNDNxuz+JF3vYCi+8qJz9cnTh+ZmlpEaHFXBrj4fa3TzQU6vjeW05Y9i6LjnR85n1+n74h8gylfTawE5/gxOJzW/vddq8EFZCmQO1Dr6Z7x0z0Oz7u3TLB2ty1evYECbwKe0fal3RJW602qIhfgOO4=; 25:qMw2TPrmb75TD4+pYRCh/Prs1n2pNQHGyUBgZGoTg2MBp4vBoA4y///WG1vuUWhACnXG9grT1vT+PoL52m9qtYCvdOPLhnosTv2u3HoWsoEiwIkPCOGbPKWGheEcLB4Z0IgjUqr84ikMxClDbwPCMCuZnnERq95jrrJxu7x8N+lfJaEOhDi8vLL1h1/oRHeN9iKHr4qN6Hj4zJABOk+hlBZodk9GIXQ9gEYQq47q6DPd7iGOuWxnQo/4952AF4XBYHOJYcHpMGXpBt9j1CInCcG278zgQblztO4ty2g+5vFIcEKqwXc2tazYrwLEict0DM7iTHAHqlOJwWAzLvzA1A== X-MS-TrafficTypeDiagnostic: CO2PR03MB2360: X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2360; 31:G3rqBkZr67XOLfv6qWpzHbNeUpwgppBXOCWDjMjt6WTTxZyryVs3j6a7P9yBaZq9u2km0jsh+69Lyg4d4FjbvsK9lHK/Qir6e5Hlf+ul7he1YkdfQsv+z/tIuOqMMhkwTgv3hPZdMMNUflVlvZbYTv1gdPZWmsSpNi6rvjQ1m/AA/cynn2q4Xyd9xupwBDzYZFw9D2hj9WYTIai9V1fIeQQ04+n3oH5eoXcHcP2HjlI=; 4:lHoGoENzanIKbnipFa8SSQPoyyWl7M0h7Lgm2ICT7VBxHvYpGGK8ZRq1fr59L+vZJrDNiIwkd2W6+bLE03uVdjCEO3tDtL3T3govC975QoXuuqlm5i9BXwSSR9A+RORRHWMJnfZHsyes9teY1oNPAD5uako1TF3KknH0ri5sktYyAtEgcxrfX45OEcIfFZjlcqV94+pMGhx4DQ4PjL64IXvAepalN4tMKtJ5dPEVCPunLIjKEDigSijTVXtri+EBgHJ7gU/4E06Edf8RhoDbcSFQKrLKalbEhdmLNMsBA7CfXNvG2z7WnrUIBNv86kIJ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(3231023)(944501161)(10201501046)(6055026)(6096035)(20161123561025)(20161123556025)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123565025)(20161123563025)(20161123559100)(201708071742011); SRVR:CO2PR03MB2360; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CO2PR03MB2360; X-Forefront-PRVS: 0553CBB77A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR03MB2360; 23:YB1XOfg4q+er5cFku8eHtui05Oibk2ffCMg8djHPd?= 3egW/rgQC+uStxSeamUAlnEM1CnaiZLhPiSaFQZ/J9eU21W8JyWRpvddSNMh3C+P+AbxIEiX/sCrfCEVReVG5xac2bvv1IkwSxassoMyds6nIyCBH5/nNli4SAfGdCPfICl/VH1JzBXMenEL1WfnJOc9jCJxVLhBQ5iWf4cYam/92yUhWPx0wIRoxEPYkpol7WH4U02QmgMoJAlIRhkHiHaIGK/T9nN6JydCgXf611dHuNesKEX1yrNOUemb70gpOI0HisYvZMPKsziVfHpVOHIZimooLvBj8S9C/OXMBGRHL71z5lftw8S+uHfRUKXDMjylgziPWYE5v57Q3g42kig60EBPWUXGBOYSAmhtDlozaKLTgiieVqzmB/70tqpOX4C0h67H2Mmc8CGmLinpHokBg7k6GMQ2RE/JDnHKmxYzWX51QUCj4ZX7YQqM5TABNwqS8YClgQ6kDQ7rdsVQt7kjUXPeEE7uHmPTxtiDhGQXisceW6i6qecyXpqdlaJtg/9UY05Y/UfgjXJZQ/NnE6MvCKJDKvhunQiQ7WlGI+JZDqTWlbiwUP9zpln/S1irhElk+6K9aB7nfwgPXiT+fT4+JKIMVXmV8bYIu1LnuLzJzV+GNwsBMmXH7jA/kI85Y4idKBwZ4GOzRAbrCztm25sLHQfPGn5LK0m+KLcwxr5q0UFDDzy27yWfWYC2L4uWEFE3cSQHlCKr1DTUGl6UuR7oku3CpjFn5UycffVDGH2kLGq4P0W29wGgIxDyFa774HLHnYHb6t4aMNg6AvlpUEfnEpKYHupNgHLnn1uPlvITeSrWu5oriMnkh3g46uDZwxJZ3gqXQF0jA0vbMvzMJ75oAgPzbanQq1H/K0xEwB0ol48yqU4t+q/ih5oq/1VKXi4TBwy1noYMI0pGvsYQdtBl7ikM7z9Ra3Sc7TAc5W2JdsLEMUbyFooIAwSaMm/6XF7OJFeF8QYrBDQnCiXwpDP6u5P6BsXb5gKrDfiSMn1/uzFP8CCNdOd+U2eGS7sgjJXsAhHpWJg/RQ/Sbfsaw8EWMqe1QLQmFapEXdR0kAMXw== X-Microsoft-Exchange-Diagnostics: 1; CO2PR03MB2360; 6:PsWDLJKll2Ad8WD9cD7bU2Mg8jU2MKEesQyFx4IdyWwMI4HN2IdXJAMErP6hhkx7V1DG6lzVPDN/RFxHI4ztUHGaKTCZZtWgddT+k+nEpMhBU+uUJwPGdq4FLVTNJv9Im3yQQNMcHpvCGgGW+7SmNFwC7b4sBFfGvQ7z/qiDvz0VfYkwORBn7lApZXV8g28AfB3hvMV8gCai9Mrw8I2VJQl1YwJhXxGCks0YLXOXoPo2F0itDI9sim5kbKYTJF1AuLjXErmEeywAzx9iQ8Ap0ILyphwXcKritvLKfiOjCXGBPw4Agw2o25RzZ1VhxVFiadHrS/vnmL94okOewovfhQ3xWsDYHaxu1ixXZ+H8f+Q=; 5:tiMwhMoHbf48V/ziTdiMtHhlsqP+UfeYFX7AcnaySvt+MmpTOsa2182kf7aPBL3lWACgM4evQ9qy/oijChunuXdxfoPza3Yu8FRzoYm8DMH/+LytBWXWuiYyqKWs9/zYHb9qZcvZc04wbgodynnL1t0QwwC0tA/3EcDYmTEHGTk=; 24:PeeVA3NlCebCkgLl0EP5xSUGCSotaYqM3OxDa/ucCz4Jt4X7uUmRyFlEr2mfH2RsYn1vKX1luwnbSffN0C5fr9yCoIJd91qn9q0tW897J6Y=; 7:euVLXc8AG9B/tr0GRgUJig7i/Mpq+ftMa9glKZhyCV1KJWQ4+BGY1GbDKG119M9HyZqsAMxL/AuFCemaW/Kw07LK4JlZQyXGZhz5QaZtj+HlOztNpdNWafSx1bc7hOT3Btn/97in3d7fNd77k8VrIYeVB+A9bAXKfDSfNQVhtL2MbAlccifSmohdsa3nzvq7N7NHmR9ItCICkVXmx1xHhnvzhuj8Rb7sAaOZEb6ABuNV9Aj+UE+5rNX4hRWmt63T SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2018 11:39:18.4105 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0609fcfc-532b-486e-faaf-08d55c0c9d86 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO2PR03MB2360 Subject: [dpdk-dev] [PATCH 3/5] net/dpaa2: change vlan filter rule to be called on config 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: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) -- 2.7.4 diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 821c862..0763033 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -147,6 +147,12 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask) PMD_INIT_FUNC_TRACE(); if (mask & ETH_VLAN_FILTER_MASK) { + /* VLAN Filter not avaialble */ + if (!priv->max_vlan_filters) { + RTE_LOG(INFO, PMD, "VLAN filter not available\n"); + goto next_mask; + } + if (dev->data->dev_conf.rxmode.hw_vlan_filter) ret = dpni_enable_vlan_filter(dpni, CMD_PRI_LOW, priv->token, true); @@ -157,7 +163,7 @@ dpaa2_vlan_offload_set(struct rte_eth_dev *dev, int mask) RTE_LOG(ERR, PMD, "Unable to set vlan filter = %d\n", ret); } - +next_mask: if (mask & ETH_VLAN_EXTEND_MASK) { if (dev->data->dev_conf.rxmode.hw_vlan_extend) RTE_LOG(INFO, PMD, @@ -374,6 +380,9 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev) return ret; } + if (eth_conf->rxmode.hw_vlan_filter) + dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK); + /* update the current status */ dpaa2_dev_link_update(dev, 0); @@ -764,16 +773,6 @@ dpaa2_dev_start(struct rte_eth_dev *dev) "code = %d\n", ret); return ret; } - /* VLAN Offload Settings */ - if (priv->max_vlan_filters) { - ret = dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK); - if (ret) { - PMD_INIT_LOG(ERR, "Error to dpaa2_vlan_offload_set:" - "code = %d\n", ret); - return ret; - } - } - /* if the interrupts were configured on this devices*/ if (intr_handle && (intr_handle->fd) && From patchwork Mon Jan 15 11:38:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 124514 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp640047lje; Mon, 15 Jan 2018 03:39:45 -0800 (PST) X-Google-Smtp-Source: ACJfBovH+jVbN0x+uIPu6zrcjTb0cb0LuXBq5NqWTRpCKa/90NTODV4TwkvW6Sly02Ricw8zJIN8 X-Received: by 10.80.182.203 with SMTP id f11mr24960295ede.157.1516016385680; Mon, 15 Jan 2018 03:39:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516016385; cv=none; d=google.com; s=arc-20160816; b=a9KeSZz7b57uA+uwyOMJc4kwGopklHeoilKUf9cKCswQU4nYfWnxy1d5RcjO7gcA/Z jA6gP/YuI2PdaBxV2LlmR4wqmCGORQxFeZp72sKsSQgunMLmFnUt4YiBnvkWzY8plYWv FTkrPdZJoHhO3gUMllhFFoKUPsoj1hCvHoCy5NB+mCFpjc4ru1F+GOMV2xvDyQgJg5tp aT8dePnkK2+IMukD4xrMKIAb7AP+6wFb9KVANmZQKrF72phhwTlBZsB3HuPrJI7+/9SA qlhHuAKPHTqYVICvn43vOWN/XBa0kWHd+WXHr7u+ltwXPd1uiJQ6366qLd5h3NOJRj9R PJOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:arc-authentication-results; bh=e5ZL2wm+b5fOYlgdfxt1lGwrWeCwlOPN4yos+1YyUQ0=; b=A+qBKQ3LYh04SwaUwwcof3IagjQi9+HvhlgPVBmHIYIdGKuzPun10DR1p6A5+UEWXk 6X3MgpRukafRQd+gMm2Hrju7n2EQrUXMVI06VViLL99eLP70HrlmBcGMnkdD9iM9ekHi F0doQnapaF23JHJ3tYPgixwWRhdCRRp7auh5Q58Skgt0ObegwHRWF0xBZ0sMytct9jVF /+9jAQl37eAIJ54WC1MV0f+zSSBQo/osnSCG+KdtDPti3AiVGlc3vzym/4IBODO79NwL INQW+W1YmG6AUwbyGxQE5EFVJ3u3Koq6Eh27dc7MK1nsG7WqgSRVspZSFbMhmyI1Lw5w kYcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id z2si1009396edb.493.2018.01.15.03.39.45; Mon, 15 Jan 2018 03:39:45 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C7AE712009; Mon, 15 Jan 2018 12:39:24 +0100 (CET) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0041.outbound.protection.outlook.com [104.47.33.41]) by dpdk.org (Postfix) with ESMTP id E9244A84E for ; Mon, 15 Jan 2018 12:39:22 +0100 (CET) Received: from CY4PR03CA0011.namprd03.prod.outlook.com (10.168.162.21) by CY1PR03MB2362.namprd03.prod.outlook.com (10.166.207.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Mon, 15 Jan 2018 11:39:22 +0000 Received: from BN1AFFO11FD034.protection.gbl (2a01:111:f400:7c10::115) by CY4PR03CA0011.outlook.office365.com (2603:10b6:903:33::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Mon, 15 Jan 2018 11:39:21 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; intel.com; dkim=none (message not signed) header.d=none; intel.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD034.mail.protection.outlook.com (10.58.52.158) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Mon, 15 Jan 2018 11:39:20 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0FBdCEs020011; Mon, 15 Jan 2018 04:39:17 -0700 From: Hemant Agrawal To: CC: Date: Mon, 15 Jan 2018 17:08:05 +0530 Message-ID: <1516016286-11942-4-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> References: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131604899609343308; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39860400002)(396003)(376002)(39380400002)(346002)(2980300002)(1110001)(1109001)(339900001)(3190300001)(189003)(199004)(2351001)(47776003)(51416003)(50226002)(8676002)(316002)(105606002)(8936002)(81156014)(6916009)(68736007)(81166006)(106466001)(356003)(498600001)(76176011)(16586007)(6666003)(2906002)(104016004)(50466002)(97736004)(2950100002)(48376002)(36756003)(85426001)(4326008)(77096006)(86362001)(53936002)(305945005)(5660300001)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR03MB2362; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD034; 1:gj0PoMV6f3eCy1Cp8bbwnp/iWHXGptnsIBajull9P7MyIreBi5cPphoyb5F5tlm66jIwTGv1Mtu6vHKchchLr+FtwCKYK8/E0fdXS/mG41PdRPdLkhWklUApFdL+6a+z MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c7f8f42-c5e7-41d3-754c-08d55c0c9e61 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:CY1PR03MB2362; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 3:+oC+noEXfAx9qnFhD49SqFK3RMlvPpkXuXUGlG8WgDgpRXptQ8NTpMIzrWnYvrtD7+Zcwt66ff7sejP0Lp2//mTia6/mUaLZZLkYm4Th2dXNSPYoWDMAi3UjnZVLXHviIxIYdTeiezxqj2v2UbpNUPi4fON54AIozOFaIzka/pfjRSk220i+I6490gG53Ov6xvMfjXH6u3XobVrnoWUnmQUxHKR0ps2QSvtJDnPsS5SQ5PiwA1ZRUK80hEEs/ZqKSKR2PmK7eN7oc8qioIUTbh0cPykcaclP7oXKj9udw/aKDYcyVM6ODQdnDaTpYzbxEjDScFq3KZDfpsK2wDDMromm4jrmnY5GH5g1uBD8iRU=; 25:aF/1Dcz1xR94T9NH7jT2ZP5EVJ8UZUjjJ2gumbBJ5TE/6E1gkh2bR7iAihnKBLEtVrdAp9jbE/iqMqI9wwKaJwcuvBBuVz5a4LfZc8zpGFba6ErOe+o3tqDR7ShQGQn9ja7t3mfJUJfOPBHVvyReIweNaGg4KdAADOueqU2Jluem0Xq36xz9XvujDWtJCZNJ4Rd/6xrz6cBfUA4veAoe1/FQmlhWh1pXfy25vvskOKduTn6gWQGTTKy3TsY7kMOvTEGZlO7ywxqGdpCzCvyH7bBYGB8ZmJ6ehM4jDb2biMzA9l4I9bupnBmGNf9O6voLR/Sr+5/Cx6eqxjJeIeDDXA== X-MS-TrafficTypeDiagnostic: CY1PR03MB2362: X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 31:XBbRGREOpJZgZuYLYntSv0s6SFKW0gbvgWfteBrZOo9DWu0K3lUNmPonC0vkWGRANqpm6qFANCTPgLR1OP4pHcT1vA/xbzWEaUVrhjfmh10vvSPkGslqzuPZhOUrbjMETn5Oh7h0A1BVrimCl22OJtVApkArtIQeCuoUWqxz6c1eNl3APp99xYkbFo+oUP++KWnbiKj9iRRe+MIoCPclDmz0q9mHqdsk9otojfR4M7M=; 4:BYLusbOHrCSwfHKXWsGUCu+VvQP/r2UAF+K6HIStD/v0WX9Y6DqnYT0C3jC8vo9YNrsrMD0feItIbqNhLXqbFOMluuevlAiiik6eZJqNIOCVpsDwYUZR27REF4OaxOJqwV926ZqSLvbE9MYWpgdUcDExzu5XD4wnoIkzLwm6NY2bAWMhGIqWqcLhOqFhs4wSmZIJBK2i6fS7yWpISUrhMRTgy2tfus/8pGQ4qIWa6KfULDpWLSFBNrDDYe9ue0bSv18wBbJXBTWG1GPxrLgBtbe9jU12oYvuXhLKvEy/nRRrnUeTH/6qnjJMwrPltSMD X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231023)(944501161)(6055026)(6096035)(20161123556025)(20161123559100)(20161123563025)(201703131430075)(201703131433075)(201703131448075)(201703151042153)(20161123565025)(20161123561025)(201708071742011); SRVR:CY1PR03MB2362; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CY1PR03MB2362; X-Forefront-PRVS: 0553CBB77A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2362; 23:KUMRdO3iVRpxiSiL5go/6pXpqlEdCuaw9w0vOtCb2?= XFEfQqLBIOPJ5uBuOtYBjds6K46NMWwY2GUTEXOt+/vSKi+7uxmOekSo151+3s+kgzAz8RtFIVKY0RDbW7YZJ/EOl8+L9yJH3CfZ3IOoCp0EI1xE96hduTM3TCmxpNBEQJydrtrkp+I2FuueQWoLInAWJKo00goyPT6Vc2GgcoeVIGlw2Oi33nwmM+Urz3+/xciqPkABIQ41jvvENpRp2hTsDLGnLtFFlXg9LDSo0GqFm29MKtiebeD2kLAbwtY5jXncfTC7nvAmjohck1h1wyq1IK9FEjQ5eA9a+x83NNAUqidIsHO0kOreLzP5D08tcq6/erqZH5gRWSkRXpLKox96hKznE44LMZlADS/+S1m7SCQRtS+Jfs1vWXFp+Al9ryExrlsq6ZvZjvxgoPImXLxSUmzLJHlmUaP/8+xhUciUVkR5tduqQFXy1EwFx5PocX6s/gjJuQzYb91AQqe0K5tJMegZrLteUGsGFinNA9ZKYVhnLd/xWSx9nncUBK7ncOaq77EFFHrudrA2+93ot7s4yyZZ9AyG1S30dNi4+tnAzOJ2mKyIHc7nKRaUZ0ntn1rqlb7wU4Fp7ML/DVH2vpnB8ZmfL1+kKIMHhymVnWrOtfmmSK3t3+hTP5A072/xtQvMBwKAllWyxs9/aDHOHhLWgw7NLKdR9lVO9jA3lCYdCkzoDsSgkZuh3mzfFx71mFqdbp4N/DJNZUuB+oEuNEVDyuNd8sswgHZn6tQQMYBWJT11O0eS0mKQTTj01vSMpIWVCSVT/mJEhJg4WbWCWT7EeufIY2xf9so2uwRkynyyKeZVsyTj0kBmPV1bgN80E7Ph/Sp6LFpKh46YiEFodsWrPPE1f6DVXXOpfHOZkzrPfKpWbZ+0xBUjQsT4PRLdVE+jIfAOXZ2eT8GAMVWw1+VH3dbeGhq5U/gKF9ti6x7d0Ak6p2ylis9knWcOq7Egvh3BkC71Zb+Fm1bYbhlchUpAUILxau7r+J/9TkeaiJpNI6VFBcAv4orE31/xeBcRCrA/bErRdOP/OfMnbBTUrSG X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2362; 6:ThWvMu3OPG2gGL8gzjfP8bp+KOeVi94bUolsq/xqjd4EKqt7OWiqOgM65Hc0CQ27dVqCWZ0DJiuXLMNDIyjKl7frOMMl5HuVi27apyBeJMJc75shZ2NxlNmYYsfylHPcwCSn+Kw/orlCjX8m+h+14HDZwJP0dCecUrcOXDlf2QVoErkYrRI7BcFi4b52832Nsw2njba6t5g/t4QO81DoK0LlqI6f2gZnfY5jY3drPQI5f1EViCfKLo2jSb1+aBJHsN5fevGjsfRC2pUHy0pfPiz+LqEDnIUNuLvRvte+ycdwg3rDVZRIZ6j4spCx6096bDnr8yat+/wnXje3BCBfVKSYLjk9h5VCVM74zaBEIjk=; 5:RAvufaUW3WmwGIU3Sh/ueMhiPKBeayI4En3h9IWAxrykw+erDHPOkjdHXm+FprJL069+QdwTGOcB2A0G+slal+DmFKcZzJDS/vqH20lqjViSy8tS+KZRBh/3l5T8vZ6pWpy9Enp5dJU1m92cwlRrTb16e3wMp/VI5y+Ez1x6BCo=; 24:p7L0z7J8lRkKCAl2G0tdGrrHHyrRifsbqrvNpAxXqAj49MUw1Mc4Clo7U1YR0/E7W8pPnljT4jqjTfkOXKVjAkke9zCLyAfwVNuCiqFatPg=; 7:qQI4ze+aCND0D1HH4U+dAh9k6MM2/PmWir0HlgeonGm1DppQS35l8Y3tBN4OisLwd+5sF7SFgxC4A1HlvIoi+hA/XzCCpWuJYx9RwVT9JNiIwyvsF2GJJQCkpDzZj38rSNCS0pUqmWkDdsmk26MOhnMonzoxyfP3SGhZb6Uorq67JZ0Eyefa0XQ1RdwtSl1RIgpz73mL/WDgKPMIjObSGD3RS/Bnw2GwkDNTxeg0mY7+L3VkI0Q2J0TW3b+oa0Hh SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2018 11:39:20.0919 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2c7f8f42-c5e7-41d3-754c-08d55c0c9e61 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2362 Subject: [dpdk-dev] [PATCH 4/5] net/dpaa2: use HASH FLCTYPE only for LX2 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: Nipun Gupta Enabling hash results in FD requires setting DPNI_FLCTYPE_HASH in dpni_set_offload API. Setting this FLCTYPE for DPNI sets the FD[SC] to 0 for LS2 in the hardware thus disabling data/annotation stashing. For LX2 this is fixed in hardware and thus hash result and parse results can be received in FD using this option. Signed-off-by: Nipun Gupta Acked-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.7.4 diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 0763033..8b1e4d2 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -380,6 +380,22 @@ dpaa2_eth_dev_configure(struct rte_eth_dev *dev) return ret; } + /* Enabling hash results in FD requires setting DPNI_FLCTYPE_HASH in + * dpni_set_offload API. Setting this FLCTYPE for DPNI sets the FD[SC] + * to 0 for LS2 in the hardware thus disabling data/annotation + * stashing. For LX2 this is fixed in hardware and thus hash result and + * parse results can be received in FD using this option. + */ + if (dpaa2_svr_family == SVR_LX2160A) { + ret = dpni_set_offload(dpni, CMD_PRI_LOW, priv->token, + DPNI_FLCTYPE_HASH, true); + if (ret) { + PMD_INIT_LOG(ERR, "Error setting FLCTYPE: Err = %d\n", + ret); + return ret; + } + } + if (eth_conf->rxmode.hw_vlan_filter) dpaa2_vlan_offload_set(dev, ETH_VLAN_FILTER_MASK); From patchwork Mon Jan 15 11:38:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 124515 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp640075lje; Mon, 15 Jan 2018 03:39:55 -0800 (PST) X-Google-Smtp-Source: ACJfBoubcUq39RN2HvB0Zh5vLepllSBgFPYAZFZtFEY3fBoUEmC0+gGz/RRz1UB5XD42bV0IRb6t X-Received: by 10.223.174.236 with SMTP id y99mr22107093wrc.117.1516016395732; Mon, 15 Jan 2018 03:39:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516016395; cv=none; d=google.com; s=arc-20160816; b=tMMWZD0skP+8BRw9urH3idqg4Zv2OBQz79SrZ7vDrzPdRW+sVB74hZxDu5chgyJU7z YVr0gowfDDduRBp8GdqC/FzzpoUsf1r1K0xG45LcIk5N2q2cCf0Lrf9Qe/ywc518W/Bv 1498hdUuzyERtKjqfXHblYlMVGrNZz2y4bQOKj5ha6jVz/fCAJIWnK+vUUk64o1xuAbw UnwUsr4BKB22iyjeXGPR6eyT24Csaz8OUe1VlM0rBMPXFepebbOGxJ4bhkZimC2xqGfG WMjFUd3P3kFJIhz5PlDFcCcN+3oPJAo2zKpjPHcvCGRICFka8Feh7WC4qLtQ0srTkvcu dX/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:spamdiagnosticmetadata :spamdiagnosticoutput:mime-version:references:in-reply-to:message-id :date:cc:to:from:arc-authentication-results; bh=yWk0ytEn7eVZiL/FhA0bygk0rKKM51snZuTspqtrV0E=; b=o+W81oP6ksORoicIFtZ1zHyqaaNVZ3Os4qlNmvJZ9fmaIa1uOHv7y4UAd3GP54iRmB UO1GVDUKckdc7Y58FP0LtFscPh5hkhgDPnLdMF0XGDlDCqOlagyI7RPXXkQM/YKew7vP 8MQHIgZaSC3P0dyTpS3oK7tw58w3VuxhsIKATn6gRj66jZlZkzl1NAKfY63xictdDbsY //+U+yX3F8zyOdghv0ajSd6aHpp7btGlt4i9ID3aKFfzwRg5hRqARDSTX7C77S5vwRxp xgPNF1NMl39A1I72zP3fYBDIFw0STjD0MB4qju6VhdvoCEZSm/tNJAa7ZQ7CxkuiYeC/ oxfQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id w34si11212733wrc.335.2018.01.15.03.39.55; Mon, 15 Jan 2018 03:39:55 -0800 (PST) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 90BE51B018; Mon, 15 Jan 2018 12:39:25 +0100 (CET) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0071.outbound.protection.outlook.com [104.47.38.71]) by dpdk.org (Postfix) with ESMTP id 9B30112001 for ; Mon, 15 Jan 2018 12:39:23 +0100 (CET) Received: from BN3PR03CA0103.namprd03.prod.outlook.com (10.174.66.21) by CY4PR03MB2695.namprd03.prod.outlook.com (10.173.43.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.407.7; Mon, 15 Jan 2018 11:39:22 +0000 Received: from BY2FFO11FD033.protection.gbl (2a01:111:f400:7c0c::102) by BN3PR03CA0103.outlook.office365.com (2603:10b6:400:4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.407.7 via Frontend Transport; Mon, 15 Jan 2018 11:39:21 +0000 Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD033.mail.protection.outlook.com (10.1.14.218) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Mon, 15 Jan 2018 11:39:21 +0000 Received: from bf-netperf1.ap.freescale.net (bf-netperf1.ap.freescale.net [10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id w0FBdCEt020011; Mon, 15 Jan 2018 04:39:19 -0700 From: Hemant Agrawal To: CC: Date: Mon, 15 Jan 2018 17:08:06 +0530 Message-ID: <1516016286-11942-5-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> References: <1516016286-11942-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131604899616739014; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(2980300002)(1109001)(1110001)(3190300001)(339900001)(189003)(199004)(356003)(305945005)(16586007)(316002)(81156014)(50226002)(8676002)(68736007)(76176011)(51416003)(8936002)(81166006)(47776003)(104016004)(50466002)(6916009)(2950100002)(6666003)(77096006)(48376002)(106466001)(53936002)(36756003)(105606002)(5660300001)(97736004)(2906002)(4326008)(498600001)(86362001)(2351001)(6346003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2695; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD033; 1:6CEj7DMNPX9wly/S+MyupIwcVWy/nKEVXhEXE5Jpj2Jc/fKTMv4Q8vcdSn79w6kQ0FCLdGEF8p6StF/M7qhpThQoPLYo2Dt9q2p/2ZVOzs1KGTLZeUvg4u8+WV7S4Ezm MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 26102c72-0e90-4401-4ec6-08d55c0c9ed2 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(5600026)(4604075)(2017052603307); SRVR:CY4PR03MB2695; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 3:4I1NfiWaVg6iY4+y9t9U13L6P5OAPHuKUD+n5mKGzIn6zrWW52htMOJucryU7DMRYtwvdMVHIrcXrIUwaVYpU8CfvK4/3CGOdT94egkwsTYZWl5AhcYKZb6KrfNUViA0j8LfZYiEDA3WSFxhcfRHsM5D6fnUx2Om5IDGQRqZcOqU6l+cGlwLk7uUDAH6NNE9KGaz+RvR9UfYsqeAPP0HGMbO4mC4a6zusVDCTtem0dAa4/IsNYS0NQAPgco+AWKP1uJN4YLiQKJU5eV+6DT6y4UJLnUmFzbLOg13M30mYfb9uTjH5RWNAznwFjOYW8b90MeLm41buouzOVbKjF7l/iYCMWZsCyhB84CL70llTSs=; 25:7FuZ3d4mwvR+Si67V/UH6C/p7hcipNk1kcncRSz/vzeHmTipgzD2qANII0CVLqHlnOeb8X2RdIYW+LvfyNcvJlpEljaxE9x7FCrvVLWhR+UWrHyg21T7REWMXgwor7LUzlo692CpyGMTQEIIkH3iAZFl+tzAZ5tNa2C7H/UP2wWutb3UtbdKYw8JsXjo2tOBnbUOlTFfclVCjebhCq19Lsm8g1Nsd/DoMkT072dMBaaXL47lOCETxDlzXL/hlKpqBKnAXU2FtfA7oM5V0uQmpS13W7Rm0vEb4GQiE1fY5TQI1xr465Je/Lg5cxNa5zuDZKBj+p23dL3mTbY0AycW9g== X-MS-TrafficTypeDiagnostic: CY4PR03MB2695: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 31:TsmunsEZOgOPdqqGLZuCCgLxhZa0oaVVW2SJ/pTy6NF5Pk2TTcuMlZ8o1wF1Q+Mppng3GJLRZ2CBvEZ32Bz2Kx7wuGWp9gRwBxN06iw865P5bcBF43NvP/LyUr8miINwqTVktNezoozNzzhJG6935TUq9sh+GjemFpAGbnwW7NFWBA5AP0ZWuiqzSDEXis+F+UrUVwUvMcRnTtAalcXtbevNKEzwmXNZSHanywupK4Y=; 4:/HycSuNAP1O1+GlGU0JKpX5CrpAe9okxiTiKoE8pe6q9QIwyT+q/FTQWn0J6lzCyRy4EaHZyq4pnsQ055dE0unNTCfTOF7xmN8LdPlrm6dXfxIxgaMHO1qq1yOuyH+knIWElPXdSvazFi3q0sy2KlEP8U8/X/WgPbdy+v7j5R/MoShGvUNTpF7pDiz2OtysyEOzKWxtISnWXsiFv/wp7Oq8KQx0edvhwQeBXxA9hTmXLbzXtWae7SK5eVaYAlIvLbTi6q20ikhznghOnC57oVgDxDVX8o8H87MUTkLhpwwezUrWTwdIqEekSg6v+CfIw1fQE0YD0w/GFbWgaES1fWMnJiaahFsGb5GTb7oKHPFc= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(5005006)(8121501046)(10201501046)(3231023)(944501161)(93006095)(93001095)(3002001)(6055026)(6096035)(20161123556025)(20161123561025)(201703131430075)(201703131448075)(201703131433075)(201703151042153)(20161123559100)(20161123563025)(20161123565025)(201708071742011); SRVR:CY4PR03MB2695; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:CY4PR03MB2695; X-Forefront-PRVS: 0553CBB77A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2695; 23:nOR0cfhNn1/OAtkNtB6nGnJE/OMfD6DdneIb1rqOP?= Da9twbPLg1n9qt1/3vqd4tSjt2J5SBTQ2Rt+nYIKRXd+KgENuaGEb9a024GB6JxyChL5elsgsisVJbuUAWzrVH4lVmdz7Xk3olX6Y5v3kf4TdoLAqF4lOF6Nc2LztwA3Dv43od1OKmKhgzHc5aOCW8nKj3CfUe1FX6+D+oVpRnmnQ7jg+Z0K9t8xnihRtPJpvF/FM6oza1jqXEQAduNRwOlSGQHqlcpjpHIS62Um3xFzQgw21EOay4JjAvhC4hXKpS/dXC990CR3g6BKS+5+PgGf8NXZTgQA1TqzJGFggdpBwqmW6zNJ6YMDY7SiYZsawUU85Nfvth5EQAn3aSNLX+OL9azA6gsK9NsDzGSiRDajNx0PbWy4LBz05nQIK0BoP02ojqFpzStJzDEOJ0ZWzcA6WKFWETQdjsMhdVrs11aWtd9mCkguplJhGP8uuVELnAMHXtLHQCCgnivGerB/w7QKKbD/bfjJiYG2q1e6Ww2TUSTibrEP9hVxjjApx2dV9UYcHDfAL9Ud/ehD4+Veqh66HDYcrt8QKa0m5aOFGPouABCiTHJ8H35KdgVL9Deai4rnW76QwVuPMk9hHOD86w6MTCXeC6FZPlKUA69WAlQ+QuGD4/0yIht/zCJbzpKOVKJhafO1OCLytT2u6hzve7IwpY9C3m3ulkEc+gBxsRqycQVGe85SyAJPx3LdGiWWfkbLZ28mYsrwT/qXnPRTxFlgmCkbIMy/ROximbM6O7lUY82ynCYPTeeU7tO9H0fRDRSJ7Gfv1mjlcs9NDeDriSs7ijotQkWAvc7BduSWRykpT8GeXwoE0E+Cn6z9IYjw6FGd1bOtUff0DSd+EGRZ+WQoKAEpkzOBuQxgNQdOgdjeMxl6AMCMevuZnOVDLbuSH6ceHxNWg2R8iRIqpP39A9Ik/tc0Agac1JuIfQxV4jzoU91EGvtfwtqQxG0MnWyMPwiHdSJi7igSEl4eN8ZgkUBtUDpz1VinFw6xK6EAA9QSNLACgUS/j0hrcexK/LZwbY= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2695; 6:zsKBWdGC0a0d1UhjU5gGg4kOW21ZcJ5j2kwMmDEO6ctRnbWL8KWFcZtkwXGaHhcC+S85ImXhAcyzJx+plrh98Hv7ij3iRdMTJNrQs55wZgsqkPH2q7kzvuA936aoCceaC35SRbjBBwIenyGuACaZHVG0yjmxt0yE1tk0OxJXHo0c7BiNdgajeCE+26efAkvTy7siYXx1ggB59CGkephKloZeGlWgZ/Ed7yYKEsUFjUTpZEychCuJWL2QOwZgJiVQpoqfrGhi0rFG+fU9jntlR++MD4uOryRBQQpEHn57Jo1dY1hzrJ4zq2qplUBUgUGDaNt8GUpglXHK0fe29RTl2ILNxXivhD4aUHFEuhP+ayI=; 5:6TGo+meWqTryJaYoY85nTBJ3WUIgbFRAQ6+volU7zBA9PHpQelsYN2qbRqPZZSVVFVPriYcPwhVW9YffHkzKxLlYgmuXAMT98uINHbwWAnrpdd0IxnWbLashwa4DuDzt5kCbmgXf6qrR9R6zBR1DLcljD/eL2AltRTP/DQ5FJhk=; 24:Ctb0T9/kZloUzhoGBdK73qGB5YHjzl3ySxYVrx+wOzVNKGZ/GEOpmHbB5EybDaVAHw+0EHx9AsJFh8KpC8/vCsf29kDh59VM2gtEpla8w7s=; 7:01VuOKeqj0YfV9Zcf2foCbAamCnljhoRgrY00QbwxPLQMz9gqzgWIzygznS9KM0H/Pgq2+u0J4ODGIzAml/ZETRulytAFGIQHNvgHXOKMlpPmQw0pL3dh84oANWb+NIl8nxufW2EZHxkCR5X6tp+CiZ+gm0XUyAeEs7XgjuLkvwbB4lDujCJjc/AnzIfVSn5vhRcbKRbLwj4QHuvdEPr/hCqq2XafQOONLkRO1m/yfCr2LLkdD6YVqnFyfVJjSU3 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jan 2018 11:39:21.4866 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 26102c72-0e90-4401-4ec6-08d55c0c9ed2 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2695 Subject: [dpdk-dev] [PATCH 5/5] bus/fslmc: disable eventdev config with no dpaa2 eventdev 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: Hemant Agrawal --- drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.7.4 diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c index 6e349a7..537141d 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c +++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c @@ -86,6 +86,7 @@ dpaa2_core_cluster_sdest(int cpu_id) return dpaa2_core_cluster_base + x; } +#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV static void dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id) { #define STRING_LEN 28 @@ -174,6 +175,7 @@ static int dpaa2_dpio_intr_init(struct dpaa2_dpio_dev *dpio_dev) return 0; } +#endif static int configure_dpio_qbman_swp(struct dpaa2_dpio_dev *dpio_dev) @@ -266,10 +268,12 @@ dpaa2_configure_stashing(struct dpaa2_dpio_dev *dpio_dev, int cpu_id) return -1; } +#ifdef RTE_LIBRTE_PMD_DPAA2_EVENTDEV if (dpaa2_dpio_intr_init(dpio_dev)) { PMD_DRV_LOG(ERR, "Interrupt registration failed for dpio\n"); return -1; } +#endif return 0; }