From patchwork Tue Sep 2 17:56:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 36506 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 02E652032B for ; Tue, 2 Sep 2014 17:58:42 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id kx10sf74859302pab.0 for ; Tue, 02 Sep 2014 10:58:42 -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=g45QPsoMC09O5noUNE18A0XQZ4fQeZdRZcwq0EzRC2ifeX8/VfGEI0Aooa2nNV7bkm RuB7Soh8VLV93mncFU81TfmXvGzPgJJfpv6WBgXGa3o34cSc1Yj9IU2G0HQ5+iqDi4FD /cNONV4/H33aLazogLYMxjAaXe7zA6UaK2iOhmQhhMmhG97gXMC7DLpkvtNuwer2XYf1 KFg3sYOo0a0IlnC5tb5DfsCcUZhoUM5I+nDj7yC8AYxvmoYbFUmzlnOtVDBRS+ag87Ak la4k7WHvcJcPGguNk0N3n0tNLosx5CT+BTOFxRtWSpPA0D246DDI+i2yrqyfeo5fHTQh oiYw== X-Gm-Message-State: ALoCoQliM8HrNFzWd4YpZx/VdyfNAxHLy/GaL2SujwsNy0reM/cKIsdGcYHMpuIvobYw6yKa0h/q X-Received: by 10.67.4.231 with SMTP id ch7mr1116011pad.46.1409680722242; Tue, 02 Sep 2014 10:58:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.30.245 with SMTP id d108ls1684866qgd.68.gmail; Tue, 02 Sep 2014 10:58:41 -0700 (PDT) X-Received: by 10.52.147.15 with SMTP id tg15mr1071408vdb.53.1409680721947; Tue, 02 Sep 2014 10:58:41 -0700 (PDT) Received: from mail-vc0-f178.google.com (mail-vc0-f178.google.com [209.85.220.178]) by mx.google.com with ESMTPS id x11si2638596vdg.56.2014.09.02.10.58.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 02 Sep 2014 10:58:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.178 as permitted sender) client-ip=209.85.220.178; Received: by mail-vc0-f178.google.com with SMTP id la4so7598431vcb.9 for ; Tue, 02 Sep 2014 10:58:41 -0700 (PDT) X-Received: by 10.52.255.232 with SMTP id at8mr2267889vdd.4.1409680721845; Tue, 02 Sep 2014 10:58:41 -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 uj3csp565763vcb; Tue, 2 Sep 2014 10:58:41 -0700 (PDT) X-Received: by 10.70.40.194 with SMTP id z2mr3841476pdk.119.1409680720226; Tue, 02 Sep 2014 10:58:40 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id n10si7239648pdj.63.2014.09.02.10.58.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Sep 2014 10:58:40 -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 1XOsKO-0001Sb-SB; Tue, 02 Sep 2014 17:57:12 +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 1XOsJv-0001C3-DK; Tue, 02 Sep 2014 17:56:44 +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 s82HuBwo015659; Tue, 2 Sep 2014 18:56:11 +0100 (BST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id 8E2001AE08D9; Tue, 2 Sep 2014 18:56:33 +0100 (BST) From: Will Deacon To: linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org Subject: [RFC PATCH v2 6/7] arm: call iommu_init before of_platform_populate Date: Tue, 2 Sep 2014 18:56:26 +0100 Message-Id: <1409680587-29818-7-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1409680587-29818-1-git-send-email-will.deacon@arm.com> References: <1409680587-29818-1-git-send-email-will.deacon@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140902_105643_840945_D4ECF764 X-CRM114-Status: UNSURE ( 9.56 ) 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.7 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, 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: 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.178 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; }