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: 3587881 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1D6E9C02DC for ; Wed, 5 Feb 2014 17:43:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 53A0120165 for ; Wed, 5 Feb 2014 17:43:00 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F3A420149 for ; Wed, 5 Feb 2014 17:42:59 +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 1WB5xR-0004hZ-1I; Wed, 05 Feb 2014 17:08:19 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WB5wc-0001ow-DD; Wed, 05 Feb 2014 17:07:26 +0000 Received: from mail-we0-f179.google.com ([74.125.82.179]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WB5v2-0001Z8-05 for linux-arm-kernel@lists.infradead.org; Wed, 05 Feb 2014 17:05:56 +0000 Received: by mail-we0-f179.google.com with SMTP id q58so499441wes.38 for ; Wed, 05 Feb 2014 09:05:29 -0800 (PST) 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=SBQfP20AOq5APR+pDNLT+ccbkcvCHdkm7khR+COtRpU=; b=YUfEXAdtAa+SWjycnIGAe5aUS03778hVCb+aIVBx9n20Q02qB0ObXMN9Cc2V7E6Kxt 0seRKJL90UbdBhR5Z6MNDLRwdBeXbI4be9ai153tDEAA3aRAU/EFFhSSxOy0h3+V7ViX Annof/d62CNH0IruhH6cRpSbcRRA70a3w0ThIPMg38rqK1053zELULMCcxmv+gyR8wUY /ZE0fsBDEbqR5NCNC4RcRNMu/ZSJLUSYBaOZRQw3d6NDIsu7X4cF1nTFx24xjDCzt5Ju sa4Xmv4YKGl8eOE/AQpEg97iH67PyzQWBeU57nQ77jyZ7TbCwgyN/Mhjlc2J5bC8vY72 g+iQ== X-Gm-Message-State: ALoCoQkjUtgddB/NHBn5KGq8KD+J5W7ijvi5ykGBm5so/PDATOM4Hz2/RrNiRm0nZpLQ1Qwbm0Td 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140205_120548_273821_9A3A5B74 X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Leif Lindholm , patches@linaro.org 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.7 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 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();