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: 23132 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6ECCE218BC for ; Sat, 11 Jan 2014 13:06:06 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id m1sf21137483oag.4 for ; Sat, 11 Jan 2014 05:06:05 -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=ZXfJHqMbZ3x2cSj40pUYdzyxszdvYPWTrJh4/BKoRwE=; b=Zd3hh9/JDEo6LfeWWirImdcH7HXJuiIy27AVer9uszom+i03yQ2KRe7roBKIC+W39E 0blowxMAhMQFvcExUOQqmgdtSySG3h2+BpEe7/IBjLr0hBdaNKBTn1m8GR+8TlhYVgMv KF0OqFNHvg0kVfBag6ID2D34a/PNA+gJusu0X/Qbrv+hdRr3nazjjS5Ws0AK6/YA9FBY 3XvxeVIIiKdpo9UQYuVLkdVvofry60pUHZqpkXjKzd3rT/1Zj/mBIgmbmZhlUUh+Z7N/ WJsT0igqPNEDRbcQz4tF4rSNh0eEw2NRFbtIK6VVLvxsGeiy6OSua2ARoURJPUd5HLs3 1YMQ== X-Gm-Message-State: ALoCoQnZeAWz00j3ZJI3K1XYpak+Tndi/i41J1uv7Bp69O8Udj+CLUeCNQpEjPxz/cxwKXD4fk2w X-Received: by 10.182.104.70 with SMTP id gc6mr5423297obb.35.1389445565521; Sat, 11 Jan 2014 05:06:05 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.229 with SMTP id u5ls1875346qeq.69.gmail; Sat, 11 Jan 2014 05:06:05 -0800 (PST) X-Received: by 10.59.0.193 with SMTP id ba1mr12455070ved.12.1389445565365; Sat, 11 Jan 2014 05:06:05 -0800 (PST) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by mx.google.com with ESMTPS id qi8si7116115vec.69.2014.01.11.05.06.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 11 Jan 2014 05:06:05 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.46 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.46; Received: by mail-vb0-f46.google.com with SMTP id o19so1007vbm.33 for ; Sat, 11 Jan 2014 05:06:05 -0800 (PST) X-Received: by 10.52.157.1 with SMTP id wi1mr10356073vdb.12.1389445565043; Sat, 11 Jan 2014 05:06:05 -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.59.13.131 with SMTP id ey3csp22102ved; Sat, 11 Jan 2014 05:06:04 -0800 (PST) X-Received: by 10.180.20.15 with SMTP id j15mr7386665wie.4.1389445564169; Sat, 11 Jan 2014 05:06:04 -0800 (PST) Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by mx.google.com with ESMTPS id bq2si5699620wjb.174.2014.01.11.05.06.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 11 Jan 2014 05:06:04 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.172 is neither permitted nor denied by best guess record for domain of leif.lindholm@linaro.org) client-ip=74.125.82.172; Received: by mail-we0-f172.google.com with SMTP id q58so745290wes.17 for ; Sat, 11 Jan 2014 05:06:03 -0800 (PST) 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 Cc: linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, matt.fleming@intel.com, roy.franz@linaro.org, msalter@redhat.com, linux@arm.linux.org.uk, grant.likely@secretlab.ca, patches@linaro.org, Leif Lindholm 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-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.46 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();