From patchwork Tue May 8 18:16:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 910408 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-tegra-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CkRhURyx"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40gSSj68Mfz9s2t for ; Wed, 9 May 2018 04:19:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933544AbeEHSRg (ORCPT ); Tue, 8 May 2018 14:17:36 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:42953 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933518AbeEHSRe (ORCPT ); Tue, 8 May 2018 14:17:34 -0400 Received: by mail-lf0-f65.google.com with SMTP id u21-v6so47236461lfu.9; Tue, 08 May 2018 11:17:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2LIKQgRRt4dU0sPirULsiUtA3g04It+c8bGzanpLPzw=; b=CkRhURyxPabzMreajqqqB6+PAaABIt0rWNvbbsks64n7ovjFF6kAgo7wB7ohKvItYD x2PxJGsi3bbxkmiDiTT2mLnuUAVe0AsMyWYrqPGfQDC3COQD9u5zD9dp+EhUzjgrolXg miIhrihczvhcFunQsOF7KFfl8XD06A+rpEWLdafTl1x7JZiZWsb+ckad1dqnglGphath 6P6ieRw7T2HBJcQnUSmX8Ztcpz0hkGetZlXkpnQJ+J20i96lBTLdqx9PmGntC4rY7z7X ES5ByhK376ca8h8gIfwuv0HJxzv8P2mbdECE47p+RBh2OXbFGIA+ODOHV/Q6zVw34ZwL 7YfA== 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:in-reply-to :references; bh=2LIKQgRRt4dU0sPirULsiUtA3g04It+c8bGzanpLPzw=; b=eK5g31NzySZ8uQgd1nw/Ne6FttJD35u2Eh31kcsrkHx5fJ4zs/mLQNVJM8Q3Sfy8Le pcM1EcwLVPjYZLh5FGwzgaxsHg/dda5b8kbrR3xCZj9KJSeivntvUz6S0Sw79sCyunbf ++GA8U1LomZrrAfkBGtoKu1irAM0EWxQqLIcnnR18LTkQrrtkj/nqn1rAMmEonzuxE83 ZX8mXPCDXnRGx8CKGO5Yhue9dx/JVS99nN6HOrzl6ML3JhXpJg6wUXxY1xR/3wDoebDV kuddkpcez+r4rfAtV2qzlzx2CZkKJPE4iuGQSUQ+lzjvBQiQ+7X05peOlhm3UZ6ZkQZo pOyA== X-Gm-Message-State: ALQs6tDwLfpgZo2W/7zQZwPZ7JNNje9aP9Em/T+g0bkHxdg/qCIHEyw2 JXzZy7OHvqF+7x7VWZQAj/Z9iISD X-Google-Smtp-Source: AB8JxZqU0EbI2fWAnGKH1ORKXC01/KwgSq3lG4OlLFQbr3UpzGNeaPKN3WkRI1YbvS6GJ/k85DOSEQ== X-Received: by 2002:a2e:85d4:: with SMTP id h20-v6mr26282896ljj.82.1525803452856; Tue, 08 May 2018 11:17:32 -0700 (PDT) Received: from localhost.localdomain ([109.252.91.130]) by smtp.gmail.com with ESMTPSA id f64-v6sm2338699lfg.63.2018.05.08.11.17.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 11:17:32 -0700 (PDT) From: Dmitry Osipenko To: Joerg Roedel , Thierry Reding , Jonathan Hunter Cc: linux-tegra@vger.kernel.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 6/9] iommu/tegra: gart: Ignore devices without IOMMU phandle in DT Date: Tue, 8 May 2018 21:16:57 +0300 Message-Id: <20180508181700.5169-7-digetx@gmail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180508181700.5169-1-digetx@gmail.com> References: <20180508181700.5169-1-digetx@gmail.com> Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org GART can't handle all devices, ignore devices that aren't related to GART. Device tree must explicitly assign GART IOMMU to the devices. Signed-off-by: Dmitry Osipenko --- drivers/iommu/tegra-gart.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c index 39305224c48d..5b2d27620350 100644 --- a/drivers/iommu/tegra-gart.c +++ b/drivers/iommu/tegra-gart.c @@ -366,6 +366,26 @@ static void gart_iommu_remove_device(struct device *dev) iommu_device_unlink(&gart_handle->iommu, dev); } +static int gart_iommu_check_device(struct gart_device *gart, + struct device *dev); + +struct iommu_group *gart_iommu_device_group(struct device *dev) +{ + int err; + + err = gart_iommu_check_device(gart_handle, dev); + if (err) + return ERR_PTR(err); + + return generic_device_group(dev); +} + +static int gart_iommu_of_xlate(struct device *dev, + struct of_phandle_args *args) +{ + return 0; +} + static const struct iommu_ops gart_iommu_ops = { .capable = gart_iommu_capable, .domain_alloc = gart_iommu_domain_alloc, @@ -374,14 +394,24 @@ static const struct iommu_ops gart_iommu_ops = { .detach_dev = gart_iommu_detach_dev, .add_device = gart_iommu_add_device, .remove_device = gart_iommu_remove_device, - .device_group = generic_device_group, + .device_group = gart_iommu_device_group, .map = gart_iommu_map, .map_sg = default_iommu_map_sg, .unmap = gart_iommu_unmap, .iova_to_phys = gart_iommu_iova_to_phys, .pgsize_bitmap = GART_IOMMU_PGSIZES, + .of_xlate = gart_iommu_of_xlate, }; +static int gart_iommu_check_device(struct gart_device *gart, + struct device *dev) +{ + if (!dev->iommu_fwspec || dev->iommu_fwspec->ops != &gart_iommu_ops) + return -ENODEV; + + return 0; +} + static int tegra_gart_suspend(struct device *dev) { struct gart_device *gart = dev_get_drvdata(dev); @@ -462,6 +492,7 @@ static int tegra_gart_probe(struct platform_device *pdev) } iommu_device_set_ops(&gart->iommu, &gart_iommu_ops); + iommu_device_set_fwnode(&gart->iommu, dev->fwnode); ret = iommu_device_register(&gart->iommu); if (ret) {