From patchwork Wed Feb 5 17:04:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 24204 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3B28520675 for ; Wed, 5 Feb 2014 17:05:56 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id le5sf1290102vcb.3 for ; Wed, 05 Feb 2014 09:05:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=SBQfP20AOq5APR+pDNLT+ccbkcvCHdkm7khR+COtRpU=; b=dGf+LBDRlOxobv/TfEks7Cl6n4gT/hzgliA6Zd/00Wm4Ib1qVw6EtVs7U6TMs0iwol lhTQHnCz1K+qniyZoL8fzuZdUEcCEn2wQa0o/wx8AjM4DtsXjE1TkpkH9yFmjdk8kalb IjfAJKeUqrKjrzwI62NOeYm7yTSi3a/mWzT9L9lwPRbLdk14ya7OcEtBD3lzRzlETrig W0kGGdoDzPAW913leEsJ03s1KWmJq5+QmRf72RwaVuyzPORWMh2O0lWZHuiVkcYiHdi+ W3WthU8cLIVwc7e3Co3Pc8C/dIeNXddeK9xP/efVIEs1dutmNPs76jpdMURNfZbAzpB0 Uk4Q== X-Gm-Message-State: ALoCoQkCMplXWElHtBbKdugle3GNO8JvBuTAq1GUvAppDfLMqM/n70I5IjGHBzU/Sr/J39AhPiGS X-Received: by 10.58.238.199 with SMTP id vm7mr17149682vec.17.1391619955393; Wed, 05 Feb 2014 09:05:55 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.180 with SMTP id z49ls178433qgd.59.gmail; Wed, 05 Feb 2014 09:05:55 -0800 (PST) X-Received: by 10.52.98.232 with SMTP id el8mr131613vdb.74.1391619955304; Wed, 05 Feb 2014 09:05:55 -0800 (PST) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id og9si4031925vec.31.2014.02.05.09.05.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 09:05:55 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id ie18so500429vcb.26 for ; Wed, 05 Feb 2014 09:05:55 -0800 (PST) X-Received: by 10.52.107.35 with SMTP id gz3mr1463792vdb.8.1391619955212; Wed, 05 Feb 2014 09:05:55 -0800 (PST) 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.220.174.196 with SMTP id u4csp64648vcz; Wed, 5 Feb 2014 09:05:54 -0800 (PST) X-Received: by 10.180.79.106 with SMTP id i10mr3324703wix.23.1391619930217; Wed, 05 Feb 2014 09:05:30 -0800 (PST) Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com [209.85.212.169]) by mx.google.com with ESMTPS id v8si9763667wiz.76.2014.02.05.09.05.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 05 Feb 2014 09:05:30 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.169 is neither permitted nor denied by best guess record for domain of leif.lindholm@linaro.org) client-ip=209.85.212.169; Received: by mail-wi0-f169.google.com with SMTP id e4so756631wiv.4 for ; Wed, 05 Feb 2014 09:05:29 -0800 (PST) X-Received: by 10.180.37.193 with SMTP id a1mr3371849wik.52.1391619929498; Wed, 05 Feb 2014 09:05:29 -0800 (PST) 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 p1sm47427211wie.1.2014.02.05.09.05.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Feb 2014 09:05:28 -0800 (PST) From: Leif Lindholm To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org Cc: patches@linaro.org, Leif Lindholm Subject: [PATCH 14/22] init: efi: arm: enable (U)EFI runtime services on arm Date: Wed, 5 Feb 2014 17:04:05 +0000 Message-Id: <1391619853-10601-15-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1391619853-10601-1-git-send-email-leif.lindholm@linaro.org> References: <1391619853-10601-1-git-send-email-leif.lindholm@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 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 Acked-by: Grant Likely --- init/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init/main.c b/init/main.c index 2fd9cef..0325962 100644 --- a/init/main.c +++ b/init/main.c @@ -902,6 +902,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();