From patchwork Thu Jun 3 16:46:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 12297673 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.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 1A66EC47096 for ; Thu, 3 Jun 2021 16:50:55 +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 DC60561026 for ; Thu, 3 Jun 2021 16:50:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC60561026 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=0/TgddI3GzzI0GxjlCyn0nt3HF1HXdwtaIzf+7GHvaE=; b=gfP7wg+jZr/76t EOTl3ZanBllazZzHE/xg2K8xKXk8Z17/Loh12pa0ln5vTmm3Bd4W8wluouuQpxjk0Dy3/GzkJq0mr GT6+896xdWdqqH4thnXHKbx0swGQ+rI4tbip4Hm4oIsVU5w+vCtso2hgbZzgOe+2f1Dng7dSpp8r6 lwVkeWDBqwY1hsUJ2du1KARW0VBhrysgv7skqiVACSIhXyY/lWrx3b0qXeuMNRDwYsiektoreIjDq 6C6HyG/2Dg66jUannnNI7PhalUbdWlgQzU1f7JoDu/fPgohQJualiZAyo6TY80XunwOw38qWqPZm0 CIrkzWV/kssOLucmUVeA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1loqUq-009bfF-2i; Thu, 03 Jun 2021 16:47:04 +0000 Received: from mail-lf1-x12b.google.com ([2a00:1450:4864:20::12b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1loqTG-009awV-LX for linux-arm-kernel@lists.infradead.org; Thu, 03 Jun 2021 16:45:29 +0000 Received: by mail-lf1-x12b.google.com with SMTP id i9so9771879lfe.13 for ; Thu, 03 Jun 2021 09:45:25 -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=emaUd/s+I/7zAGqRMV6GpYb0EGNWgcoNn6kxenQlqUg=; b=X+mC/YDJZh7NmSy5AKXhH6ARRZ6oNxVKb/QJsn+SBF7ahQKMfHahbwSNEiL2Erg7LG KAIJWZAP3OPXIYMkchZXHXRGEXi9IEzRqKXi2i+b4zeWsDj7qtbbwOtF4hOD+NhzdFZU xXCHpSlQbkimCyf6KTkGbzxuY9PZtv+P7korKxfdeUrSB3L4cQlFDpsgbUQdTv19ri0R cu4InkLernM4E03VSIMzCxmgrsSh/iAW0vzB6rVrPtn2UirqvAStXtERcvwidauasmbX 1D85368AXktRu4RFzKkpVLBrMxgmDVextvBSHk3Z/VhTNCKA7qZJVOH3LeNUfHST6gIY lU7A== 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=emaUd/s+I/7zAGqRMV6GpYb0EGNWgcoNn6kxenQlqUg=; b=Kw5LfnqwTQMWL52NOyeveCd5xMsJv4KQg3z2zYb+z3y/fvqjb9cJ6vAtKhSAY3Avnc mUdWix18FwSO9c8PQwzRMqHRDxzhGlRdu15aQC9BAfqVxSndSDRkOdknKrPTTKCSpzZl GVU5ewbzx08UY+roGDEUXx0t8JQ6XUNE7rrJDGeL7hOBfjGiCw6mzIOycYBGqGcTMGKZ fuh9kI/qBTLB03UPOkQz9vRq4tSj/ysMaBGAleh74VxgdflaFPJbAff+2Gpgxuek3bNS 4m8Z6cSR2pxWgn4+D+1ZSsnGW6CfXWczjJSuKsIDTiNoTpcr2GfFAdP+FJvdjACGPyKm 5pNQ== X-Gm-Message-State: AOAM530EM/IT4ItxHbgMhaSgXT5hSnC6VP6EjmiQqxVA5QzaryVVb+n7 9cswrziavqEomN29MoAcCX4NqDk4rHg= X-Google-Smtp-Source: ABdhPJxGHiqaz78ebiDKvbPuVlWxMu7idWE6kmjhgmMCpZ9tWDxf/zizOL8QBl192mfnuRUYJPqtmw== X-Received: by 2002:a17:906:b317:: with SMTP id n23mr293860ejz.324.1622738714387; Thu, 03 Jun 2021 09:45:14 -0700 (PDT) Received: from localhost ([62.96.65.119]) by smtp.gmail.com with ESMTPSA id ck3sm168205edb.56.2021.06.03.09.45.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 09:45:13 -0700 (PDT) From: Thierry Reding To: Thierry Reding , Will Deacon , Krzysztof Kozlowski Subject: [PATCH v3 7/9] arm64: tegra: Use correct compatible string for Tegra186 SMMU Date: Thu, 3 Jun 2021 18:46:30 +0200 Message-Id: <20210603164632.1000458-8-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_094526_740111_EDE9E15C X-CRM114-Status: GOOD ( 13.32 ) 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: Joerg Roedel , iommu@lists.linux-foundation.org, Jon Hunter , Nicolin Chen , linux-tegra@vger.kernel.org, Robin Murphy , 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 The SMMU found on Tegra186 requires interoperation with the memory controller in order to program stream ID overrides. The generic ARM SMMU 500 compatible is therefore inaccurate. Replace it with a more correct, SoC-specific compatible string. Signed-off-by: Thierry Reding --- arch/arm64/boot/dts/nvidia/tegra186.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/nvidia/tegra186.dtsi b/arch/arm64/boot/dts/nvidia/tegra186.dtsi index 9f75bbf00cf7..a173f40256ae 100644 --- a/arch/arm64/boot/dts/nvidia/tegra186.dtsi +++ b/arch/arm64/boot/dts/nvidia/tegra186.dtsi @@ -1082,7 +1082,7 @@ pci@3,0 { }; smmu: iommu@12000000 { - compatible = "arm,mmu-500"; + compatible = "nvidia,tegra186-smmu", "nvidia,smmu-500"; reg = <0 0x12000000 0 0x800000>; interrupts = , ,