From patchwork Wed Jan 10 10:46:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 124064 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5179484qgn; Wed, 10 Jan 2018 03:56:16 -0800 (PST) X-Google-Smtp-Source: ACJfBosOaAqOlcD0tTiZ1s6dkra6wrIuFAKf/Wq2jgZx0GS7EtpoNgXcfrXVqA1XZRBgwLHapMV9 X-Received: by 10.28.59.69 with SMTP id i66mr16857183wma.3.1515585376609; Wed, 10 Jan 2018 03:56:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515585376; cv=none; d=google.com; s=arc-20160816; b=RCwab5JSCSeRP8vlxJVJtk21hpVUv+RbZo/Zw0A4qeIq9x6t7MRax1zLXNvxi9RgXS TLbbVqpTQ7ffFkA75FanHWnReKe0WUOw/c2bevoKUTpcQLRkZVeJTrLKmvRzeaHt8RBs fgzt4/OFSSurKxngfW+SiHtzG14nQ+vZ0xGn0aA/09pXV+IFvKBVGETJHM2miszDqJiH CDirfFFIp4mywz7LU3pnHRD+ZnqrGsqGQLbdLJ5+OPZK2D9Rnw8Ai3OvOrufFLVcm50W pCkrt3KCnTX796TNXPp+79xF8jNphq7cKDnK2widk7Xf4BpD2pt9TFgz4XeV/fE7reV0 8oGw== 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=CtElO0gBWn2gqpB+l76kxxBLWJyBChQUyKCirl/Mkjk=; b=syIwwAPbJG0i71mb68lwJEGhr/dKtSVDKtzHRBQn/o08oG/3Rj6vQ4SSl3QM2ZbomZ fZnlPW0Pdh2sscHvSt0aYfGTDaUYKnETVJsbm8iVJpoAuW3WzKMew/DMve9FXg2xIrwx OMbBpYjSWOOfUnL+K6EeUxleD9x6XLLZ4/7KCcpQxjA76KQ/uh2ILprmYmo2NiXWg0hb 0AtBG+/+dmidQPNInTPt/0P1mnO3gT4eTaf8Yu1TXuyTd9659iMpLHm7DPgqsXLEu2CF h+YMtXDPdMgGIm97VAEvyoUh76KIMu6xNY10tb+73F7y2DxL0lr65MvVLd8km62b9b06 44Wg== 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 p86si10994257wma.42.2018.01.10.03.56.16; Wed, 10 Jan 2018 03:56:16 -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 7AE1C1B2BB; Wed, 10 Jan 2018 12:51:18 +0100 (CET) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0052.outbound.protection.outlook.com [104.47.41.52]) by dpdk.org (Postfix) with ESMTP id 4ABC61B1C6 for ; Wed, 10 Jan 2018 11:48:05 +0100 (CET) Received: from BLUPR0301CA0010.namprd03.prod.outlook.com (10.162.113.148) by DM5PR03MB2700.namprd03.prod.outlook.com (10.168.197.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Wed, 10 Jan 2018 10:48:03 +0000 Received: from BN1AFFO11FD017.protection.gbl (2a01:111:f400:7c10::151) by BLUPR0301CA0010.outlook.office365.com (2a01:111:e400:5259::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.386.5 via Frontend Transport; Wed, 10 Jan 2018 10:48:03 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) 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.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 BN1AFFO11FD017.mail.protection.outlook.com (10.58.52.77) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.345.12 via Frontend Transport; Wed, 10 Jan 2018 10:47:29 +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 w0AAljSN007124; Wed, 10 Jan 2018 03:47:58 -0700 From: Hemant Agrawal To: CC: , , Ashish Jain Date: Wed, 10 Jan 2018 16:16:27 +0530 Message-ID: <1515581201-29784-6-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1515581201-29784-1-git-send-email-hemant.agrawal@nxp.com> References: <1515504186-13587-1-git-send-email-hemant.agrawal@nxp.com> <1515581201-29784-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131600548517185656; (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)(346002)(376002)(396003)(39860400002)(2980300002)(1109001)(1110001)(339900001)(199004)(189003)(104016004)(6666003)(6916009)(2950100002)(36756003)(47776003)(8656006)(50226002)(85426001)(86362001)(5660300001)(54906003)(16586007)(305945005)(356003)(68736007)(81156014)(81166006)(8676002)(105606002)(97736004)(296002)(106466001)(316002)(53936002)(8936002)(76176011)(4326008)(48376002)(51416003)(498600001)(2351001)(50466002)(77096006)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2700; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD017; 1:aQmWASTymOd0O0OQ49kvfIKOk1qG+f9Q5nARcGIqYsZ4tpK2hyZe87Gb1ORg8JFJKjO5Na9sod1lHEYpqej2Ws4vzRsNBbZm6vcPXjtMcGRCnSrhvRNwICjYWDZkZNnb MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39f7ba4e-5a25-4ae2-0878-08d558178d14 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4628075)(201703131517081)(5600026)(4604075)(2017052603307); SRVR:DM5PR03MB2700; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2700; 3:RsQeyOlonuN4qR6hfTUX0MGPKrt8hIg6c3oFX0ZNTqQ4Z1cDPfT7iJV5UpOrZt0bOpP+mUzYnoNkJ6JT/Z+3BpH9CslGe8GhY4Fe03sv1Cu+FgwPH2BXF/Bi12BXLp0gE3A9I0LpXN38vb5gbD/3vnNb4S1LCcJRLd3q/iKcEH+NPWqV+0dwDGLnCJEprNSUU0nwRPeR0kAsp83PQKfN7K5uCkQvZ3GYbMpGXvPMp+YiD6HmDY2w4GUYah2mHgmhlk0sBlGYJQ4/Af8qKHwb7gJ0muppczUiJpuiY4znzna5oqRUXnWd3yQoCZiNBdK/bo7Av6IZl1dspxf1XVdoKCJRRAIiXRytRG20p/R1oEQ=; 25:9aQ0196Nx1w5sihnKIUysC9361N77Vt/B+vINPC/Z9g2N6x1GI05xOMgQzdAYkMlfL0u0AebDCfqwt0rOYO9ufoG6/HRgFs4BKmSD7UDXZpZh6Eg0tsZ7t2/t1Z6jhO88wOEcnIL2XiojKLqHL126bM1DvuoGLmk2pUb3+xthXyC1T+43xYRKPA0uUCxys+J4/TtSd5ou2Rqctm8IuV5mzu696OCQJqWVX12CNN81EmM5jkDR+e93J1FD1vyoMSgj2xI7p4aWyfDdRydsRN+V2gUl4K8CTXSL3yC5eUKX3Z1kAFA40eYunWplWdaSeahqyF2sQ2t2dDMhYSL/CWmfQ== X-MS-TrafficTypeDiagnostic: DM5PR03MB2700: X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2700; 31:dkxiWHO0Jz4cVKaGmP8qqoMZOfRepaOC5Hrmo1IoJbyjNfmaF0FZdPU5TxQ0xXO9SJu6ena1cvGl/tAp3OWRge4JrSnvqiQvFJQM/bK7LchR5O5CRMFZGINpuhNf+i38h3qi7Y8xW0BtlDzbUZnWCAfrI1E2Yl1GXMupGdVstHXmvSHKg+g+vARPlqk6YLkkViYO+Se/ivAnf2CCCTFMo2CbhqVy2baDVhsY6L8vowQ=; 4:gBeE4pvBmcCt1lY3sG+zx+5ja9WvtKzFQCddGdXjiaeMsy6Yzrkg+pMhg4/5tcP8FC3SelKFibaqR29n7Vu/t0qbVlWlEzbIXdQlw4jv4wYmA5yFwttDWI2M05pZmXl9dIYUG/vOSPMVxrkt1R1ZrX8qzFvQNbFkQZjWugn/CdAc3OKsz/9GiqX5FiAZrBvQzkeJ8i3DECEZPHDo9C6lA5i4df68t+DfdI7gylAHltCCG/hmYViwA8jGqCNUEWVKQDpuxEzyud66AiSoWMkMo6SzyOt4cCcuybtqxKevEGeYCdRLmrJvcK8ikUCe7Z1v X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(2401047)(8121501046)(5005006)(3231023)(944510075)(944921075)(946801075)(946901075)(3002001)(10201501046)(93006095)(93001095)(6055026)(6096035)(20161123559100)(20161123561025)(20161123565025)(20161123563025)(20161123556025)(201703131430075)(201703131520075)(201703131448075)(201703131433075)(201703161259150)(201703151042153)(201708071742011); SRVR:DM5PR03MB2700; BCL:0; PCL:0; RULEID:(100000803101)(100110400095)(400006); SRVR:DM5PR03MB2700; X-Forefront-PRVS: 0548586081 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2700; 23:185XBi2boSFyj3m2bhVqbMQbbwFjm0Y+oX5Vy2jzs?= b54N+Igs17QDC+lblaZWewKnUMQzcVmFBRPYT1Pbn1Bxp1yNI83cEKvieF0m04gTM01keOX9o13nERdqu5sULUWc4AeWklyNb4aMZxcDGSN3r4+W4uyD6fiYUIZh0k08EAk1LY6fPcIfOxGh6FhnAzhHute2nY5ujrSMwcjsnnQwixcabO3qAT2qlQ523G/RPifSTrB+QCcmeE1cqin211SLAHd2TQj2jiw3CgZDMNosi4djIQ6vAy1HT6KtUpKkKeuwn8vjs1RhM8qM+WTUjwsc0vF6UKLiaeOS9AlW/wwVoxKvL3fHdaSkaBtatr+N+gzTVzD/vzDi9JNuYcYYeCDQieVcAEU/vjQHMMbbpp9a/CZSbxnSaaj0Hr6VVqsc/5/oOqNb3l5HjUDON2gLgDaP4NJeDGwyEJ1BoHn314mZku0tidHFc2AzSc5nqeXc6211iX4ugSp7hkrlL5+WsSrAFQPrZr77Sc6DK3Zzn/ho2Wl2HfqEj64PGiPCdYOlHv+AiqBCNSCthLPT7bue5lrZZ/M0wIBngcQYQB1KB2qJJSCXMne/DrEmPH6wb16muLJfy2YGpJkdOQlRTfZRclUGsRpFGM/uvIdmlYOwYL0SwNK1ohgT17hdcPtMWpKTnvCJpKNAa+nT1rxxWT/TOm8cB4h8MMsOyv83omqRmIMBnNTnLkKHOoxq/lcRXR/05lrSnxR2UFS4T6Dw4Yi6DTSrZQTczucfJaNdaWwRGniJIxb/3d87s/y2MwsBpK8HqJahc1S5NDr6Gn+2V6mTUfaDTAbihAPHpqhNquhBvdoUJvzNzZOZdOWg5+bRQYDGpdjj1pBoQwE5s1TCGH4W8eTmy8ODOs6IccVnKzq+nzZz0cUDF8EHoI67nP/x7WtdHrfxiuo0xU+1SFchXN7sDjyY2+9+cdw+sVi0EFy7Btve1pMheh6jvvdX+jYcpEu34iOeqqbcFQjJK2XiwT5Nph/vav6l18Hn9nulLBFXDR95sKbsPWl7i43zOmHVP+WaupNPsP/d0YpotqFCx3ZzdSr X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2700; 6:4fyByE+/Yt2ZpxjrS3tU0yxWqS77TKrHU8fjKJaOZ6s5IE0hYYGdBcK9rJBDTVycg5WdImQPMw9okpuAmXtcRiktOrz73FpUM1/r8m4oBeyGaYc8jN9KPPycTNuWWh2IbP+AStq3ol5/At5l/qCERirJno0nxJrgW83W0b1SDg0pkFzYu3eD7plIi9X+T/DoPDho188nnhBtQxBvznE0jTOMFy0njLVpuiR3Cat1bji/7/8tPqEKUM1ORmMwMTaPoK0rAdgeIrWrJHLqU1jTDotJzG/dkQb+n1fEBnVip3NBsZFVRQqpM3HOsfAJ9OHjata0ggRoYgGyw8Jpppqoynb8qysksl63EkBxtn7BANo=; 5:jFEwE5OSGycAdpI1zlpmgpwud8yjmtZSEgoWSZ4H08ynRJfZDobbGD0m5zja5RikhJvsuxrenz1x8875cQvJoSyEmnryk2yVwukqB4ckKbqSYg5BbMtCcJpgrS0VjSXRqbggqP7z1jNjBH76eWg7D3uZgfO0EGK9klzgCmYsmY0=; 24:abUtG8SwKEZnWM9hd1GZeYBkEJmVoIvRU24Boo4Ze7kH5QOQtm4ReYJAeAiNqywE0PQ+gDkr46pG/Yg1/G5390NsEkxUVu7aJElyuOR+gpI=; 7:i6EvEHgbf3ghyymPBAKhd7TWHrVauU8lft3SRbLfL3QFNOlLlXqlWJNgBpwW31NhkkBzVAbdhftrNFCYDvD6OFy8fXe7HUiIHRj9SFcjOhyjQoKNVZTo0lBkLqQ7wgpy1o/zcC4wMl5c9ENDJVrzO0Ttk5HchXkuX6LQuRIogImoHvJoE4CEBIHlGdI5JT0ji1fLYUVhhDWrsALPDtxVNaZm+VEGpaVwehTvJrIbzPCnO48aK68icCEtKpeOiJbB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2018 10:47:29.7997 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39f7ba4e-5a25-4ae2-0878-08d558178d14 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: DM5PR03MB2700 Subject: [dpdk-dev] [PATCH v3 05/19] net/dpaa: set the correct frame size in device MTU 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: Ashish Jain Setting correct frame size in dpaa_dev_mtu_set api call. Also setting correct max frame size in hardware in dev_configure for jumbo frames Signed-off-by: Ashish Jain Acked-by: Hemant Agrawal --- drivers/net/dpaa/dpaa_ethdev.c | 20 +++++++++++++------- drivers/net/dpaa/dpaa_ethdev.h | 4 ++++ 2 files changed, 17 insertions(+), 7 deletions(-) -- 2.7.4 diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 24943ef..5a2ea4f 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -85,19 +85,21 @@ static int dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) { struct dpaa_if *dpaa_intf = dev->data->dev_private; + uint32_t frame_size = mtu + ETHER_HDR_LEN + ETHER_CRC_LEN + + VLAN_TAG_SIZE; PMD_INIT_FUNC_TRACE(); - if (mtu < ETHER_MIN_MTU) + if (mtu < ETHER_MIN_MTU || frame_size > DPAA_MAX_RX_PKT_LEN) return -EINVAL; - if (mtu > ETHER_MAX_LEN) + if (frame_size > ETHER_MAX_LEN) dev->data->dev_conf.rxmode.jumbo_frame = 1; else dev->data->dev_conf.rxmode.jumbo_frame = 0; - dev->data->dev_conf.rxmode.max_rx_pkt_len = mtu; + dev->data->dev_conf.rxmode.max_rx_pkt_len = frame_size; - fman_if_set_maxfrm(dpaa_intf->fif, mtu); + fman_if_set_maxfrm(dpaa_intf->fif, frame_size); return 0; } @@ -105,15 +107,19 @@ dpaa_mtu_set(struct rte_eth_dev *dev, uint16_t mtu) static int dpaa_eth_dev_configure(struct rte_eth_dev *dev __rte_unused) { + struct dpaa_if *dpaa_intf = dev->data->dev_private; + PMD_INIT_FUNC_TRACE(); if (dev->data->dev_conf.rxmode.jumbo_frame == 1) { if (dev->data->dev_conf.rxmode.max_rx_pkt_len <= - DPAA_MAX_RX_PKT_LEN) - return dpaa_mtu_set(dev, + DPAA_MAX_RX_PKT_LEN) { + fman_if_set_maxfrm(dpaa_intf->fif, dev->data->dev_conf.rxmode.max_rx_pkt_len); - else + return 0; + } else { return -1; + } } return 0; } diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index 9c3b42c..548ccff 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -45,6 +45,10 @@ /*Maximum number of slots available in TX ring*/ #define MAX_TX_RING_SLOTS 8 +#ifndef VLAN_TAG_SIZE +#define VLAN_TAG_SIZE 4 /** < Vlan Header Length */ +#endif + /* PCD frame queues */ #define DPAA_PCD_FQID_START 0x400 #define DPAA_PCD_FQID_MULTIPLIER 0x100