From patchwork Fri Mar 3 12:46:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hemant Agrawal X-Patchwork-Id: 21224 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 9008AFB0C; Fri, 3 Mar 2017 08:15:18 +0100 (CET) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0074.outbound.protection.outlook.com [104.47.40.74]) by dpdk.org (Postfix) with ESMTP id C1426FAF8 for ; Fri, 3 Mar 2017 08:15:13 +0100 (CET) Received: from BY2PR03CA056.namprd03.prod.outlook.com (10.141.249.29) by DM5PR03MB2954.namprd03.prod.outlook.com (10.175.106.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12; Fri, 3 Mar 2017 07:15:11 +0000 Received: from BY2FFO11FD007.protection.gbl (2a01:111:f400:7c0c::183) by BY2PR03CA056.outlook.office365.com (2a01:111:e400:2c5d::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.947.12 via Frontend Transport; Fri, 3 Mar 2017 07:15:11 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; caviumnetworks.com; dkim=none (message not signed) header.d=none; caviumnetworks.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 BY2FFO11FD007.mail.protection.outlook.com (10.1.14.128) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.933.11 via Frontend Transport; Fri, 3 Mar 2017 07:15:10 +0000 Received: from bf-netperf1.idc ([10.232.134.28]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v237D50i005035; Fri, 3 Mar 2017 00:15:08 -0700 From: Hemant Agrawal To: CC: , , , , , Date: Fri, 3 Mar 2017 18:16:58 +0530 Message-ID: <1488545223-25739-42-git-send-email-hemant.agrawal@nxp.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> References: <1487205586-6785-1-git-send-email-hemant.agrawal@nxp.com> <1488545223-25739-1-git-send-email-hemant.agrawal@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131329989110877262; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(336005)(39850400002)(39380400002)(39840400002)(39410400002)(39860400002)(39450400003)(39400400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(9170700003)(356003)(2351001)(106466001)(33646002)(86362001)(626004)(85426001)(104016004)(4326008)(5003940100001)(77096006)(5660300001)(8656002)(6916009)(54906002)(189998001)(2950100002)(6666003)(50986999)(48376002)(110136004)(38730400002)(92566002)(47776003)(53936002)(76176999)(305945005)(50226002)(81166006)(2906002)(105606002)(8936002)(8676002)(36756003)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR03MB2954; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; A:1; MX:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD007; 1:be7Z74rGwk+5mDf/VlD1NgonnkU5OSpkxci17Ig/QbgTzlvfUWgYJ96YKMHlXDuHE5jSkw9n3fwoynU+MYroZme2a6K8T3KsJ59+4lGL9psVWhCjJ4o2rmjYInGnybonb6ct2qDyVEInri51BSACKLtAxZZNavAkYS1L29RWtTTHXiMxZkZ52eHkEQbPw6YQBZy6tg11jubXhi16YNgYtADynsqm19EpAyp3KUpOnk+Egi12U79ATdzHQafeRWg3aoUP25NVu+bzr0AgvJakrlOf1u4o68gxTyam01Whn1hl1TVtrnQD+W5n6eK9WkRcSEEFo757DCyz6B9PuuA6W72mgAtsssqE7ATWPWMbiZxbiXy9DALuQgzh483/clQQkagCtXkQfpZ8mFDz0VXHBwxtVBwUhEbEo3Dn/5Np38BW8dS3fsbKNiDAQU1VR+aq6vX3NXe1m2JjM3OMDsGoX0t+EuG7VZjLTeKWeP3wchgm3Gfgv1JGlUln1mW77m3LLAFAmubB1Tc42Ju0ddxQkoThx2PW/2+30DkK/tzz9AlD8Q2SqSShsoknWW8TD10oWV/ll34Ke912wddGJqW7fgSd89/ul7o6V4FSJW91o4KsHlkRWO7Ucc0CgxbOwdJApEYGgcPk6AcuaZ/uMTzEqQ== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: eb197cbd-0bf8-4337-4c4e-08d4620507c6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:DM5PR03MB2954; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 3:oh7uHqaVehSgtBsBXwNfmE4ugngSnRQUgJGf1+EXo8+91JgAdbXLpaO+SHsUcccGcDd6kuhLkPkqgnms5QwKuZ+NCPL9TzRKfIF1uxyEQJkBW/WTMwlNIncN5lt3aqHhpozGNxo0BrovsPIYNiX863dDO5ypwNO+cGrjnrA2zoakhmPsPJzk6d9sOxPfXqUOZp9EuimTTEzmOpoJHMScKnVypHtfXPOKRdVscw6IHDEneGf35XFB8AKtjBQrLbMZUh1EGNOrKyZx2Lf9l+q84M5kBAhTWC6Mq9MCsFYhHZALfZs9RkS2azPS03dE1RvTXI78KdEhqkcyGbmQAulFqV3VtnTWAtkvEXQQmAkiJ5J2PUosfF8M8zmVjRTlhl8K; 25:rubM6nesO/GQJjWLcsVpFCnQ4H1FaQkieublOPD5HnbnDGV2jh7+cOPxzXz1mOXNlgq9wIfRZu3bMu7iGdOSFFZfNmML10dAHTfub+QOrzWe8QVsCcXl/HGnp+8YM7mDXUh959E2VgqD2zBas0WBaMJz5Gk4ABCx7UdJYFqRF9p88m+7Jbv+vK8gsXkEx/3ISTYwOa7R+E5pimJL3t8sKbwU1LMqYvRe2L1opZGAYey3JMJ9siNo2v2M9aembYpSg4Slig88ZSlO2+idGIV8kxX9C1Jt7nVjjSHHsl9sCM02UDN+ND0dcfXfkZ3J5UgaQs+DdCORCfA3aoHUj8/f73Txse0+34eP0WiTm6iCH8vP6g2QWc9eEUz4wrHuPXgZdkdqSKn0eFZ8bgk3lY2R7Rw3kUtWz+WCekXZBtUinG7yUNc6JOJnYtu4Vv7hcy6zDq0cV+jOR3EpAGzbfSOtrQ== X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 31:gNDXPEA16IWryF2LCRtxdFaRZUcnjPpHHD1QeR9TE0JXV8NpELk+rfDq7XhyB9ddp0MDBM4z1A3uDGZAViqY27Mwgepmwn80x3crqoMi+6rfkZFKOCu9XP9/fuwM1SLaTo6Zlyj2hIkaq9Osdm1aR12W4aDNkDQJOMwilEdin+BuCA1+TT3yikdxlg8991gJnq9T+rreBzVUYlh98OSYo6JpKpQuJvGPt/AQHGQvTsUvBc0FdhjDQqzAXhFuaMZ8teUr5fQgBvPpbylMG5KWjNjFk62GBuGao2NxikaXgog= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(5005006)(8121501046)(13018025)(13015025)(13017025)(13023025)(13024025)(10201501046)(3002001)(6055026)(6096035)(20161123559025)(20161123565025)(20161123556025)(20161123563025)(20161123561025); SRVR:DM5PR03MB2954; BCL:0; PCL:0; RULEID:(400006); SRVR:DM5PR03MB2954; X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 4:pw+amh4pjKu8vsA1ebHW9F1Yb44vaFtVNXTSNaHiJ+bd+91lupb3Fion8WainQpSSQ/AtQ4+PuV6dPJWx9+NpBQbD+03pQj+oXLXitCfSQzS7+K1kMBDfkGWB/FGbw4gq7zyqEDhtmcElI4sK6PsfWvA3JMgs5gwE3m/wtcP0yDBSmkYi95ViG3Jz+gciaxRofJsBDS7bTd+NQa9DFt1WPaFQsjSi+3itMWsIPZP7NjLq/7tx3IT/hvI6ZwVSA5t7CjRW3VN0PiR8vpdjrHav9eJkKhXgaKpG6A/+1zFkOufyyxKTE2VKoqUwLyhtPDUb4Sa7B0L6gAXC90ODNGyAxR8ONSBfhdw/y95SX91doGjz9ZJrUaLSDoG2WJ1Oy8e4hrQnd/ioyY9EyvNHepJlzMPAYtbgPP5TUfiSr6IFHXSbkYJNtnOBzZG0E0/qvBd557wChtVe1Lv9p7H+X6BTyFt4s2nO2Xl4TRyh70Nrzghc7wgJgVVleKALstsIM0UOybYPGjgi98nefrpGjzFlq4LHhyYi/ATUX2atc54CF9kRMYg+dWIoLTrn/AhqwpmmyJ3ytSukFQNi4+NCNJG2ibAS9PDJkagoEwoP+TWf/YVYCBd3qDtFxZUpYD7THA1eauWALNALS/QDqUW+tFadrIBY7dQQlVoSbRWHE+8PwIDKdwLvIYPdEiSAxyl9cNny5G7ROTspmocyNV/rEcneKGleNrqW6lHBxoakOubPGIU9eR53GZZPkwy9uPdKVBn X-Forefront-PRVS: 0235CBE7D0 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR03MB2954; 23:vyWcwIAEf0uS7QhBnxR5LF3cDL3ybwijBzi0sg1ti?= T8fLcJWQRbNdbHMQDqzXP3fz6BGn1ar43SvmNjA7G6DXvmyJkq1qByFBaLM+33TLakkNhDveLZn+rDexkSaBq8qjVtW2eurmznHg6U+RvvDZOpzD9NDJW1nqgw3V5fAwcZylZP72HgY41ntd8f1yH+gydYQPsfBbj9FOgumnLzRUdztZoLUorMCsIzZBOpmd3xlbgMkIzYTPk6DMcpO+kadNyowwk+IxiidofcBfzjOEzbwH2bTYoCKpu40s5VTQxey/xf7n0Prz/qCW+F0OeIE+QxgMm/FDDYKM9ud1cyyRsd8u7EZJp2R5lpvkhgK8D7xFnq2VveKHjk6Fq9o9vYu5Dl3b5ZuzEgN5p2BkyFs7O0qtWbbToEX8C9F3t9HI05t2c1XukZJLmlI5HnKjoLeAVS6PUk8c3vuzLyJQlZTVX3Vv5TOxNNNn4H3omsyfC25SdKs1A2zOikv6NtTjSJ2AUYN+flmqhsiTMhf3s85iSnZfCPE/Ku888L1bu2nbioiBV+pyREV5XtdSJrtXXHvjgbCpkfzEiJC/Y4rgmqtRnRZcJgv+fhtR5pQrC/HV9ZsHKAkFqAE7tL5YUOWxVtSXo2jsng4+nboorc9LcxahB4eGoWWKuUNCZsIJArSXaVVmzWznm1AgBb/+wi9fWX74xRXz/WCi/0LE5ptNAV20tQuPlJm2LHroiUnJwlraK35c+wJmDUx1XHfcXAJwdCczaGx0v5gXqRoYsYqv6YeQuiPT17+VZG7g9jmJvc4iiSMeTvHNHl1ba3TelBMslyX2HY93vDdSRVjFpzQEjQotfNHbgxKNp9x1PYj6kAip69fxYOcrXnOrmgtUjhxq3usrp+UF1vimMAru+sIgEiohZzazyk/aABtlybZvxAT8jIgl1zyPgq1gGL2hi97uzR2TcL1T2uU5S9ohstAgA8XiIW7SiflrpZj+U1lwu8OzEbxRe9muJ8jdMVMEwHMB6GjisNWjLsAAd7OMWHZZAYN6Od041XM4Eogn0cxvELQSg3K+0R9ADmjYExktbdv3+9/5/x0TgZb4+uMpZv9UuHehceYG+iIAi5SdS+Mrf6fee47uVIn3NwrnrzcXdMjIFuZfayT4YMUibKaGZ3Xa8cIturGYj8rbtEt52EAA5cAUzQM1OI8ubUDDnZ15bjR+JfTtPRwLE+LKIlKBCf5aBKz19YmKItfmSnXlPYTMOAkXb7zb7kM6W5CoYKj1zFEeKqn X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 6:EWd5Io3Sc/SosqV9wv4dPf3oZWFnnwG0ler321xHthEVdQecctLsyOUaY+9euv4/d/W0gq2csdTjoa5QXpgor8KCZKdFg5K5ni3sxyJ2Go2SdWYmufuIR5G5qIVPVggmh11hRljUcb5puEJ0jchoTCTX5RCn0SCxNSwq4Ry4Y9hfk2z5Q3qle1G/T30GvpbVr5YyYAl2MuRCf05TQmnrpOOjBScB39TOfNwW0g2YLMEjc/aezoNMSTC00k6eAUnIIzpLp7sxfGgph4PI8U+rj66MPcOJQtaPC0fVjoMdw+C8Kr5eQVjZ1enZ3/zsw10cALnI+RI8ktC8f63B9P4ltLtFiP+VnljvcCi57zSTQPB/6614xmME40atyhPg6t97lzRFg0zXmAzjcK7TZjhUV0k0LLoKyRuov2YPo4IRQqY=; 5:eVnEij3ict2AsqzEapn01AN03onIpNxyBD2lQD6Tvw5+64qq+KqDhpjKXbFM9/mZzyvUxEx47Zyw9eU2f5LKayzTRpw61wzQxbPJyeMZAohz2LR68O8f86LS4NFKht2bZTgaMc7CLBfiiGtHu3eObza/GZ0AoOBDkJLWXEuCyb613OidFVRKvT/8Y5jrLoLw; 24:dIRNxWXL4VZmogVfguVzGeaTS3hFDs4kbwNfW0/Teor7ga4gNVz5as5Bzof+Uf8fa2uSfwvMShtWX/jakAidtzDrRxOwPnS5/pExu7ZqZeU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM5PR03MB2954; 7:58piDih/vDH5QGvi77GobVwzl103dvQ61Dik160lfXLJIzti4JTunQmJMrWk+DGDKfK+hDfvGVb035HcxZ1XvxXNDYwUWNDPwRNdb0t/paiDO0SRxEfRgFX+5uACuwMbwKhcWuEpzmPUndkxNQZUcT13flKsE8LTeaTYfxrzXTNB2zjqH/uKpzWp6PQ5s9h+rF8k8guQDxX6ls8S0gr7sePjgQJQuB/6A6oElvqJb/Xv3Rx8mWBhsbiGeAVZOEZAIVCxmHx/gZuYN+VHg/GkGl571NedkOk7xwXofrOp5F0SkAn0HZOk8iX/2SFSwUGzF2Jsrm1vHr9n4KhnjMBFZQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2017 07:15:10.8849 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR03MB2954 Subject: [dpdk-dev] [PATCHv8 41/46] net/dpaa2: enable physical addressing for packet buffers 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/base/dpaa2_hw_dpni.c | 4 ++-- drivers/net/dpaa2/dpaa2_rxtx.c | 16 +++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c index 08f53b3..3dc60cc 100644 --- a/drivers/net/dpaa2/base/dpaa2_hw_dpni.c +++ b/drivers/net/dpaa2/base/dpaa2_hw_dpni.c @@ -76,7 +76,7 @@ memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg)); dpaa2_distset_to_dpkg_profile_cfg(req_dist_set, &kg_cfg); - tc_cfg.key_cfg_iova = (uint64_t)(p_params); + tc_cfg.key_cfg_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(p_params)); tc_cfg.dist_size = eth_dev->data->nb_rx_queues; tc_cfg.dist_mode = DPNI_DIST_MODE_HASH; @@ -119,7 +119,7 @@ int dpaa2_remove_flow_dist( memset(p_params, 0, DIST_PARAM_IOVA_SIZE); memset(&tc_cfg, 0, sizeof(struct dpni_rx_tc_dist_cfg)); - tc_cfg.key_cfg_iova = (uint64_t)(p_params); + tc_cfg.key_cfg_iova = (uint64_t)(DPAA2_VADDR_TO_IOVA(p_params)); tc_cfg.dist_size = 0; tc_cfg.dist_mode = DPNI_DIST_MODE_NONE; diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c index a94761c..49b4558 100644 --- a/drivers/net/dpaa2/dpaa2_rxtx.c +++ b/drivers/net/dpaa2/dpaa2_rxtx.c @@ -136,7 +136,7 @@ static inline struct rte_mbuf *__attribute__((hot)) eth_fd_to_mbuf(const struct qbman_fd *fd) { struct rte_mbuf *mbuf = DPAA2_INLINE_MBUF_FROM_BUF( - DPAA2_GET_FD_ADDR(fd), + DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)), rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); /* need to repopulated some of the fields, @@ -151,10 +151,11 @@ static inline struct rte_mbuf *__attribute__((hot)) /* Parse the packet */ /* parse results are after the private - sw annotation area */ mbuf->packet_type = dpaa2_dev_rx_parse( - (uint64_t)(DPAA2_GET_FD_ADDR(fd)) + (uint64_t)DPAA2_IOVA_TO_VADDR(DPAA2_GET_FD_ADDR(fd)) + DPAA2_FD_PTA_SIZE); - dpaa2_dev_rx_offload((uint64_t)(DPAA2_GET_FD_ADDR(fd)) + + dpaa2_dev_rx_offload((uint64_t)DPAA2_IOVA_TO_VADDR( + DPAA2_GET_FD_ADDR(fd)) + DPAA2_FD_PTA_SIZE, mbuf); mbuf->next = NULL; @@ -177,7 +178,7 @@ static void __attribute__ ((noinline)) __attribute__((hot)) /*Resetting the buffer pool id and offset field*/ fd->simple.bpid_offset = 0; - DPAA2_SET_FD_ADDR(fd, (mbuf->buf_addr)); + DPAA2_SET_FD_ADDR(fd, DPAA2_MBUF_VADDR_TO_IOVA(mbuf)); DPAA2_SET_FD_LEN(fd, mbuf->data_len); DPAA2_SET_FD_BPID(fd, bpid); DPAA2_SET_FD_OFFSET(fd, mbuf->data_off); @@ -219,7 +220,7 @@ static inline int __attribute__((hot)) /*Resetting the buffer pool id and offset field*/ fd->simple.bpid_offset = 0; - DPAA2_SET_FD_ADDR(fd, (m->buf_addr)); + DPAA2_SET_FD_ADDR(fd, DPAA2_MBUF_VADDR_TO_IOVA(m)); DPAA2_SET_FD_LEN(fd, mbuf->data_len); DPAA2_SET_FD_BPID(fd, bpid); DPAA2_SET_FD_OFFSET(fd, mbuf->data_off); @@ -271,7 +272,7 @@ static inline int __attribute__((hot)) qbman_pull_desc_set_fq(&pulldesc, fqid); /* todo optimization - we can have dq_storage_phys available*/ qbman_pull_desc_set_storage(&pulldesc, dq_storage, - (dma_addr_t)(dq_storage), 1); + (dma_addr_t)(DPAA2_VADDR_TO_IOVA(dq_storage)), 1); /*Issue a volatile dequeue command. */ while (1) { @@ -312,7 +313,8 @@ static inline int __attribute__((hot)) } fd = qbman_result_DQ_fd(dq_storage); - mbuf = (struct rte_mbuf *)(DPAA2_GET_FD_ADDR(fd) + mbuf = (struct rte_mbuf *)DPAA2_IOVA_TO_VADDR( + DPAA2_GET_FD_ADDR(fd) - rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size); /* Prefeth mbuf */ rte_prefetch0(mbuf);