Message ID | 20210603164632.1000458-7-thierry.reding@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <SRS0=SrHh=K5=lists.infradead.org=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@kernel.org> 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.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 7CE8DC47096 for <linux-arm-kernel@archiver.kernel.org>; Thu, 3 Jun 2021 16:50:16 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 4790C613B1 for <linux-arm-kernel@archiver.kernel.org>; Thu, 3 Jun 2021 16:50:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4790C613B1 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=bombadil.20210309; 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=OUwR7CeAUHJjilKNG77O4Ls/0jmE4fO5bqqgHATxflU=; b=AaoiHKkHdD0UG5 YFLFEiLoV1dqXvNVXrYh3scCZNd9aDESxu1G+RuA7YnwfmaKMBmxaM38B3tZ0In8EYs/sBH09tSUh WgOfIjFzBEkXxbAVNj8+o7PDkK7MOSy2PhK/W76H6AuxnHhA5zFdRbF6VyJgwXCddJFRdNpR2ZgGH D9PXh1HefQiZleGxifrxFmBIyQ/3BtD6pZ4h4aJv0RiHIF393V3AyCwkmlrH1imQjzVjHNrTY+HNk rSKlFYf7cKVp4gq4yr2a/ZgcNOUxL/xMjBlR2tmptzNXrvbehOasHv0It/7kYH20SqecHhL4ZJz9o kOGGTKe6eP13NsZXYZiQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loqUQ-009bSv-Uq; Thu, 03 Jun 2021 16:46:39 +0000 Received: from mail-ed1-x536.google.com ([2a00:1450:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loqT4-009ass-6b for linux-arm-kernel@lists.infradead.org; Thu, 03 Jun 2021 16:45:15 +0000 Received: by mail-ed1-x536.google.com with SMTP id g18so5898090edq.8 for <linux-arm-kernel@lists.infradead.org>; Thu, 03 Jun 2021 09:45:13 -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=r8fGUpVpptMRBfRxglvA8AvxNT0zJcmuot8FSf94QpQ=; b=Mrsq9SXzuGTG87HBigTQmdjHKtQRZcvmcijXZy0iHk8e8caUNdUOM25vJm0ajCrxks LYbrnBw3UPxmQis3WBDa4V+KEDL1Vei8VmCI6hui5y3CzL+dbEncV0o+ivy7R8nK3dPJ LqZl0YI9vvPE2k5i6RP23IpMFw+1++nnZfcPnBDyKmiQYeNAKnV3H/sETmvp9DZyKvW4 iJqLcPktC23EY6MQ7wHC/9ExVlmEDxOaypiyzfgI4ghYGOaJzQ+Oqc65RGC62bcUQO/W bFiz5OwCDWcaZOBlwbIHIFuUhj7BOzDLN2/G22fNMfx0ZkzawJJpiCgEAsyzAVD/4Z6Q uSVg== 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=r8fGUpVpptMRBfRxglvA8AvxNT0zJcmuot8FSf94QpQ=; b=qMLrxbJ1ufmBa6ldm4CapL/sd4u+2iyaQX2VoCzOO6oD3rXjAp265N8uAoFDOeSp4L uEAaN56RE4KZY9V8AG2xwN56G3S0409F+4G7gApez1OQWVGtqWzixHEOMT0PcTAdf5Bf 1QXatTKFwEVTUWDhtI52C/we2ZBaFMJ2CRk50DUiWYVEe1yeDXE6zeISBmcQOe/NVixH 0xKIAtKbMH5jMkapGvr6hx7wgvFGd8hYt/FD0GCE+oM2YSO9Yhk4WBQ+lfqIH7bGDzop YhaHscPczxiAjTgkFytC3rQh71GjgW5/yQTAU7GJvZ16v00+m/iyPc/d3ctVkiANDHcE NN9Q== X-Gm-Message-State: AOAM531dwVHPfxhlioh3NFeMTPjCdw2luTviq+6c/R0M7j8GC0DfhxVI uFXvq5mrBuKH4N2fVbPcQc8= X-Google-Smtp-Source: ABdhPJyv8jWy2m1Ygx1oXaeKL6HrcQqVoQpZlQ2h/P1i3CxsxCxRctVO/8Y/6oidTLC0t+bmxRs0TQ== X-Received: by 2002:a05:6402:1c83:: with SMTP id cy3mr428442edb.108.1622738712418; Thu, 03 Jun 2021 09:45:12 -0700 (PDT) Received: from localhost ([62.96.65.119]) by smtp.gmail.com with ESMTPSA id o4sm1906443edc.94.2021.06.03.09.45.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 09:45:11 -0700 (PDT) From: Thierry Reding <thierry.reding@gmail.com> To: Thierry Reding <thierry.reding@gmail.com>, Will Deacon <will@kernel.org>, Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Subject: [PATCH v3 6/9] iommu/arm-smmu: Use Tegra implementation on Tegra186 Date: Thu, 3 Jun 2021 18:46:29 +0200 Message-Id: <20210603164632.1000458-7-thierry.reding@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210603164632.1000458-1-thierry.reding@gmail.com> References: <20210603164632.1000458-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-20210603_094514_261292_C66630DF X-CRM114-Status: GOOD ( 13.08 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Joerg Roedel <joro@8bytes.org>, iommu@lists.linux-foundation.org, Jon Hunter <jonathanh@nvidia.com>, Nicolin Chen <nicolinc@nvidia.com>, linux-tegra@vger.kernel.org, Robin Murphy <robin.murphy@arm.com>, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org |
Series |
arm64: tegra: Prevent early SMMU faults
|
expand
|
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);