From patchwork Tue Jun 25 18:11:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 18122 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4CC9225E4B for ; Tue, 25 Jun 2013 18:06:26 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id f73sf18323353yha.2 for ; Tue, 25 Jun 2013 11:06:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=OJIADqGCltTrkeQmqZPnKMp7cYNo+4bsT0ylP7DtqpA=; b=WSXE74fbrCMX6iaaTSJZgKRMAWXiyzDX3tXIn7EhWv6ltSWQg+4bQ4IcDjGlKHrjPu n5W7Ud6F/aJbmxrPfAZwnjIpeKaDKmhehY+rn7Q09/7o+CFOWQsyU+YS0q8KwMOMMjaV W6FNQi3WrAUHr+YUSaJYWLonqwvfvuPEFyqe0e3mjbXFWttbSbFhC3CdF1RWUfc9iXBx lLbcP1RURRu0wvtLsRKKGGta5ORYbqPdSq9+ztxfu8FEGcat6ZUe40BHAauDQTg/ZXgE iwSMbo3EJzMezD6y1Fl/vUF4z9vq2LAcZm2cwRIcLcpc9WRJs5gh5xEk42Fo3g5hTwn5 v1nQ== X-Received: by 10.236.32.229 with SMTP id o65mr116604yha.19.1372183586116; Tue, 25 Jun 2013 11:06:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.0.66 with SMTP id 2ls116479qec.47.gmail; Tue, 25 Jun 2013 11:06:25 -0700 (PDT) X-Received: by 10.58.171.4 with SMTP id aq4mr152568vec.26.1372183585883; Tue, 25 Jun 2013 11:06:25 -0700 (PDT) Received: from mail-vc0-x229.google.com (mail-vc0-x229.google.com [2607:f8b0:400c:c03::229]) by mx.google.com with ESMTPS id ex7si6287951vdb.135.2013.06.25.11.06.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 11:06:25 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c03::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c03::229; Received: by mail-vc0-f169.google.com with SMTP id ia10so840839vcb.0 for ; Tue, 25 Jun 2013 11:06:25 -0700 (PDT) X-Received: by 10.58.119.233 with SMTP id kx9mr187801veb.3.1372183585787; Tue, 25 Jun 2013 11:06:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp78889veb; Tue, 25 Jun 2013 11:06:25 -0700 (PDT) X-Received: by 10.194.86.106 with SMTP id o10mr61471wjz.93.1372183584923; Tue, 25 Jun 2013 11:06:24 -0700 (PDT) Received: from mail-we0-x233.google.com (mail-we0-x233.google.com [2a00:1450:400c:c03::233]) by mx.google.com with ESMTPS id j2si1570693wiv.83.2013.06.25.11.06.24 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 11:06:24 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c03::233 is neither permitted nor denied by best guess record for domain of leif.lindholm@linaro.org) client-ip=2a00:1450:400c:c03::233; Received: by mail-we0-f179.google.com with SMTP id w59so9284119wes.24 for ; Tue, 25 Jun 2013 11:06:24 -0700 (PDT) X-Received: by 10.194.174.4 with SMTP id bo4mr163801wjc.40.1372183584422; Tue, 25 Jun 2013 11:06:24 -0700 (PDT) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginmedia.com. [86.14.224.72]) by mx.google.com with ESMTPSA id j20sm4989952wie.7.2013.06.25.11.06.22 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 11:06:23 -0700 (PDT) From: Leif Lindholm To: linux-arm-kernel@lists.infradead.org Cc: linux-efi@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, patches@linaro.org, hpa@linux.intel.com, tglx@linutronix.de, matt.fleming@intel.com, Leif Lindholm Subject: [PATCH 4/4] init: efi: arm: enable (U)EFI runtime services on arm Date: Tue, 25 Jun 2013 19:11:03 +0100 Message-Id: <1372183863-11333-5-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1372183863-11333-1-git-send-email-leif.lindholm@linaro.org> References: <1372183863-11333-1-git-send-email-leif.lindholm@linaro.org> X-Gm-Message-State: ALoCoQmXgeJtkejygMsOr6JWBYTh4qkZL8tHgQp6orGYXzQ67YyZuGNRq+lySSICjiLm4zAThPoG X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c03::229 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- init/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/init/main.c b/init/main.c index 9484f4b..c61706e 100644 --- a/init/main.c +++ b/init/main.c @@ -872,6 +872,12 @@ static noinline void __init kernel_init_freeable(void) smp_prepare_cpus(setup_max_cpus); do_pre_smp_initcalls(); + +#ifdef CONFIG_ARM + if (efi_enabled(EFI_RUNTIME_SERVICES)) + efi_enter_virtual_mode(); +#endif + lockup_detector_init(); smp_init();