From patchwork Fri Aug 29 15:54:29 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 36316 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6451B202DD for ; Fri, 29 Aug 2014 15:57:22 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kx10sf36817438pab.8 for ; Fri, 29 Aug 2014 08:57:21 -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=+VKl4XS1GU/TNy2++clDHy0RY4DTWRmju3kkrGS63vg=; b=AXLfmDwIsrhNuOfqztGsnURxRcQoLd/4/gYtVOhJ4MIRx/L1Hh+rFnn7oct/zKMIoF 2O2Q5qmOIsviAvdyqX7tuzBWbrbxeILE69n/aoqwm12h3WNAmo0wclGJ0R2BAsRZWamv B4wzKERSKJSNQ70dSyCass5WKlMhOoYDQulNLnyzOtvi6CpFBtBbQMfGV55HelfTTJL7 T0flxzeinT9ezSXPSpWEX9ITbVYC6MdHPSZ3Qw5OXD0isF37pd4/4Og5YVRl7Y+Yo5z1 XIQmJHzAOD2xanIlWhOBd2y6XzzNEma6m6kt+a4SYnBPSLwk4O/0V00++deqmVxSoWHf S4OQ== X-Gm-Message-State: ALoCoQl/tTDrPqI+8wzlMIuDtxGurz+D3iqBiUOd37MfwlZzrIY6ewf/D8EYzcgRJuCS6w6EYPQZ X-Received: by 10.66.66.46 with SMTP id c14mr6253272pat.21.1409327840091; Fri, 29 Aug 2014 08:57:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.103.177 with SMTP id y46ls1038727qge.79.gmail; Fri, 29 Aug 2014 08:57:19 -0700 (PDT) X-Received: by 10.220.97.138 with SMTP id l10mr11017725vcn.25.1409327839947; Fri, 29 Aug 2014 08:57:19 -0700 (PDT) Received: from mail-vc0-f174.google.com (mail-vc0-f174.google.com [209.85.220.174]) by mx.google.com with ESMTPS id wb9si442413vcb.88.2014.08.29.08.57.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 29 Aug 2014 08:57:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.174 as permitted sender) client-ip=209.85.220.174; Received: by mail-vc0-f174.google.com with SMTP id hy4so2622355vcb.5 for ; Fri, 29 Aug 2014 08:57:19 -0700 (PDT) X-Received: by 10.52.119.229 with SMTP id kx5mr7242155vdb.40.1409327839872; Fri, 29 Aug 2014 08:57:19 -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 uj3csp37927vcb; Fri, 29 Aug 2014 08:57:19 -0700 (PDT) X-Received: by 10.68.221.166 with SMTP id qf6mr17061661pbc.12.1409327839072; Fri, 29 Aug 2014 08:57:19 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id uj8si451669pac.197.2014.08.29.08.57.18 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Aug 2014 08:57:19 -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 1XNOWs-0004Ql-MU; Fri, 29 Aug 2014 15:55:58 +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 1XNOW5-0000WI-6g; Fri, 29 Aug 2014 15:55:10 +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 s7TFsBwo008650; Fri, 29 Aug 2014 16:54:11 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id EDA5E1AE0724; Fri, 29 Aug 2014 16:54:31 +0100 (BST) From: Will Deacon To: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org Subject: [RFC PATCH 6/7] arm: call iommu_init before of_platform_populate Date: Fri, 29 Aug 2014 16:54:29 +0100 Message-Id: <1409327670-3495-7-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1409327670-3495-1-git-send-email-will.deacon@arm.com> References: <1409327670-3495-1-git-send-email-will.deacon@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140829_085509_640334_E3F11707 X-CRM114-Status: UNSURE ( 9.73 ) 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 SPF_PASS SPF: sender matches SPF record 0.0 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: jroedel@suse.de, arnd@arndb.de, Will Deacon , thierry.reding@gmail.com, laurent.pinchart@ideasonboard.com, Varun.Sethi@freescale.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: 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.174 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 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 --- arch/arm/kernel/setup.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 84db893dedc2..38a0203523af 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -803,9 +804,11 @@ static int __init customize_machine(void) if (machine_desc->init_machine) machine_desc->init_machine(); #ifdef CONFIG_OF - else + else { + of_iommu_init(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); + } #endif return 0; }