From patchwork Thu Oct 3 11:24:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 2982261 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 C6F6D9F288 for ; Thu, 3 Oct 2013 11:27:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B31D4201FD for ; Thu, 3 Oct 2013 11:27:55 +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 EC8DF201E4 for ; Thu, 3 Oct 2013 11:27:50 +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 1VRh3d-0003yh-Pm; Thu, 03 Oct 2013 11:27:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRh3T-0007ny-G2; Thu, 03 Oct 2013 11:26:51 +0000 Received: from mail-wi0-f182.google.com ([209.85.212.182]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VRh3I-0007kN-Il for linux-arm-kernel@lists.infradead.org; Thu, 03 Oct 2013 11:26:41 +0000 Received: by mail-wi0-f182.google.com with SMTP id ez12so2393309wid.3 for ; Thu, 03 Oct 2013 04:26:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=p+z263qn57DzeqqjGTI/AQxVtWHVNsw5KB5OraEQGlk=; b=XUucFjwPy9qY87cgXIIBflZXR9xmZqaElF+CcyVllXg3ZBZM0JzyEPkVcaQSaQUuHo XMlIF3UWaGy3xq4D4VakP2uAj4Uc0zGNAbw4v6ndpc5zU7oahvbiV0ZvCel5FHBklymB b8gZlxUftYLlofbMji6YTjtN1Fx5dXzO4vEtBcgwrxVx79n4ApTsbaKAOIrFUa2vWQ5m 1cXbq4fU8MnSGOBBhCnDEck5r+GqV7tUSrO4JEldf8flJpw3FXLMK3prVDJqGlo8t2OV 8ap7pm/0uAZpTiPDaPdzzrE4cEclmTf+o4vBUawFlbnIU9I742bzBhh8q5qXIWIXMht4 rBJA== X-Gm-Message-State: ALoCoQlXFyLWo4s6auo0BJ1XdwR2UeUUXy3EkOQ6wzAhDXiJh9klPjCHywC4oHUwFLPQsQ0n2k3Q X-Received: by 10.180.39.134 with SMTP id p6mr2023745wik.9.1380799578963; Thu, 03 Oct 2013 04:26:18 -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 j5sm12851841wia.4.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Oct 2013 04:26:18 -0700 (PDT) From: Leif Lindholm To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 3/3] init: efi: arm: enable (U)EFI runtime services on arm Date: Thu, 3 Oct 2013 12:24:41 +0100 Message-Id: <1380799481-5470-4-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1380799481-5470-1-git-send-email-leif.lindholm@linaro.org> References: <1380799481-5470-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131003_072640_847427_D7CF4483 X-CRM114-Status: UNSURE ( 9.10 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: roy.franz@linaro.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Leif Lindholm , grant.likely@secretlab.ca, matt.fleming@intel.com, msalter@redhat.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=-4.9 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 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init/main.c b/init/main.c index af310af..ec6d76e 100644 --- a/init/main.c +++ b/init/main.c @@ -875,6 +875,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();