From patchwork Thu Nov 28 16:41:23 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 3255181 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 9068DC045B for ; Thu, 28 Nov 2013 16:45:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CEFFE2065A for ; Thu, 28 Nov 2013 16:45:00 +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 DC96A20661 for ; Thu, 28 Nov 2013 16:44: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 1Vm4gm-0001LP-10; Thu, 28 Nov 2013 16:43:40 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vm4gL-0007Fe-GO; Thu, 28 Nov 2013 16:43:13 +0000 Received: from mail-we0-f169.google.com ([74.125.82.169]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Vm4gD-0007Dg-2b for linux-arm-kernel@lists.infradead.org; Thu, 28 Nov 2013 16:43:05 +0000 Received: by mail-we0-f169.google.com with SMTP id w61so2769266wes.0 for ; Thu, 28 Nov 2013 08:42:42 -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=NZ9g0PMnL2hzsMIZNqQoj+A5jY/FV85rDYOqJJQWtSM=; b=BWWOR+rRiuwkftC2w2t9QDiZcJeF9DLHadCKOV6V9EVhMTpaJme60NiQUQ/pGdt0lN KR1vPVq+r6WCcNDd8lOElE17jILuiUSCrgcogvtwPKfLULGUPtoJnHOQ4OoLTTjx0tAr V+ujxaB9rUCNPTWpeft3uDJjV0tQxglM4jo9C2yb7sxytJRDGUA+gtrr/eT4HOwb0hZe xa07Ld9Fnk/zdUUkvNvlJMBMkLPrjnOj54aFl4RO1tjFRXVvOcDfRH6pYBoNRsSL401C DojswxLG8kAVlZxN98L4GyKzAHJtX+1dw3zyK87PbRdGwmda2oDAfo5APtA8vr42ZogZ SYRA== X-Gm-Message-State: ALoCoQkKrSpAAdvCKLm7oJ7UKUfXlafIdYZlOLiLT5RDzd45EZSop9HTTorX2zbLqFK52Rnznh0t X-Received: by 10.180.97.5 with SMTP id dw5mr3212055wib.42.1385656962057; Thu, 28 Nov 2013 08:42:42 -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 s2sm83470728wiy.7.2013.11.28.08.42.36 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2013 08:42:41 -0800 (PST) From: Leif Lindholm To: linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, linux@arm.linux.org.uk Subject: [PATCH v3 3/3] init: efi: arm: enable (U)EFI runtime services on arm Date: Thu, 28 Nov 2013 16:41:23 +0000 Message-Id: <1385656883-4420-4-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1385656883-4420-1-git-send-email-leif.lindholm@linaro.org> References: <1385656883-4420-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131128_114305_279376_BFEA24C6 X-CRM114-Status: UNSURE ( 9.24 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: mark.rutland@arm.com, linaro-uefi@linaro.org, matt.fleming@intel.com, patches@linaro.org, Leif Lindholm , roy.franz@linaro.org, msalter@redhat.com, grant.likely@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.2 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();