From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751366AbcBWJXe (ORCPT ); Tue, 23 Feb 2016 04:23:34 -0500 Received: from terminus.zytor.com ([198.137.202.10]:58030 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754512AbcBWJJq (ORCPT ); Tue, 23 Feb 2016 04:09:46 -0500 Date: Mon, 22 Feb 2016 04:16:07 -0800 From: =?UTF-8?B?dGlwLWJvdCBmb3IgQXJkIEJpZXNoZXV2ZWwgPHRpcGJvdEB6eXRvci5jb20+?=@zytor.com Message-ID: Cc: peterz@infradead.org, jeremy.linton@arm.com, mingo@kernel.org, matt@codeblueprint.co.uk, ard.biesheuvel@linaro.org, mark.rutland@arm.com, torvalds@linux-foundation.org, hpa@zytor.com, linux-kernel@vger.kernel.org, suzuki.poulose@arm.com, tglx@linutronix.de Reply-To: tglx@linutronix.de, suzuki.poulose@arm.com, linux-kernel@vger.kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, mark.rutland@arm.com, matt@codeblueprint.co.uk, ard.biesheuvel@linaro.org, mingo@kernel.org, jeremy.linton@arm.com, peterz@infradead.org In-Reply-To: <1455712566-16727-10-git-send-email-matt@codeblueprint.co.uk> References: <1455712566-16727-10-git-send-email-matt@codeblueprint.co.uk> To: =?UTF-8?B?bGludXgtdGlwLWNvbW1pdHNAdmdlci5rZXJuZWwub3Jn?=@zytor.com Subject: =?UTF-8?B?W3RpcDplZmkvY29yZV0gZWZpL2FybTY0OiBDaGVjayBmb3IgaC93IHN1cHBvcnQ=?= =?UTF-8?B?IGJlZm9yZSBib290aW5nIGEgPjQgS0IgZ3JhbnVsYXIga2VybmVs?= Git-Commit-ID: =?UTF-8?B?NDJiNTU3MzQwMzBjMWY3MjRkNWY0N2FlYjg3MmUyY2NjZDY1MGQ3OQ==?= X-Mailer: =?UTF-8?B?dGlwLWdpdC1sb2ctZGFlbW9u?= Robot-ID: =?UTF-8?B?PHRpcC1ib3QuZ2l0Lmtlcm5lbC5vcmc+?= Robot-Unsubscribe: =?UTF-8?B?Q29udGFjdCA8bWFpbHRvOmhwYUBrZXJuZWwub3JnPiB0byBnZXQgYmxhY2tsaXM=?= =?UTF-8?B?dGVkIGZyb20gdGhlc2UgZW1haWxz?= MIME-Version: =?UTF-8?B?MS4w?= Content-Transfer-Encoding: =?UTF-8?B?OGJpdA==?= Content-Type: =?UTF-8?B?dGV4dC9wbGFpbjsgY2hhcnNldD1VVEYtOA==?= Content-Disposition: =?UTF-8?B?aW5saW5l?= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 42b55734030c1f724d5f47aeb872e2cccd650d79 Gitweb: http://git.kernel.org/tip/42b55734030c1f724d5f47aeb872e2cccd650d79 Author: Ard Biesheuvel AuthorDate: Wed, 17 Feb 2016 12:36:02 +0000 Committer: Ingo Molnar CommitDate: Mon, 22 Feb 2016 08:26:27 +0100 efi/arm64: Check for h/w support before booting a >4 KB granular kernel A kernel built with support for a page size that is not supported by the hardware it runs on cannot boot to a state where it can inform the user about the failure. If we happen to be booting via UEFI, we can fail gracefully so check if the currently configured page size is supported by the hardware before entering the kernel proper. Note that UEFI mandates support for 4 KB pages, so in that case, no check is needed. Tested-by: Suzuki K Poulose Signed-off-by: Ard Biesheuvel Signed-off-by: Matt Fleming Reviewed-by: Jeremy Linton Acked-by: Mark Rutland Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1455712566-16727-10-git-send-email-matt@codeblueprint.co.uk Signed-off-by: Ingo Molnar --- drivers/firmware/efi/libstub/arm64-stub.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c index 9e03427..047fc34 100644 --- a/drivers/firmware/efi/libstub/arm64-stub.c +++ b/drivers/firmware/efi/libstub/arm64-stub.c @@ -12,6 +12,26 @@ #include #include #include +#include + +efi_status_t check_platform_features(efi_system_table_t *sys_table_arg) +{ + u64 tg; + + /* UEFI mandates support for 4 KB granularity, no need to check */ + if (IS_ENABLED(CONFIG_ARM64_4K_PAGES)) + return EFI_SUCCESS; + + tg = (read_cpuid(ID_AA64MMFR0_EL1) >> ID_AA64MMFR0_TGRAN_SHIFT) & 0xf; + if (tg != ID_AA64MMFR0_TGRAN_SUPPORTED) { + if (IS_ENABLED(CONFIG_ARM64_64K_PAGES)) + pr_efi_err(sys_table_arg, "This 64 KB granular kernel is not supported by your CPU\n"); + else + pr_efi_err(sys_table_arg, "This 16 KB granular kernel is not supported by your CPU\n"); + return EFI_UNSUPPORTED; + } + return EFI_SUCCESS; +} efi_status_t handle_kernel_image(efi_system_table_t *sys_table_arg, unsigned long *image_addr,