From patchwork Thu Nov 22 19:52:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151821 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1151686ljp; Thu, 22 Nov 2018 11:54:37 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xy6PU1JRbfDv2PuLyaFDb67FUukfdE610D0Z6/VzvCSFyTXD4HcSUKQHygXf5jmIB//rd9 X-Received: by 2002:a63:e915:: with SMTP id i21mr10993612pgh.409.1542916476894; Thu, 22 Nov 2018 11:54:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542916476; cv=none; d=google.com; s=arc-20160816; b=PTD5ZvkS/DA/9oJjTBxFkW4PtZIZCj9yZwwUI2FQcLc/fWBh5r3Nl3uGPXjLcHuHWG OjgOx427Spcg+eKUFSpVrlWGIHbUlOdClmnw8jkX+JUsXHgodWN+AcTKHUxz7f26i44R TMQ+Gyk4hI//5eqhU0CMj3lUjmiHVlk1PhrQ9NcJHZ5wYBZe7ZYMWe3yr7VCI82StenT Le96URwzI7fR3SJwJTTRsCdLdUjzJNnRamhrEY4jb8V1X1/Rk/xA051XBFLJO7M7Btxb RazJccgDo60Hy3RAtpo5y5lLtDVouskj4F9c6FpMCTKxE47+vOQPluMSyt05oq7vSVHH jkgQ== 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; bh=I7otAawzX1QjFeU1e+fle/7F7XyviOlhXV8cg5DPbFE=; b=gQM1R/21BHP8rT24j1WiS7pn2+7E3X765ABjtNCcXt+THA88ai5iSkhC/SwzP/XHz9 Ya7gdNkU9hmjTVvz6kNoxbjem45mMpEaYFbypBFkutVxioJ4opvgzrx4u1uZhSMmy4jQ JtY2et/BsquEzzNr8YUtcE9pXPVFkG9UlBDGSh6OGklgWH0sI98rTh5pol2kFGTnC8JF 873tcAKr3mlWpWVlX60epoCEAsIRTOCZBKKcADl2jDvlL0spYkz963WHyGusHyaDT86s 3Fdr93l3JCwcw5lSiZUAEb/tZj5Naa93NCjR8nhTOihv6zEyTQaU/YYz+pup447PPD1I WhQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V6CXUC57; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e66si11760517plb.339.2018.11.22.11.54.36; Thu, 22 Nov 2018 11:54:36 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=V6CXUC57; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406950AbeKWGf0 (ORCPT + 32 others); Fri, 23 Nov 2018 01:35:26 -0500 Received: from mail.kernel.org ([198.145.29.99]:34212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389657AbeKWGf0 (ORCPT ); Fri, 23 Nov 2018 01:35:26 -0500 Received: from sasha-vm.mshome.net (unknown [37.142.5.207]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A63CF20865; Thu, 22 Nov 2018 19:54:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542916474; bh=HxEw090Tv3EJYsgycmQAilmkl3nHEFIXWc/EDchQ6G4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V6CXUC57jA2mtH5khNWBFWjBt5QREpvPwGXY5rTa66NyIphYYuZ0lOdrZlF7gFxvv zMdXqKLFozPRmoMvMl/wJoCsTZw5Ps470TNf521BoJL/OyV04UYIoi/V/r3kINlGY6 fZu6bMA7ec0aYKsFfjfZ2mhH/wFw/n/kKI1qPBJo= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ard Biesheuvel , Linus Torvalds , Peter Zijlstra , Thomas Gleixner , linux-efi@vger.kernel.org, Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.19 32/36] efi/arm: Revert deferred unmap of early memmap mapping Date: Thu, 22 Nov 2018 14:52:36 -0500 Message-Id: <20181122195240.13123-32-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122195240.13123-1-sashal@kernel.org> References: <20181122195240.13123-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel [ Upstream commit 33412b8673135b18ea42beb7f5117ed0091798b6 ] Commit: 3ea86495aef2 ("efi/arm: preserve early mapping of UEFI memory map longer for BGRT") deferred the unmap of the early mapping of the UEFI memory map to accommodate the ACPI BGRT code, which looks up the memory type that backs the BGRT table to validate it against the requirements of the UEFI spec. Unfortunately, this causes problems on ARM, which does not permit early mappings to persist after paging_init() is called, resulting in a WARN() splat. Since we don't support the BGRT table on ARM anway, let's revert ARM to the old behaviour, which is to take down the early mapping at the end of efi_init(). Signed-off-by: Ard Biesheuvel Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-efi@vger.kernel.org Fixes: 3ea86495aef2 ("efi/arm: preserve early mapping of UEFI memory ...") Link: http://lkml.kernel.org/r/20181114175544.12860-3-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- drivers/firmware/efi/arm-init.c | 4 ++++ drivers/firmware/efi/arm-runtime.c | 2 +- drivers/firmware/efi/memmap.c | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index 388a929baf95..1a6a77df8a5e 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -265,6 +265,10 @@ void __init efi_init(void) (params.mmap & ~PAGE_MASK))); init_screen_info(); + + /* ARM does not permit early mappings to persist across paging_init() */ + if (IS_ENABLED(CONFIG_ARM)) + efi_memmap_unmap(); } static int __init register_gop_device(void) diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 922cfb813109..a00934d263c5 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -110,7 +110,7 @@ static int __init arm_enable_runtime_services(void) { u64 mapsize; - if (!efi_enabled(EFI_BOOT) || !efi_enabled(EFI_MEMMAP)) { + if (!efi_enabled(EFI_BOOT)) { pr_info("EFI services will not be available.\n"); return 0; } diff --git a/drivers/firmware/efi/memmap.c b/drivers/firmware/efi/memmap.c index 5fc70520e04c..1907db2b38d8 100644 --- a/drivers/firmware/efi/memmap.c +++ b/drivers/firmware/efi/memmap.c @@ -118,6 +118,9 @@ int __init efi_memmap_init_early(struct efi_memory_map_data *data) void __init efi_memmap_unmap(void) { + if (!efi_enabled(EFI_MEMMAP)) + return; + if (!efi.memmap.late) { unsigned long size;