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: 2778401 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A28F49F245 for ; Tue, 25 Jun 2013 18:09:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC16620387 for ; Tue, 25 Jun 2013 18:09:45 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DDD0220384 for ; Tue, 25 Jun 2013 18:09:40 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrXeY-0004Kh-Lg; Tue, 25 Jun 2013 18:07:44 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrXe9-0007pX-M6; Tue, 25 Jun 2013 18:07:17 +0000 Received: from mail-we0-x22b.google.com ([2a00:1450:400c:c03::22b]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UrXde-0007ka-5g for linux-arm-kernel@lists.infradead.org; Tue, 25 Jun 2013 18:06:47 +0000 Received: by mail-we0-f171.google.com with SMTP id m46so9495720wev.16 for ; Tue, 25 Jun 2013 11:06:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=OJIADqGCltTrkeQmqZPnKMp7cYNo+4bsT0ylP7DtqpA=; b=lw4WO7w/OppRsvQF4E+s/wm/TKOQ84Vl+gVzCjK7n9E9kj1m9nFnklIaauniT5doqH ftcXZysK1FjaiK20Usscanp/KZactF7nhqrJWjkbj7NQx8kjAPABZlDHk9mNAsSYE7fb 7m2A3jqc9m8neci+GAU1LxWQhLkYP57bqEi842AhbsuNbAAd0zLg14SD4s11gZggDY0D 9o+G9iiFr7B0TbRm/mS7yCeqP5lVS7CFYksor34EBZXy/kl7al7ecR+q8YL1p0AgedmA f+drQIwuVr7+N6Tkw16Qdg+hrrK8jHLj0rNUmmPxKkrpHI55Xpv8cF9gFNFyghl16hWM 64Vg== 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 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: ALoCoQlZWjdzhS8xaWZ+es4QV4HkQYodopZR4Rh9GApG0OSdYiMdJtcOItiRzH6d/ZmwlsDbVawH X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130625_140646_417509_EF8930C1 X-CRM114-Status: UNSURE ( 8.60 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: linux-efi@vger.kernel.org, patches@linaro.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Leif Lindholm , matt.fleming@intel.com, tglx@linutronix.de, hpa@linux.intel.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 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+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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();