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: 21843 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4A58420299 for ; Thu, 28 Nov 2013 16:42:44 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id at1sf28122170iec.11 for ; Thu, 28 Nov 2013 08:42:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=NZ9g0PMnL2hzsMIZNqQoj+A5jY/FV85rDYOqJJQWtSM=; b=czUpJdVgCmSWuGsj22PLHQzgiQO+nbIAIRQWsHd9ishnwESgtaL8HIvu7yVWu1u6Zs 2OCbLevvoEvpfCDq95BmQ8A/7jYlu+Wfpr8launad/INExyiwWDWsS+IdyOeq5VTLrYg aw9VJlnseUHWhaXgBzTg50dsn0OQaQVDIjC9xPvbB/jgQ253wrK9SrsosORXwQh/Vv6P UcLiUZ6ag4Nmgrap+LttI1gtQ2jbHO5LY2/e6mwRj8iGswPy6NNeyAVynu3AQ+XA5T/S +NBfBReDJq8KL82+qyu/F1MR6rI+dDoXXN537CcDisJ4Uad9P8vYxMdWbKzp+MDt0gjj LP0w== X-Gm-Message-State: ALoCoQlwaKpBNpQ9asCgMz/53jeZWyEtYqyzI1chquWpCvQImJt7oFf/ZT0nEEXVXaLJn2Ws/ek0 X-Received: by 10.43.152.202 with SMTP id kx10mr14005892icc.3.1385656963640; Thu, 28 Nov 2013 08:42:43 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.36.136 with SMTP id q8ls2604394qej.36.gmail; Thu, 28 Nov 2013 08:42:43 -0800 (PST) X-Received: by 10.220.123.6 with SMTP id n6mr1622349vcr.28.1385656963542; Thu, 28 Nov 2013 08:42:43 -0800 (PST) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id ud10si23169623vcb.141.2013.11.28.08.42.43 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Nov 2013 08:42:43 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.44; Received: by mail-vb0-f44.google.com with SMTP id w20so6139872vbb.3 for ; Thu, 28 Nov 2013 08:42:43 -0800 (PST) X-Received: by 10.58.133.77 with SMTP id pa13mr15763898veb.21.1385656963442; Thu, 28 Nov 2013 08:42:43 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp27813vcz; Thu, 28 Nov 2013 08:42:43 -0800 (PST) X-Received: by 10.194.78.51 with SMTP id y19mr7507367wjw.62.1385656962477; Thu, 28 Nov 2013 08:42:42 -0800 (PST) Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by mx.google.com with ESMTPS id ax1si23508703wjc.107.2013.11.28.08.42.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 28 Nov 2013 08:42:42 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.179 is neither permitted nor denied by best guess record for domain of leif.lindholm@linaro.org) client-ip=74.125.82.179; Received: by mail-we0-f179.google.com with SMTP id q59so8500695wes.10 for ; Thu, 28 Nov 2013 08:42:42 -0800 (PST) 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 Cc: matt.fleming@intel.com, grant.likely@linaro.org, roy.franz@linaro.org, msalter@redhat.com, patches@linaro.org, linaro-uefi@linaro.org, mark.rutland@arm.com, Leif Lindholm 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.44 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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();