From patchwork Thu Aug 17 12:56:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 9906251 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EF6D96038C for ; Thu, 17 Aug 2017 12:58:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D62CC28A93 for ; Thu, 17 Aug 2017 12:58:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CAACD28AC9; Thu, 17 Aug 2017 12:58:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EEF7328ACD for ; Thu, 17 Aug 2017 12:58:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752246AbdHQM5n (ORCPT ); Thu, 17 Aug 2017 08:57:43 -0400 Received: from 8bytes.org ([81.169.241.247]:43422 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752748AbdHQM46 (ORCPT ); Thu, 17 Aug 2017 08:56:58 -0400 Received: by theia.8bytes.org (Postfix, from userid 1000) id 9BD4525A; Thu, 17 Aug 2017 14:56:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1502974615; bh=JQ8DgVn+4dSNaWbkJ/a/zOWRrjWRt70hYUQUsJ7qBVs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BUv9rbBXIRbtifKg1o+2k7RMv2o8yK0MxyJkkKHBj2a1fuYAs10vJZ7u/jm8tqQmq VKhdEEpv79Fx+9xSMZJySX+zixc/IQhnMzH0+MiLDMl0MjW2bU4u2pXqSx5xTOufY/ FcDvR7QuH+8Bi4+UTVms/4VNpYzQlwKK954Kq10uQJgihHcF9lsTaRtVKAU+vfk0lw b9oeCXRNtivEEl7/EuzOT17ZbGAuPx22GdOUTbYgiP9104tCTUSpwcAVQaJnhAScr6 0SV+tn0b0x2uw4RA/NXaSEE3qUJdEHU88Sb4WSq0M8qmO+Q3xq13emyEnvWTK9svy5 2PpPUqI8DoD1w== From: Joerg Roedel To: iommu@lists.linux-foundation.org Cc: linux-kernel@vger.kernel.org, Suravee Suthikulpanit , Joerg Roedel , Ohad Ben-Cohen , Bjorn Andersson , linux-remoteproc@vger.kernel.org Subject: [PATCH 13/13] remoteproc: Use sychronized interface of the IOMMU-API Date: Thu, 17 Aug 2017 14:56:36 +0200 Message-Id: <1502974596-23835-14-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502974596-23835-1-git-send-email-joro@8bytes.org> References: <1502974596-23835-1-git-send-email-joro@8bytes.org> Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Joerg Roedel The map and unmap functions of the IOMMU-API changed their semantics: They do no longer guarantee that the hardware TLBs are synchronized with the page-table updates they made. To make conversion easier, new synchronized functions have been introduced which give these guarantees again until the code is converted to use the new TLB-flush interface of the IOMMU-API, which allows certain optimizations. But for now, just convert this code to use the synchronized functions so that it will behave as before. Cc: Ohad Ben-Cohen Cc: Bjorn Andersson Cc: linux-remoteproc@vger.kernel.org Signed-off-by: Joerg Roedel Acked-by: Bjorn Andersson --- drivers/remoteproc/remoteproc_core.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 564061d..16db19c 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -553,7 +553,8 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc, if (!mapping) return -ENOMEM; - ret = iommu_map(rproc->domain, rsc->da, rsc->pa, rsc->len, rsc->flags); + ret = iommu_map_sync(rproc->domain, rsc->da, + rsc->pa, rsc->len, rsc->flags); if (ret) { dev_err(dev, "failed to map devmem: %d\n", ret); goto out; @@ -661,8 +662,8 @@ static int rproc_handle_carveout(struct rproc *rproc, goto dma_free; } - ret = iommu_map(rproc->domain, rsc->da, dma, rsc->len, - rsc->flags); + ret = iommu_map_sync(rproc->domain, rsc->da, dma, rsc->len, + rsc->flags); if (ret) { dev_err(dev, "iommu_map failed: %d\n", ret); goto free_mapping; @@ -823,7 +824,8 @@ static void rproc_resource_cleanup(struct rproc *rproc) list_for_each_entry_safe(entry, tmp, &rproc->mappings, node) { size_t unmapped; - unmapped = iommu_unmap(rproc->domain, entry->da, entry->len); + unmapped = iommu_unmap_sync(rproc->domain, entry->da, + entry->len); if (unmapped != entry->len) { /* nothing much to do besides complaining */ dev_err(dev, "failed to unmap %u/%zu\n", entry->len,