From patchwork Sun Aug 19 14:24:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 10570463 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0F183139B for ; Mon, 20 Aug 2018 14:54:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F2AE729583 for ; Mon, 20 Aug 2018 14:54:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E73ED295E0; Mon, 20 Aug 2018 14:54:46 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AAD3429583 for ; Mon, 20 Aug 2018 14:54:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C851C6E238; Mon, 20 Aug 2018 14:54:45 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x242.google.com (mail-lj1-x242.google.com [IPv6:2a00:1450:4864:20::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 549F089D61 for ; Sun, 19 Aug 2018 14:25:08 +0000 (UTC) Received: by mail-lj1-x242.google.com with SMTP id j19-v6so9669315ljc.7 for ; Sun, 19 Aug 2018 07:25:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=S7do6it17QDroML1cTgyp4N74urrhPq3HKzBmpYSFgA=; b=ipySG711Sa5b6Pddl3cJ03oToip2MB50EUmLi0mdcrP1tZQblYJ+Z5NBes8JBIPwhS IYglzv+UlbRd04IixRfYmUTKvJKouIlC0H/7ZWtWdrDgeuOOWxYQGTWnWD6scYiNGUeQ srgK3GYOJeZvKcnD+1PFDRiyuJM8Z8M+rUXAZnuEJgXXUIMXmrLV/OBB+pQOagopwxIP N0MgFK+SJTmpgg1sgfsDa2wpQqtHt0jnQznQNG2iHbcN3doMJpIzL837DB3Raxck73tf Q5D3vPrkNZCBY+O+ZkFs3pRLzXjJ0+91F33V9O6kvmCGt1vnqc/5AG4/m7JiaKXn7gi6 9+1w== X-Gm-Message-State: AOUpUlHWF63eLSXD4GkncVGiXxl0cnvHWAL8aemZfULrfFD90JDud1/b sKh4qeJil9vSCIDPb0RrNHQ= X-Google-Smtp-Source: AA+uWPwl0xuRmJCZrL2yj0sJHeSuF0NhPIsj2t6EP2HREyOnqY0/Cneym38ZhStrYjolp8ccezXp0A== X-Received: by 2002:a2e:9095:: with SMTP id l21-v6mr1150457ljg.15.1534688706790; Sun, 19 Aug 2018 07:25:06 -0700 (PDT) Received: from localhost.localdomain ([109.252.90.13]) by smtp.gmail.com with ESMTPSA id p88-v6sm1185618ljp.90.2018.08.19.07.25.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 19 Aug 2018 07:25:06 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Mikko Perttunen Subject: [PATCH v1] drm/tegra: Detach devices from IOMMU DMA domain on arm32 Date: Sun, 19 Aug 2018 17:24:20 +0300 Message-Id: <20180819142421.22567-1-digetx@gmail.com> X-Mailer: git-send-email 2.18.0 X-Mailman-Approved-At: Mon, 20 Aug 2018 14:54:32 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP All Tegra DRM devices are getting attached to an implicit IOMMU DMA domain if CONFIG_ARM_DMA_USE_IOMMU=y. Since Tegra DRM driver manages IOMMU by itself, the devices must be detached from the implicit domain using arch-specific IOMMU-API. Note that this works only for arm32 and not for arm64, which will remain broken if CONFIG_IOMMU_DMA is enabled. Signed-off-by: Dmitry Osipenko --- drivers/gpu/drm/tegra/drm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/tegra/drm.c b/drivers/gpu/drm/tegra/drm.c index a2bd5876c633..b2ac2411e0ff 100644 --- a/drivers/gpu/drm/tegra/drm.c +++ b/drivers/gpu/drm/tegra/drm.c @@ -15,6 +15,10 @@ #include #include +#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU) +#include +#endif + #include "drm.h" #include "gem.h" @@ -1068,6 +1072,14 @@ struct iommu_group *host1x_client_iommu_attach(struct host1x_client *client, } if (!shared || (shared && (group != tegra->group))) { +#if IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU) + if (client->dev->archdata.mapping) { + struct dma_iommu_mapping *mapping = + to_dma_iommu_mapping(client->dev); + arm_iommu_detach_device(client->dev); + arm_iommu_release_mapping(mapping); + } +#endif err = iommu_attach_group(tegra->domain, group); if (err < 0) { iommu_group_put(group);