From patchwork Tue Apr 20 17:26:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 12214835 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3580BC43460 for ; Tue, 20 Apr 2021 17:28:50 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 93351613B8 for ; Tue, 20 Apr 2021 17:28:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 93351613B8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gdxHDruS3UuDe28f1F3zk6wS2KUH3f3USXWyAvf6gIA=; b=l0hZgIwKdgdZWRYstv2FauVb6 bp7cNsfxzPl5F27LMcZg2FPQUHwq+9xG8eDnNJtbtnwVRAJSV6A/RTaQSBu00tznsWaojwZyJBODr G0HJvFymIKrUtQwknMYZzChUJhbyY5fX1gv3BU+38qvEeBx+JvUTMJCfzBmjH+fudIKBcT9ElSfA3 RX454z3fW1595FLFOEDEw6eLez8fR8x2Igk6ZSUUeCISxv8vzjQReAePMU7tkNltbueKRHN42loSu zpaY5e4nIZsTQnqSb6xzhZp+FWBlAng8VF8becyDo+fY8ZKlJo62OJFuO3ts5ldajUWoGYgapavIo cvxoaaHCg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lYu9e-00Ciyr-9e; Tue, 20 Apr 2021 17:27:19 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYu8M-00CiZn-Hr for linux-arm-kernel@desiato.infradead.org; Tue, 20 Apr 2021 17:25:58 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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; bh=p2ZJr/xZleVG5vuo3vPYmm91QfUd+NNqHlfpozdoe+o=; b=N243vUVKbFbjerBWE1XSmBkf5W vJ7haItjZeBwe9ZEW0WwnpXN7sq85OUVKT7Ptv1S1iaPwB4X6ISOthnKuBqYNE6Z2sUuAr+0NYGd4 H5aea7nLmnZPL+14WX8C+SaYSXoWQHy9GT9p7IZ7gZLNcWJ3b2nCR/B74g+l48aIyqGQPOEq2cOGT i5SQv2OKyNcIsYkYp3V5XxcRAQIm+WpEVMVCxbIC8qZ7duUr6MfbIq5ukplpZUGQLWqNi3yj6ZW8c BN86FZXuxwUYG26zBEebcIy96ntu1ko5+nHDlku/RolTsMOMraHOBTL2B+6UjwNyZEwRiRf0Obq6N 7YrUstMg==; Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYu8G-00CJLn-DE for linux-arm-kernel@lists.infradead.org; Tue, 20 Apr 2021 17:25:57 +0000 Received: by mail-ej1-x62c.google.com with SMTP id r20so9697912ejo.11 for ; Tue, 20 Apr 2021 10:25:50 -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 :mime-version:content-transfer-encoding; bh=p2ZJr/xZleVG5vuo3vPYmm91QfUd+NNqHlfpozdoe+o=; b=jsa3AkWNBDjgamJbXDaljolIixvaPZTNVV8eniMr+VOD+kTy4Fj29gy79z7XKq9ykE 3gv2/EAkhd1gsGruvhDqp4wEjnxIiCimFU/RgrQqGSiQjRR4eFBlPrh6zBc0BKERnw5F 1qyUSbxcCq5tFgj6BuuNvb0LuuLnGYNWHaES+USLwewwJlOR+Gx5msYK59HjmCWZndl4 i7ew+P/BDjt1IOwlOzH9k+hIULL915piRp0lNPCuJ0C9Uo8E1ydT1RU01gaecdS8Wqf8 4TfDnfckvXCJzgb/IEVkd7fdiGAwSSlT1SPFv2MwTGzAI5IaxaPAM+KeJ7q/GxX38Dn/ hBHQ== 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:mime-version:content-transfer-encoding; bh=p2ZJr/xZleVG5vuo3vPYmm91QfUd+NNqHlfpozdoe+o=; b=bCUzj7WCLVZCnbPHixjlNNcMzpLhMtHVvOnMo92NXGOgnBzJN/BljcymxlOyKsdl8/ 208rQIaI+hDuGHQTkfi/6nnXRNwgbxjIxh7lK4VPDDjIc3QKxAR9z12Ru6GrjQcc5lLa izda27jpNUUUYxscX7mRsJOQtIVlE/nGgTQ/HRTN64H2nkZ/yaz/FKj7G/44LO/DrCDY ZXBOf5JNNCxCAhJ5s9NNebxd/38uy8AX3KB/BCvUC6wD2il3Jq9Z7jLSpqnQ24uT/lQC 0MBVLSt+nsHrPtsjqtpjEXoZbahyvkKOgnwIwJVQiz+SZgHC0Kke/c0YRp7kLDlAAOKu 3A2w== X-Gm-Message-State: AOAM530hE8LKQr23nasutsIK8CVpmXKhsHu/u4A8DL95qVBAfd6L+gDB uAOPmHKxQUOI5Tq4qzKJNWuCiHKLK80= X-Google-Smtp-Source: ABdhPJwzCWpVw7Ve1FfA3VZFd2TaFsdaYTJrv8OF17ztwD6A/Jl0H4QyQKbqByeQhd5d35kji3SBew== X-Received: by 2002:a17:906:4ec3:: with SMTP id i3mr29149586ejv.119.1618939549020; Tue, 20 Apr 2021 10:25:49 -0700 (PDT) Received: from localhost ([62.96.65.119]) by smtp.gmail.com with ESMTPSA id y11sm16781977eds.10.2021.04.20.10.25.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Apr 2021 10:25:48 -0700 (PDT) From: Thierry Reding To: Thierry Reding , Will Deacon , Robin Murphy , Joerg Roedel , Krzysztof Kozlowski Subject: [PATCH v2 06/10] iommu/arm-smmu: Use Tegra implementation on Tegra186 Date: Tue, 20 Apr 2021 19:26:15 +0200 Message-Id: <20210420172619.3782831-7-thierry.reding@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210420172619.3782831-1-thierry.reding@gmail.com> References: <20210420172619.3782831-1-thierry.reding@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210420_102552_469632_C3D5013D X-CRM114-Status: GOOD ( 13.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: iommu@lists.linux-foundation.org, Jon Hunter , Nicolin Chen , linux-tegra@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Thierry Reding Tegra186 requires the same SID override programming as Tegra194 in order to seamlessly transition from the firmware framebuffer to the Linux framebuffer, so the Tegra implementation needs to be used on Tegra186 devices as well. Signed-off-by: Thierry Reding --- drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c index 136872e77195..9f465e146799 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-impl.c @@ -211,7 +211,8 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) if (of_property_read_bool(np, "calxeda,smmu-secure-config-access")) smmu->impl = &calxeda_impl; - if (of_device_is_compatible(np, "nvidia,tegra194-smmu")) + if (of_device_is_compatible(np, "nvidia,tegra194-smmu") || + of_device_is_compatible(np, "nvidia,tegra186-smmu")) return nvidia_smmu_impl_init(smmu); smmu = qcom_smmu_impl_init(smmu);