From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1163908AbdEXMNk (ORCPT ); Wed, 24 May 2017 08:13:40 -0400 Received: from mail-bl2nam02on0060.outbound.protection.outlook.com ([104.47.38.60]:51360 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S965660AbdEXMNd (ORCPT ); Wed, 24 May 2017 08:13:33 -0400 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; From: Ioana Radulescu To: CC: , , , , , , , , , Subject: [PATCH 1/2] staging: fsl-dpaa2/eth: Fix address translations Date: Wed, 24 May 2017 07:13:27 -0500 Message-ID: <20170524121328.16984-1-ruxandra.radulescu@nxp.com> X-Mailer: git-send-email 2.11.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131401016102655450;(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)(336005)(39400400002)(39860400002)(39380400002)(39450400003)(39840400002)(39410400002)(39850400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(53936002)(33646002)(105606002)(2351001)(106466001)(305945005)(38730400002)(110136004)(6916009)(189998001)(5003940100001)(4326008)(50466002)(77096006)(48376002)(104016004)(50986999)(36756003)(39060400002)(47776003)(8656002)(54906002)(2906002)(356003)(498600001)(81166006)(50226002)(8676002)(7416002)(8936002)(1076002)(575784001)(85426001)(5660300001)(86362001);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR03MB173;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;MLV:ovrnspm;MX:1;A:1;PTR:InfoDomainNonexistent;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD027;1:S8H6wBWQc8JNcBGgkXM3NJAPU47RgMHfvVJgb1dBAM6X7JqQgVeS5mfkYwgjvBZlGT82WOq/MZFu5v6cQlKGaj+oA9Z3YS7pHx78kWjmJmGSMHEXUNtdyq9aen8mSdlW+2tq6Ix5xjA4KmF4gMJO/hxeR12ubiT4qtSFWLKxHJ2ksVLTEiB+RX1sBiyJdW3ZwAZaQB6kY1lGgWwjSmhYhOFP2+fAdPyE/7R7kY+IpkMwmsKIHDrqNf9Tdb1UNI0N1jGq1dZVQ03OrA0wa7lbLL8SjbkkjFZpCbouZFNZqsiFuOYHWrsLeeyiDjOIQDlqBPf1B56x4G+55m0JikFxyYie6eIfJTb5HmiUvJwswHGpsYw5lOnjyleQiz+biL4ZVjY/4U2Fo9Ltk/Qqk7JzK+G2jYgdh75HeFeqix4HAmHJ526WFS6ad9xQhtk9+OfL0RXkJvWfRVCT52csnHaSkLfaTymV3Fg/OpujOjbWv2sVtP2sMXHNrIThGvfDB1NPYNcOy7DJEs4a16JsE7aceJbm3r1ewJCOUJVbEu1NzWxerxH25vihRjVxDOputS8MmNT4BDN4vBUG/s/nATKqHAD2UWYTnrVuIf0QWSncHkniUbZDjNZzWVa1A2JU+sEbiRo6qswuGr7OV/pW5LYSziPA0ZN09DTGl83j6K4eXQ1YRxdRU2b68ptH3RIG26MOF9CmpnFQCuB5WyzmfnTDSu2ZW9JdSm2UyEy+XRJedjI= MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BY2PR03MB173: X-MS-Office365-Filtering-Correlation-Id: ec44873a-9634-4253-8aca-08d4a29e4a50 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131430075)(201703131517081);SRVR:BY2PR03MB173; X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB173;3:CEi5RoeYrV1234PMSAFpQNwcBDaaO2nLWPrHfDuyzTo4x9KRqTLS/kbRVPXWXf/KCf3mjBsqNUzwox8cwO2tth/eywRhNhO0nT9yA59LG6Ew7+KtCaxuIkdL/0dAwIbzh7LvSzCqzdC8cahPV2rR8aFjX1UJbuzSGBEHOHCJPXSvhczL39X7VF6paXtm5ZV9wBg1gomYFt0r/uL3zWQP8UaNTBNZ7qWFM/383pYrd/4vbyHk1vANpGwFVvrK5GigvRG83tKRQyad80UULpIoMTUsyIdfT/cVYALQ8PuTusJ4fUpFdEN5BfdLQR99MevhKmeBT11i+SWVTFKzmw+4cojGBQaNlGgW31V31i+bBDDalRTfGDObDjf7qS7kujxVARl2uy9pKoCHUO8cYk3tlXACacayiPtnDJa264o3NI+l2bzodU9ngBY/EbuDXvnd;25:EQv5Ue0CIGsg/YrobgNaFI1EbRCBoIudchir3F2BScITBKHUhKdT5X/mGXo4VB6gh+6puzUh9Og3adkYF3gOtmNzG4Celnrwand9Ws2CILJ7hzsx7RmGbMTcs520FyMTiINDAO1q+exvxio1VCFoDpFnpSBd1n/gWuyxmMNfIIS0fDWOT0o4gioWKmfTLqDm0Ht7g1Iv/LMEbUDghyG+5YlCxZreMqcnSM3q0SZKLuIEKmXTUJd+QMMSYGAdPvS58bwdMf3Zyo133HYNfy5g9IuaZxWXvYylMJBeg3r5Rq6TKCywndI9W3QaqR+JwCo4vb/E83W4JhkebOKJPH78iTTIeW+pJA72Xns06dx+3uTSgetoA6QxOAzlf92N5L3VeeXKlL4i4hD/R0YxkFQbOvrPbDsSZKTOsAT39Nm5yf9+FD18SGhj02awqc8cxL5ZvQcDjQcNvQYq2cD3wvLzGJX9oSTFKUf9cBnozx1sxu4= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB173;31:uIrgFUY+ECCZTLvN3yYoSEkzxBPAotsTX2edcWeobVrMKszo+HX/Q0B98kAbiSjM6FM1gbFd2VRumzrOzoP17KnwuHFXzuvsSNe96Ckf4DwzPcP0VtzXgsS9XAXAuqD/YnvPjEWoUUYQjKZP2D3fq07v/z8c6K+lFp+XiwtwmpI1MF5aM2h5UKy3sE/OhJqtkKG2Qd2NNfTJkXkX0disdXPzQdIfuDRDP63FxW3ARHvrI+1ADHdE6DGakl6r3uIi X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(275809806118684); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6095135)(601004)(2401047)(13017025)(13015025)(5005006)(13024025)(13023025)(8121501046)(13018025)(10201501046)(3002001)(93006095)(93001095)(6055026)(6096035)(20161123561025)(20161123556025)(20161123563025)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123559100);SRVR:BY2PR03MB173;BCL:0;PCL:0;RULEID:(400006);SRVR:BY2PR03MB173; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB173;4:f04rXMHPpimImXk0kkdjH3ARLV8USaSAUHEznWUDqjo?= =?us-ascii?Q?HjsDvMcwKwg7RqbLMpwMK8vZKzx7gJX01fOVqMs29GpxUPNrVu1vng4X4eNM?= =?us-ascii?Q?9ZxVH8zCcEWEwRfNUwmINae11MJH21ROwAG0Cx2cQDuyfBQpGQTOiDefz7IX?= =?us-ascii?Q?Gmfdt6SUMH7vXjKq0Ihzkaio65ILc7ptyS48m9CRUfIrfY566R+pHRJziHGt?= =?us-ascii?Q?CsvAZ+qx3KPo9cq4hJIBnR484xKTMQhrYjZsyr4E+SEAN4lIF727W3wVPAeo?= =?us-ascii?Q?YIj71h09XGR9cV2dZD27GRk2hxLJASqkaYKE7X6OTLYerbERmo7KYU1I6MmD?= =?us-ascii?Q?n1yW8dHNpb9XgVPA9vjdehVRUOHkqZafsuPadNekCGdLOXtGbUV4ttDJQUl3?= =?us-ascii?Q?MMKHdIU/8dUSaJKGV72YzkqkL2q1aTkblsOFAJope7JiY6+DJ4F/kgFkm4vH?= =?us-ascii?Q?/5BvANkjjwPRcxDmtXhiXoeEsZX504aF3Fxm4lbkixnNNZYhMDOBWtfi2CCT?= =?us-ascii?Q?3omDwREbMCvo6z3955tWDME6zmqrMpOd6aJYDdvo+vnQ2BKfVau2YzGJDvpF?= =?us-ascii?Q?bOSg2B5rtkCybtopwI/o3L1vT0hJbyRVcutdubGHIkcYxtu0yN3e5m0YY1eq?= =?us-ascii?Q?61izkK0+H0DrqwnhuKQj0m4dppfroPV8fIwZ3rgUYnKNrMavzBgpniZbiWbd?= =?us-ascii?Q?cPnCnZWOAW7lik6ZGQJ+FK1XkBBAJih9faeig/ODPkaOhnMLI7vcRpq2f5Cm?= =?us-ascii?Q?FZPbSLF8nN0y1iUNaKmdgvmyyJCTJ2/2wtDnHKoYgCNCj1vTeHyq5TSw0V6o?= =?us-ascii?Q?gDd/BZjC0771vQYsqw+fyH7h2MSgpRX0Gl9rFltCC++Sl8k24J89eua1NY1f?= =?us-ascii?Q?JgeclSZHcdEqFOZHK6dOP4ovpLv82Lln/CfOmrz/a4QMSI6Rd4LidgRGSN+z?= =?us-ascii?Q?ybL9ylScqUdmQVRZ/3APMnHffdxBkQnnenJisYCtiQSc45r6qcECRybRX4ik?= =?us-ascii?Q?=3D?= X-Forefront-PRVS: 031763BCAF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BY2PR03MB173;23:Xr9gNZg1CvgougV6N2VyQZCHszqMVWoTAEqgCauvWT?= =?us-ascii?Q?90+Bko8NXCVtyfuFilKH5VRh8/VS5Jy5cFNhN24TjyIrTLjTOOzv3R7nP7Dz?= =?us-ascii?Q?xnhYKWCILUIog8+7kB8ybhhrEvp3c+9sIIDBXMtWf0bEHWo4POMpVETM18tL?= =?us-ascii?Q?f+qoutvS6T4V4aAmQx5u4HTXmWs11TQn021jYisIX1EcsSq7hsswJPCk6woF?= =?us-ascii?Q?qPXcrV7i2jGMgkfETOG+Cmbb0qNxSkUH51MlarrT9Js6v9CWvNkwKlODc87v?= =?us-ascii?Q?YFMoT5tzQxQWXqge9MmsA+QVnpqPynr0YLWS/Hip05826VMjjtKLgT5WxrEz?= =?us-ascii?Q?/HdgdU24c0fp1yzLbJqhkMz+CbmnB6ZZJRlxTZchMh06oLeYiIsk8rHhvHnW?= =?us-ascii?Q?i7J/gsbcIQh36cjk1ZxEJAFYwREUCm49VWqORHUsIcDNA4ZtxILomvyS44a6?= =?us-ascii?Q?Zi7RGPMwwgghu/fqn+XXSOdmjw0OQ+aYhRKiLD64IyuMSVTp/BR5DYjBD6tG?= =?us-ascii?Q?5dcPIH4hFqTXmWUDqlkmU3dCLGblLgjpYUCQY+lhpS8XS0+1zqNF3i+vWlnE?= =?us-ascii?Q?D+tcZktCLEWo0reCEAu5z64ub5zeOM3NT/1vikMu2jNUUs0LalXFypmWG85o?= =?us-ascii?Q?mugP5O8vJpHale7Xgpdjk8QGMgThiP2+lkcy8KzP3jgUhB4caZLqAeyaMxpx?= =?us-ascii?Q?kb0RALDuPmVfL4oNWkcEMSOsoKT7b0ZDDaLN3g5lLJJTmdMC6gydi1Hh/GoR?= =?us-ascii?Q?8BC7ZoK4ZqcsQz5YJjXsj2Y9o2WwW1j9w5uyGz1EravHGUV5VPuTjg7kQDdp?= =?us-ascii?Q?Fu97huRzqBpC1gpsNiL8PEMsHeqHlT5hTkm3x48dMoMf5p9AEej3CIKXFiz0?= =?us-ascii?Q?zdMuLx54nLi7ZnTQsc4F+fDU6OupOSnf0aqDPQ7OXQ5MwjAaq09Vmo2DSeuq?= =?us-ascii?Q?aflAU4KThl7sGxSaLhCczFo1jQ1q26t9029p8sxAlDfQFQavQi8E6NQdT+Oi?= =?us-ascii?Q?g+Vc3Hsd01IefamnDSE273Fo2MHwlvyNQ+jcSxrVAaOxBIwTNOqHa0HQiJpc?= =?us-ascii?Q?sOy7VxoYyStEi0ubLay+VLfvh7WOmy6jDbfJBImRw7TkBlDadJyoomFjrGRq?= =?us-ascii?Q?Gd/30nRci4AnYFpqipK2lH918oFY3ZuCDo3C7v/EjSKqVT8ssRtMomkcnEFe?= =?us-ascii?Q?rMPcn1hPYrbVMku0rd/OREuvL/C/mXhkoIVFmzSgwgTLSHEDBMxzUclK6I1L?= =?us-ascii?Q?da7fQQ1+1D4RAI2H+oYFW4FzK7JOuJxMT0iqq5?= X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB173;6:XvJyB1F6kR8ObokMz8SRikT/W1fXblESlhIQzHCf5staB/Iz2KqTtcKv3D61ecO4R5K4pJICyHFS+BsgIj1kmnf6iM5eeFYyAE6L8+rfrUD5tjvsNBE6oSPBg/iboID2+cZerVLOS3QXpo6NJrD9joYYnSTztLX+z0gyJ6IBYEBCHrDog5pvt0NAez+oPZZRstqW1GFDpw4NbGypTZ+LzuVfCA/2QUK4hB7nF8MmSXKr3ZkZQaQWqbCuipLKhpBqC041rZQ0LLMnaVu9yfWFP+B8cAXTNquEcsJ2QPzEtgIw1hf7MZBWbTp6Ekh9DGPemglUBtHb+t8zBPayXjGlOA314ird3IllnwdrpbJIHJ8aUTwXagP94xpsg3djRLculQ9an8bgk7cOx9Ob5bjwz/g9CVPDqHyjMapII63AVlVhk/NGrVQhkuFKPImeqxl08Dmlrf0HrakcDUgjBVIFdePfuhszcI9e1/SqOkn24uQpTX6MyVvsRZIPwMlAOvDjGIjeHtiLvCMB5TwBaMNFrw==;5:dtP5/bIUCESwZcZn+OvAfKJ9C7vVdnZ5VAeTXV112UlQYQ0N2BFUYsQMfLE1hy77jBkRq/gz8hEu1LQXkS7F3kCV+DAuXtl62H74dwXXL6gUqrXvvyZULRyV2/KqK2Nm72RZrb+qnEM8CfZD3X6rhHQSalU73XfW5aZ+oaEePadFZql6sm6zKqCLq6S0habf;24:7WtzCErsBu/Y7iEFO0PQTemN1GPgGC1sRTGLmVuwoH3wT/twBctE0xTLaowKdMliZo7BwTFnkiE4isDRt1d7qWWLLcCb96IH6f8+FOGGh/M= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BY2PR03MB173;7:RKVNWsZMAzdsTW2ZiA/SoNSDCuhsprbg/ntONQYc2feTYH3V9UBOcG5MYE/x4dQTZSFRit7hZ5wDIA0aNiZ0q8CxTC6JdbB4QDCrIQ9vAvXb56Drhko76r2biI3V4BacFkuAlviHX7LwPc2yFr5y/LjbdniT++BltFoNGoR/dmHgs+t2uwwsYLrpm7ZfqxXblipbODLqHba/Yt99rulcGCdkeNYwnKacQCyXfsMwzvyC8Ekl23uLiZKUTcjOvQSjFGt1ZYqPFi6eNjGgDRBXqQNaC+687HRqtoODK2aEdXyWTcAUJ39QHy4IrcWUNXiBxWTgV1EJmWKDu/eOhGgJOw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 May 2017 12:13:29.9223 (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: BY2PR03MB173 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the correct mechanisms for translating a DMA-mapped IOVA address into a virtual one. Without this fix, once SMMU is enabled on Layerscape platforms, the Ethernet driver throws IOMMU translation faults. Signed-off-by: Nipun Gupta Signed-off-by: Ioana Radulescu --- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 25 +++++++++++++++++++------ drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 1 + 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index 6f9eed66c64d..3fee0d6f17e0 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -37,6 +37,7 @@ #include #include #include +#include #include "../../fsl-mc/include/mc.h" #include "../../fsl-mc/include/mc-sys.h" @@ -54,6 +55,16 @@ MODULE_DESCRIPTION("Freescale DPAA2 Ethernet Driver"); const char dpaa2_eth_drv_version[] = "0.1"; +static void *dpaa2_iova_to_virt(struct iommu_domain *domain, + dma_addr_t iova_addr) +{ + phys_addr_t phys_addr; + + phys_addr = domain ? iommu_iova_to_phys(domain, iova_addr) : iova_addr; + + return phys_to_virt(phys_addr); +} + static void validate_rx_csum(struct dpaa2_eth_priv *priv, u32 fd_status, struct sk_buff *skb) @@ -98,12 +109,11 @@ static void free_rx_fd(struct dpaa2_eth_priv *priv, sgt = vaddr + dpaa2_fd_get_offset(fd); for (i = 0; i < DPAA2_ETH_MAX_SG_ENTRIES; i++) { addr = dpaa2_sg_get_addr(&sgt[i]); + sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr); dma_unmap_single(dev, addr, DPAA2_ETH_RX_BUF_SIZE, DMA_FROM_DEVICE); - sg_vaddr = phys_to_virt(addr); skb_free_frag(sg_vaddr); - if (dpaa2_sg_is_final(&sgt[i])) break; } @@ -159,10 +169,10 @@ static struct sk_buff *build_frag_skb(struct dpaa2_eth_priv *priv, /* Get the address and length from the S/G entry */ sg_addr = dpaa2_sg_get_addr(sge); + sg_vaddr = dpaa2_iova_to_virt(priv->iommu_domain, sg_addr); dma_unmap_single(dev, sg_addr, DPAA2_ETH_RX_BUF_SIZE, DMA_FROM_DEVICE); - sg_vaddr = phys_to_virt(sg_addr); sg_length = dpaa2_sg_get_len(sge); if (i == 0) { @@ -222,8 +232,8 @@ static void dpaa2_eth_rx(struct dpaa2_eth_priv *priv, /* Tracing point */ trace_dpaa2_rx_fd(priv->net_dev, fd); + vaddr = dpaa2_iova_to_virt(priv->iommu_domain, addr); dma_unmap_single(dev, addr, DPAA2_ETH_RX_BUF_SIZE, DMA_FROM_DEVICE); - vaddr = phys_to_virt(addr); prefetch(vaddr + priv->buf_layout.private_data_size); prefetch(vaddr + dpaa2_fd_get_offset(fd)); @@ -490,7 +500,7 @@ static void free_tx_fd(const struct dpaa2_eth_priv *priv, struct dpaa2_fas *fas; fd_addr = dpaa2_fd_get_addr(fd); - skbh = phys_to_virt(fd_addr); + skbh = dpaa2_iova_to_virt(priv->iommu_domain, fd_addr); if (fd_format == dpaa2_fd_single) { skb = *skbh; @@ -802,10 +812,11 @@ static void drain_bufs(struct dpaa2_eth_priv *priv, int count) } for (i = 0; i < ret; i++) { /* Same logic as on regular Rx path */ + vaddr = dpaa2_iova_to_virt(priv->iommu_domain, + buf_array[i]); dma_unmap_single(dev, buf_array[i], DPAA2_ETH_RX_BUF_SIZE, DMA_FROM_DEVICE); - vaddr = phys_to_virt(buf_array[i]); skb_free_frag(vaddr); } } while (ret); @@ -2358,6 +2369,8 @@ static int dpaa2_eth_probe(struct fsl_mc_device *dpni_dev) priv = netdev_priv(net_dev); priv->net_dev = net_dev; + priv->iommu_domain = iommu_get_domain_for_dev(dev); + /* Obtain a MC portal */ err = fsl_mc_portal_allocate(dpni_dev, FSL_MC_IO_ATOMIC_CONTEXT_PORTAL, &priv->mc_io); diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index c67cced55b72..55b47623008c 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -301,6 +301,7 @@ struct dpaa2_eth_priv { struct fsl_mc_device *dpbp_dev; struct dpbp_attr dpbp_attrs; + struct iommu_domain *iommu_domain; u16 tx_qdid; struct fsl_mc_io *mc_io; -- 2.11.0