From patchwork Thu Sep 4 16:50:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 36743 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f72.google.com (mail-qg0-f72.google.com [209.85.192.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9072E202E4 for ; Thu, 4 Sep 2014 17:09:54 +0000 (UTC) Received: by mail-qg0-f72.google.com with SMTP id j5sf30517427qga.3 for ; Thu, 04 Sep 2014 10:09:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=KoJTbcjOiHjlaX6JD3zyAbjs3gg9G1ibR5xhV6/IIoI=; b=P0BXBWDxeaSeCJpdRl+vx4kEmAGhm+ovG6MVziGIp3z//VcwceT5u/dlzWsaW/dXrO fAvbHe4twUyYI/3vzqSP6z92JuNhtxQTq8fLinwVMaL1o3k32cOz8Gj7FWz9NlyYJzfY nxbOjBPd3gj667AE07I6MD3Rrcz4Ox8U4dqA+TjAmozrKg1KquniLvDWAbm98SwLNpgu qef7485WZQb/nooMTSmk8Wj84E8U4T9kafrXq9UbLyQBnGkRgc+lVJsSaOKYvvm3Svo7 tPXs/qGnBJGZ9PL3i7WlToGGSsYa/l1OoUyaZovWFa5IwRZmidxShX71LxDagE1xAN4q 5XJA== X-Gm-Message-State: ALoCoQmQZVj8JjSz9QW7IDKzB5lGOVdyuNNJzk83O4JUT1NlOVTlxeuTXf5dTuGCiJoH7Cq2wQ+I X-Received: by 10.236.159.198 with SMTP id s46mr3065810yhk.17.1409850592172; Thu, 04 Sep 2014 10:09:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.100.180 with SMTP id s49ls366409qge.42.gmail; Thu, 04 Sep 2014 10:09:52 -0700 (PDT) X-Received: by 10.52.28.146 with SMTP id b18mr2439779vdh.55.1409850592010; Thu, 04 Sep 2014 10:09:52 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id vm1si3459240vdc.29.2014.09.04.10.09.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 04 Sep 2014 10:09:51 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ij19so10916390vcb.40 for ; Thu, 04 Sep 2014 10:09:51 -0700 (PDT) X-Received: by 10.52.73.202 with SMTP id n10mr2329834vdv.86.1409850591913; Thu, 04 Sep 2014 10:09:51 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp870510vcb; Thu, 4 Sep 2014 10:09:51 -0700 (PDT) X-Received: by 10.66.160.233 with SMTP id xn9mr10840291pab.29.1409850591111; Thu, 04 Sep 2014 10:09:51 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id cc2si4737402pdb.139.2014.09.04.10.09.50 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Sep 2014 10:09:51 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XPaT3-0000tO-5t; Thu, 04 Sep 2014 17:05:05 +0000 Received: from cam-admin0.cambridge.arm.com ([217.140.96.50]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XPaEg-0002bX-86 for linux-arm-kernel@lists.infradead.org; Thu, 04 Sep 2014 16:50:15 +0000 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.34]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id s84Gnlwo014726; Thu, 4 Sep 2014 17:49:47 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 0D3F21AE089B; Thu, 4 Sep 2014 17:50:09 +0100 (BST) From: Will Deacon To: iommu@lists.linuxfoundation.org Subject: [PATCH 7/7] iommu/arm-smmu: support MMU-401 Date: Thu, 4 Sep 2014 17:50:05 +0100 Message-Id: <1409849405-17347-8-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1409849405-17347-1-git-send-email-will.deacon@arm.com> References: <1409849405-17347-1-git-send-email-will.deacon@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140904_095014_664437_38C0E8CC X-CRM114-Status: UNSURE ( 9.40 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.7 (------) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-6.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [217.140.96.50 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.6 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: Will Deacon , tchalamarla@cavium.com, Robin Murphy , joro@8bytes.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: will.deacon@arm.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Robin Murphy MMU-401 is similar to MMU-400, but updated with limited ARMv8 support. Signed-off-by: Robin Murphy Signed-off-by: Will Deacon --- Documentation/devicetree/bindings/iommu/arm,smmu.txt | 1 + drivers/iommu/arm-smmu.c | 1 + 2 files changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/iommu/arm,smmu.txt b/Documentation/devicetree/bindings/iommu/arm,smmu.txt index 2d0f7cd867ea..06760503a819 100644 --- a/Documentation/devicetree/bindings/iommu/arm,smmu.txt +++ b/Documentation/devicetree/bindings/iommu/arm,smmu.txt @@ -14,6 +14,7 @@ conditions. "arm,smmu-v1" "arm,smmu-v2" "arm,mmu-400" + "arm,mmu-401" "arm,mmu-500" depending on the particular implementation and/or the diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 1f447e7843ed..d2d8cdaf4f0b 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -1882,6 +1882,7 @@ static struct of_device_id arm_smmu_of_match[] = { { .compatible = "arm,smmu-v1", .data = (void *)ARM_SMMU_V1 }, { .compatible = "arm,smmu-v2", .data = (void *)ARM_SMMU_V2 }, { .compatible = "arm,mmu-400", .data = (void *)ARM_SMMU_V1 }, + { .compatible = "arm,mmu-401", .data = (void *)ARM_SMMU_V1 }, { .compatible = "arm,mmu-500", .data = (void *)ARM_SMMU_V2 }, { }, };