From patchwork Sat Jan 11 13:05:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 3469261 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 D3E42C02DC for ; Sat, 11 Jan 2014 13:08:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 148592015D for ; Sat, 11 Jan 2014 13:08:02 +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 2519220123 for ; Sat, 11 Jan 2014 13:08:01 +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 1W1yHA-0001hb-7Y; Sat, 11 Jan 2014 13:06:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1W1yGx-0004NG-9r; Sat, 11 Jan 2014 13:06:43 +0000 Received: from mail-wi0-f173.google.com ([209.85.212.173]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1W1yGf-0004Ju-Bt for linux-arm-kernel@lists.infradead.org; Sat, 11 Jan 2014 13:06:28 +0000 Received: by mail-wi0-f173.google.com with SMTP id hn9so618462wib.12 for ; Sat, 11 Jan 2014 05:06:03 -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=ZXfJHqMbZ3x2cSj40pUYdzyxszdvYPWTrJh4/BKoRwE=; b=cWJUpdMpAI6fiu0iOiq7y6ZLIkHbv4Oe/VcxTuXpvb56FeWTWjWKX94lApvtCgnJez G2TEMW6kcKelWoCGxhgeuVSSWitqqTKc9N7qsP7Ogow1+csemQEae5h4jzkSirz3dTPC HdKttcQMxtEfk/ovK4J0KkocWsnck4bJPYRH7RkaYlsPpb+/o4RsMYxhPVS0W+F8gu72 eom5RtWprt8SjqYwV5JEtBE6AArU3Mj55rW95ZrjE/Oct2VDQZPQYPwZmWEnL+HD4FZo MV+EaA6wYG1cLzmn0+g/7O7MQdeAr4gpZWPdaribl5C5A8/95fnk1/GeXC1/F0vFMiJu srPA== X-Gm-Message-State: ALoCoQk6SaGsq+fBLEgvLtIeLOHjesPHuZy6pJJNPXE+5NMDuTB10OTfnS1oJEZnPQuv1q80Mk45 X-Received: by 10.180.207.239 with SMTP id lz15mr7358783wic.28.1389445562939; Sat, 11 Jan 2014 05:06:02 -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 f7sm6549731wjb.7.2014.01.11.05.06.01 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jan 2014 05:06:02 -0800 (PST) From: Leif Lindholm To: linux-kernel@vger.kernel.org Subject: [PATCH v4 5/5] init: efi: arm: enable (U)EFI runtime services on arm Date: Sat, 11 Jan 2014 13:05:24 +0000 Message-Id: <1389445524-30623-6-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1389445524-30623-1-git-send-email-leif.lindholm@linaro.org> References: <1389445524-30623-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140111_080625_555555_539C96A8 X-CRM114-Status: UNSURE ( 8.91 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: grant.likely@secretlab.ca, linux-efi@vger.kernel.org, linux@arm.linux.org.uk, patches@linaro.org, Leif Lindholm , roy.franz@linaro.org, matt.fleming@intel.com, msalter@redhat.com, linux-arm-kernel@lists.infradead.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.3 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 febc511..1331829 100644 --- a/init/main.c +++ b/init/main.c @@ -905,6 +905,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();