From patchwork Fri Jul 18 14:00:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 33860 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A700120CA0 for ; Fri, 18 Jul 2014 14:03:59 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id y10sf25291421pdj.4 for ; Fri, 18 Jul 2014 07:03:56 -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=xodpwlr8uMUXDGF23nlb8PbmqAkYEld9cf8Y5Q5QL9M=; b=bzkhhajbKCAp2o9pdAdwMFHoHMIai9RthFtbwXMKMwEF93ieWV5QzLyfIJo7R4kwjD k7NIWSU+SCw0TeXEaczUNwAXaGhRdjFUQjoFFYnuXI7Ym125LHg1nPrBV/19uF7parIn zUcQpCoWeHNBPbwBiTDujvKgNdeWtF3Q4vlaWaJVbZiKLGxxXkz84exjZAfjKjEwwhy2 tOV+0FrIz0ljfIFptkBJavGDQG8Z2X2aex3+Fr7rxLhrRJwkoW6+sRQxLFdDUjhWnOrJ NHOXGoJdN5AjCAdwnQHMWbffI5HmuwCyX8ZQBckcBee4pL4b60nIEqGp4/S6d4wjkTrD dArw== X-Gm-Message-State: ALoCoQm2PSNxP89L9Q/iXQKPPFYwSesN8OdHCbp+9/K20qdnMA1Em1tfj1ftN2LqFOZPFIPfp4Ko X-Received: by 10.68.236.129 with SMTP id uu1mr2464540pbc.1.1405692236407; Fri, 18 Jul 2014 07:03:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.210 with SMTP id 76ls986299qgp.33.gmail; Fri, 18 Jul 2014 07:03:56 -0700 (PDT) X-Received: by 10.221.42.135 with SMTP id ty7mr6296712vcb.14.1405692236274; Fri, 18 Jul 2014 07:03:56 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id 13si5757177vdg.106.2014.07.18.07.03.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jul 2014 07:03:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so7476568vcb.36 for ; Fri, 18 Jul 2014 07:03:56 -0700 (PDT) X-Received: by 10.220.203.134 with SMTP id fi6mr6294818vcb.18.1405692236191; Fri, 18 Jul 2014 07:03:56 -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.37.5 with SMTP id tc5csp13862vcb; Fri, 18 Jul 2014 07:03:55 -0700 (PDT) X-Received: by 10.68.225.74 with SMTP id ri10mr5472492pbc.116.1405692235322; Fri, 18 Jul 2014 07:03:55 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ku7si6080824pbc.107.2014.07.18.07.03.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jul 2014 07:03:55 -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 1X88kI-0006GD-KM; Fri, 18 Jul 2014 14:02:46 +0000 Received: from mail-wg0-f44.google.com ([74.125.82.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X88j1-00051B-Od for linux-arm-kernel@lists.infradead.org; Fri, 18 Jul 2014 14:01:28 +0000 Received: by mail-wg0-f44.google.com with SMTP id m15so3517404wgh.3 for ; Fri, 18 Jul 2014 07:01:03 -0700 (PDT) X-Received: by 10.194.83.39 with SMTP id n7mr7322432wjy.58.1405692063166; Fri, 18 Jul 2014 07:01:03 -0700 (PDT) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id ft17sm14465308wjc.14.2014.07.18.07.01.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jul 2014 07:01:01 -0700 (PDT) From: Leif Lindholm To: linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, linux@arm.linux.org.uk Subject: [PATCH 7/7] init: efi: arm: enable (U)EFI runtime services on arm Date: Fri, 18 Jul 2014 15:00:53 +0100 Message-Id: <1405692053-7514-8-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405692053-7514-1-git-send-email-leif.lindholm@linaro.org> References: <1405692053-7514-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140718_070128_013331_42932F39 X-CRM114-Status: UNSURE ( 8.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.44 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.44 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: roy.franz@linaro.org, matt.fleming@intel.com, ard.biesheuvel@linaro.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: leif.lindholm@linaro.org 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.177 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 Since the efi_set_virtual_address_map call has strict init ordering requirements, add an explicit hook in the required place. Signed-off-by: Leif Lindholm Acked-by: Grant Likely --- init/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init/main.c b/init/main.c index e8ae1fe..744d271 100644 --- a/init/main.c +++ b/init/main.c @@ -996,6 +996,10 @@ static noinline void __init kernel_init_freeable(void) smp_prepare_cpus(setup_max_cpus); do_pre_smp_initcalls(); + + if (IS_ENABLED(CONFIG_ARM) && efi_enabled(EFI_BOOT)) + efi_enter_virtual_mode(); + lockup_detector_init(); smp_init();