Received: by 2002:a05:6a10:9afc:0:0:0:0 with SMTP id t28csp74938pxm; Tue, 1 Mar 2022 15:25:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJwpsQvoA6LUf+tDiLClxxSqj7n+SIF3eIKZCi75dgRfAdcrDPkY6kIDWXVmE2CWe8KGwHXn X-Received: by 2002:a17:903:2285:b0:151:4b38:298e with SMTP id b5-20020a170903228500b001514b38298emr17973305plh.36.1646177144697; Tue, 01 Mar 2022 15:25:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646177144; cv=none; d=google.com; s=arc-20160816; b=MzLmsyxaMUTXTyvPkC7oV04JKfa7qGIolZKrdEpx3Me7pvVMxuOJ/bkLdsPRs+7Q3G 1tL2pOfkZcgbXBNrdCXy3LcT7oHMRQ5r2+3Q+XWoUchWN/Vs9aqeDavu/kmXDEL+lo6f fm0MsITGc7OGqBLFhnGVVy2w+APhYVLZNYxbD4yWPppchvj8OOcK45g5BqyhbUOa0fBc c7WA9XDe1wnUOL758a9lYSWJZ4gwAA5LxwIR6BeOdvZWigk12pEFtz5+mN3swHIScvSp 8jg5DY8w9V3KBjFKfBiNnozrqd1bERxySYpYDVRlBMOcM0w3f59sJRzjitqYFe2heu8Y VKiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=fQVo6iZ7pveZxOBVzKe3P9Mw1wzg2DyXVZs1ygpYCyU=; b=03wyRKJvTV21e/SepyWBbFq0ZVoDdmnTh2TdaUW6nZKb+M2yhhRFchHSbpuoamav1j j0laf4cjts7nmnDxG7/Q9fjUZIm5cQFSI34tMKieLDR8QraGz8BptuT9de7yGTKazjQ6 l/qDZIqznZAfvii9/NgzqbFyxcOl3hQr2gwr0r04IskBEecp/63HyV8cNgoOY0g7r8wj HaRCy7QOBIbTjeT+J30Z8S9lAfVDvVT3ozD43Aa62j053hHTw4ue+hgxiWSBsa1eOcJP dYQF0ftHNtB9kMWDRJyeHef4orPOsnMImJGqluCQnclwvUFdwyCecze54Xjn0ZSisnHi swRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=ABx4PzxJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m5-20020a17090a71c500b001bd5b7eab81si3487827pjs.120.2022.03.01.15.25.27; Tue, 01 Mar 2022 15:25:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@kapsi.fi header.s=20161220 header.b=ABx4PzxJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236096AbiCAQQd (ORCPT + 99 others); Tue, 1 Mar 2022 11:16:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231686AbiCAQQS (ORCPT ); Tue, 1 Mar 2022 11:16:18 -0500 Received: from mail.kapsi.fi (mail.kapsi.fi [IPv6:2001:67c:1be8::25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 280478EB69; Tue, 1 Mar 2022 08:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=kapsi.fi; s=20161220; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fQVo6iZ7pveZxOBVzKe3P9Mw1wzg2DyXVZs1ygpYCyU=; b=ABx4PzxJM+FAu+IX54XDrU8hOW X2dYxId2fXOaqFsVt3mQ48WENtcz2Pqong2poL3JoU24dlfvMv3JK/27iQ57QVtssbIvkcT/zdqVo e3oXn4i5+6rTC9hT0auzJ4opFac/Lu9ckHUm2zum0b57zgHKyXPDSJPYgyaeSpa3bSIe7r/L8kpUK VrFHZ6iUQcXth12Mx054dgseyeKYt7cqyRNEP1+8sHQBfV9nZ+JXmZLfr4bdE+NqlJPvxf3/o2xia 9RdXIZVpHdrADlrU69aq5F3+HsSABojbDtyq8L1vVmliDpZq10MfWWc7W4iOLiKJJVH5XEJEgHAQu knG0FvUg==; Received: from 91-158-25-70.elisa-laajakaista.fi ([91.158.25.70] helo=toshino.localdomain) by mail.kapsi.fi with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1nP59r-0003Z8-11; Tue, 01 Mar 2022 18:15:27 +0200 From: cyndis@kapsi.fi To: thierry.reding@gmail.com, jonathanh@nvidia.com, joro@8bytes.org, will@kernel.org, robin.murphy@arm.com, robh+dt@kernel.org, krzysztof.kozlowski@canonical.com Cc: linux-tegra@vger.kernel.org, dri-devel@lists.freedesktop.org, iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mikko Perttunen Subject: [PATCH v4 5/9] iommu/arm-smmu: Attach to host1x context device bus Date: Tue, 1 Mar 2022 18:14:51 +0200 Message-Id: <20220301161455.4037062-6-cyndis@kapsi.fi> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220301161455.4037062-1-cyndis@kapsi.fi> References: <20220301161455.4037062-1-cyndis@kapsi.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 91.158.25.70 X-SA-Exim-Mail-From: cyndis@kapsi.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mikko Perttunen Set itself as the IOMMU for the host1x context device bus, containing "dummy" devices used for Host1x context isolation. Signed-off-by: Mikko Perttunen --- drivers/iommu/arm/arm-smmu/arm-smmu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 4bc75c4ce402..23082675d542 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -39,6 +39,7 @@ #include #include +#include #include "arm-smmu.h" @@ -2051,8 +2052,20 @@ static int arm_smmu_bus_init(struct iommu_ops *ops) goto err_reset_pci_ops; } #endif +#ifdef CONFIG_TEGRA_HOST1X_CONTEXT_BUS + if (!iommu_present(&host1x_context_device_bus_type)) { + err = bus_set_iommu(&host1x_context_device_bus_type, ops); + if (err) + goto err_reset_fsl_mc_ops; + } +#endif + return 0; +err_reset_fsl_mc_ops: __maybe_unused; +#ifdef CONFIG_FSL_MC_BUS + bus_set_iommu(&fsl_mc_bus_type, NULL); +#endif err_reset_pci_ops: __maybe_unused; #ifdef CONFIG_PCI bus_set_iommu(&pci_bus_type, NULL); -- 2.35.0