| Message ID | 1415991397-9618-8-git-send-email-will.deacon@arm.com |
|---|---|
| State | Accepted |
| Commit | af4dda732ea044517f8beed4a38c852ea97e7690 |
| Headers | show
Return-Path: <patchwork-forward+bncBDAZZCVNSYPBBXNBTGRQKGQEHKY6AHQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5C335240ED for <linaro@patches.linaro.org>; Fri, 14 Nov 2014 18:58:38 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id r20sf1365915wiv.6 for <linaro@patches.linaro.org>; Fri, 14 Nov 2014 10:58:37 -0800 (PST) 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=9Ncq7F3pFkSjarW3k0LDH32s4HoIi/m3E/E4mM4khx8=; b=AzPgK4HWztOQf/50ZV0PSlN4Kz7eMj0ADUz5B4mU5bQAdK/nEa5uw11B2MBr3t7aXs HOkrOMVEnifDHrENgcL/+LJY8a+dFeJzIOQrFRRSSFWMegRumdDFxQVr6YhyoRMKMeLv aTazlP+qzbGzdTbX+415oDciXWx0EjBW1crUCjTbWauRJ2KYxOqZ9E0X+ID2cd/Yk+/G +lfekzmKn8ak3pEFAmXymoDWawkp7JXZy0Tof1cuKzJ88DZb5B7EWDx2wrdZPrGzK+3I VmixOEt0RpC6udcpXXPapPiKJnWkgda2T0R4yHviACTamTQPazZLNtST9hjz0QL0+PBh mV/Q== X-Gm-Message-State: ALoCoQnQG/1B6xixFHkVwtnmaRKkcCNe9W2gdwx9OokD6WhhQql1w/oXilxvER/OhZMAzrP6Hx3t X-Received: by 10.152.27.38 with SMTP id q6mr4893450lag.5.1415991517578; Fri, 14 Nov 2014 10:58:37 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.129 with SMTP id w1ls926415lal.34.gmail; Fri, 14 Nov 2014 10:58:37 -0800 (PST) X-Received: by 10.152.27.2 with SMTP id p2mr9784958lag.19.1415991517274; Fri, 14 Nov 2014 10:58:37 -0800 (PST) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id v1si42524194laz.94.2014.11.14.10.58.37 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 14 Nov 2014 10:58:37 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by mail-la0-f44.google.com with SMTP id hz20so5465951lab.17 for <patchwork-forward@linaro.org>; Fri, 14 Nov 2014 10:58:37 -0800 (PST) X-Received: by 10.152.37.69 with SMTP id w5mr9639288laj.67.1415991517137; Fri, 14 Nov 2014 10:58:37 -0800 (PST) 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.112.184.201 with SMTP id ew9csp818329lbc; Fri, 14 Nov 2014 10:58:36 -0800 (PST) X-Received: by 10.66.157.101 with SMTP id wl5mr11922749pab.37.1415991515231; Fri, 14 Nov 2014 10:58:35 -0800 (PST) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ug3si13441364pab.87.2014.11.14.10.58.34 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Nov 2014 10:58:35 -0800 (PST) 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 1XpM3b-0002WV-Rw; Fri, 14 Nov 2014 18:57:19 +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 1XpM3O-0002PY-0N; Fri, 14 Nov 2014 18:57:06 +0000 Received: from edgewater-inn.cambridge.arm.com (edgewater-inn.cambridge.arm.com [10.1.203.36]) by cam-admin0.cambridge.arm.com (8.12.6/8.12.6) with ESMTP id sAEIuZwo008179; Fri, 14 Nov 2014 18:56:35 GMT Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id D3FEF1AE017A; Fri, 14 Nov 2014 18:56:39 +0000 (GMT) From: Will Deacon <will.deacon@arm.com> To: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org Subject: [RFC PATCH v4 7/8] arm: call iommu_init before of_platform_populate Date: Fri, 14 Nov 2014 18:56:36 +0000 Message-Id: <1415991397-9618-8-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1415991397-9618-1-git-send-email-will.deacon@arm.com> References: <1415991397-9618-1-git-send-email-will.deacon@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141114_105706_376128_EA1948E7 X-CRM114-Status: UNSURE ( 8.23 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.0 (-----) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-5.0 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 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record Cc: jroedel@suse.de, arnd@arndb.de, Will Deacon <will.deacon@arm.com>, thierry.reding@gmail.com, laurent.pinchart@ideasonboard.com, Varun.Sethi@freescale.com, m.szyprowski@samsung.com, dwmw2@infradead.org, hdoyu@nvidia.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> 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.215.44 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit |
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index c03106378b49..1cfc94aa7fa2 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -18,6 +18,7 @@ #include <linux/bootmem.h> #include <linux/seq_file.h> #include <linux/screen_info.h> +#include <linux/of_iommu.h> #include <linux/of_platform.h> #include <linux/init.h> #include <linux/kexec.h> @@ -806,6 +807,7 @@ static int __init customize_machine(void) * machine from the device tree, if no callback is provided, * otherwise we would always need an init_machine callback. */ + of_iommu_init(); if (machine_desc->init_machine) machine_desc->init_machine(); #ifdef CONFIG_OF
We need to ensure that the IOMMUs in the system have a chance to perform some basic initialisation before we start adding masters to them. This patch adds a call to of_iommu_init before of_platform_populate. Signed-off-by: Will Deacon <will.deacon@arm.com> --- arch/arm/kernel/setup.c | 2 ++ 1 file changed, 2 insertions(+)