From patchwork Tue Jan 2 17:21:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 123184 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp9206140qgn; Tue, 2 Jan 2018 09:21:26 -0800 (PST) X-Google-Smtp-Source: ACJfBotx6/b1rsBh+pPxffoLbmbtioGrzEvge2eL1XllR1U2fMdodurqpTZnOAFntUUyDlqzp2JX X-Received: by 10.98.46.7 with SMTP id u7mr46130871pfu.37.1514913686195; Tue, 02 Jan 2018 09:21:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514913686; cv=none; d=google.com; s=arc-20160816; b=vcJ5nFmPkDAjHKmqJvreMeu1E9DkR/L96tfTNh574pzt/gfZ4DKV9HSSPsYGoWsGZF l0w5syX+/tCCd060+e+NLtF2ySNB6TD7Kw9JKTzf9TcSXTt6WdvJs0QJSzpDQGVuRyFG lm3nX6SZfWxnVa+Uhx/r2VrEK2qKx7lr7ekzABkM/+GkP7Hwzz5naRxE+BFLYZxuRMFg 3hqgd4goSdwRaxsf82VU4pc5190tejJEt4cmp89SOx4lSTkeZUx3SIoW80YEKxoC2oqb 2hB/+EpO8c3hYFXGxOoW0u4sOxpxdSyrCQzoroOVrHt953t9jekcoH5KJbGFA79sOK5f bWMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=FCyO40DKrucujFfu2+JC0FcC/6gxnbkSxPBAKsofSAg=; b=OXEqs46L48yaPXApxz4FznHMex0wVvDT05vWVp20vbMD9Rtm0qI8REdS6ryFUt0lsQ f2l+bAED5pGcmNi5TT71XfdND1MbVbLdJx+Hs6vD0xpkQOP5rDwZ5WZl89LgKx7iXxbi SkDUFuW8v10QhnJN8ttHTTc8aN4nmQneXEy7+kJWJ4uXA7iuS6CNbUJpZls4kdiUIdU/ 4blgYKRPmI1FEUD7pQZlP5tZ4yZKgDxuDUriAcir/xkIRoXRvGWHVyfHoSdDSpDLKb8m Ghn+zNORd7k6VS4v8BoAgZ28bBwu3fcAvBDWFbjJ0l5Tl1lPXKHK3CyD0ve2rXz1WeHl L2ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YzS6a1HZ; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v2si30860548pgf.457.2018.01.02.09.21.25; Tue, 02 Jan 2018 09:21:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=YzS6a1HZ; spf=pass (google.com: best guess record for domain of linux-efi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-efi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751311AbeABRVY (ORCPT + 2 others); Tue, 2 Jan 2018 12:21:24 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:44264 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751299AbeABRVW (ORCPT ); Tue, 2 Jan 2018 12:21:22 -0500 Received: by mail-wm0-f65.google.com with SMTP id t8so62234628wmc.3 for ; Tue, 02 Jan 2018 09:21:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IHch68vFMdIAcbibYL30NiwOmIwdzSx2+2M3u08xi7c=; b=YzS6a1HZiBaQj+7R6Tz8vXadsDdY3CE6mG78x4RfJSP/yr1UwTi3qBFOUPSZ8Q4c1W /5HFyfH0UEIb/WOgh4ICL+Cj8El1TFU2im1o+mDnmMvq6QElVFsLWWuuvMROLCbNCT1B U0SYYvo0BZE/kBv92FIrHMpOPoxWMnjnzyXas= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IHch68vFMdIAcbibYL30NiwOmIwdzSx2+2M3u08xi7c=; b=nont1mNUrJXNMHGLeAPItfdUSaSAI+JhNgX+eqfVladaCeZLLyFsCZHm5I6JHGGJfa h3h9wqIqu1pAYbGPEefbhCRNHO2QCqTwzSBKy9Rfrzme0NrzS0WLmzfh4EkZjdAp5PGb OhqX5lO0vHyNlODyO6gtJPdXHQuxabK2Mf2nSsf6l7Obr7NWzDgPnGmwii9DG8PUoh2v kBfHFk3+NGT5cDruDvWZlYmQE/5WaAs5tIF6Hof+h9CXYv/28SGEZbORhFF4OETcbowy JE4f7bUxL7W6HKup4kHdH78NWntKIQ2hxca3NvuI6gvvlGBZacsbzcNTa/hACmKF55wB KIKQ== X-Gm-Message-State: AKGB3mLN6Z4BF+/2Ex8IbuDQ26FX9ZYqXfoR8CxnCLixjhoe4AI3+aMR sIzrRpeYCPDaX/oS8b2PQcO6xm54A+s= X-Received: by 10.28.62.5 with SMTP id l5mr37461292wma.47.1514913680834; Tue, 02 Jan 2018 09:21:20 -0800 (PST) Received: from localhost.localdomain ([160.89.138.198]) by smtp.gmail.com with ESMTPSA id p15sm8692446wre.64.2018.01.02.09.21.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Jan 2018 09:21:20 -0800 (PST) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, Bryan O'Donoghue , Dave Young , Ge Song , Matt Fleming Subject: [PATCH 1/2] x86/efi: Fix kernel param add_efi_memmap regression Date: Tue, 2 Jan 2018 17:21:09 +0000 Message-Id: <20180102172110.17018-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180102172110.17018-1-ard.biesheuvel@linaro.org> References: <20180102172110.17018-1-ard.biesheuvel@linaro.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org From: Dave Young 'add_efi_memmap' is an early param, but do_add_efi_memmap() has no chance to run because the code path is before parse_early_param(). I believe it worked when the param was introduced but probably later some other changes caused the wrong order and nobody noticed it. Move efi_memblock_x86_reserve_range() after parse_early_param() to fix it. Signed-off-by: Dave Young Cc: Ingo Molnar Signed-off-by: Matt Fleming Signed-off-by: Ard Biesheuvel --- arch/x86/kernel/setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 8af2e8d0c0a1..145810b0edf6 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -906,9 +906,6 @@ void __init setup_arch(char **cmdline_p) set_bit(EFI_BOOT, &efi.flags); set_bit(EFI_64BIT, &efi.flags); } - - if (efi_enabled(EFI_BOOT)) - efi_memblock_x86_reserve_range(); #endif x86_init.oem.arch_setup(); @@ -962,6 +959,8 @@ void __init setup_arch(char **cmdline_p) parse_early_param(); + if (efi_enabled(EFI_BOOT)) + efi_memblock_x86_reserve_range(); #ifdef CONFIG_MEMORY_HOTPLUG /* * Memory used by the kernel cannot be hot-removed because Linux