From patchwork Fri Jul 18 14:00:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 4585101 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 B45FBC0514 for ; Fri, 18 Jul 2014 14:04:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EF12E20179 for ; Fri, 18 Jul 2014 14:04:40 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 2CBE12011B for ; Fri, 18 Jul 2014 14:04:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1X88kI-0006GD-KM; Fri, 18 Jul 2014 14:02:46 +0000 Received: from mail-wg0-f44.google.com ([74.125.82.44]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1X88j1-00051B-Od for linux-arm-kernel@lists.infradead.org; Fri, 18 Jul 2014 14:01:28 +0000 Received: by mail-wg0-f44.google.com with SMTP id m15so3517404wgh.3 for ; Fri, 18 Jul 2014 07:01:03 -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=rJj7P2/8HxssrNNbQophJNLf9owmT3V5dkQfMWjgdTc=; b=C3hfH3X4uT1YIP/Y+rwSLpFcz5v41a+KMX5A9j0uj47qlyvaHNEuqjUkqp0k3jRsxX h7nVtjPwsR7VfrqWbAyffibWn7APLRhiibNDZ++dz30qRB+NL2Hieg9XONxf6Jwspowc mWs9koaKcZe0CxTGgDB3RvEtnHFSPeX/7N5m0Dcqlfz9YAq4uy9iOiug9VNt3xX3zy+X jzM1hN3wnOG+uCJJWkuj4+hqjz0GTik4AZKl9xtqA1Lr3faJ9GqOLCXbc4AasDW8p4jL R2BplifHlpHZiVpNvhYRlY4zl1q9pXrbmp+C034Q4R/6mFZgGZT3tA0lXKGPQpQm2dTn Nvnw== X-Gm-Message-State: ALoCoQnwEh3R1xm20IhPI8mYY5m+SqgRQhrVEFGOfAqUpCClFFzsEvjPtuQ8JadhgH9tXDhShuwG X-Received: by 10.194.83.39 with SMTP id n7mr7322432wjy.58.1405692063166; Fri, 18 Jul 2014 07:01:03 -0700 (PDT) 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 ft17sm14465308wjc.14.2014.07.18.07.01.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Jul 2014 07:01:01 -0700 (PDT) From: Leif Lindholm To: linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, linux@arm.linux.org.uk Subject: [PATCH 7/7] init: efi: arm: enable (U)EFI runtime services on arm Date: Fri, 18 Jul 2014 15:00:53 +0100 Message-Id: <1405692053-7514-8-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405692053-7514-1-git-send-email-leif.lindholm@linaro.org> References: <1405692053-7514-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140718_070128_013331_42932F39 X-CRM114-Status: UNSURE ( 8.90 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) Cc: roy.franz@linaro.org, matt.fleming@intel.com, ard.biesheuvel@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-1.9 required=5.0 tests=BAYES_00,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 e8ae1fe..744d271 100644 --- a/init/main.c +++ b/init/main.c @@ -996,6 +996,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();