From patchwork Thu Nov 22 19:56:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151826 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1153784ljp; Thu, 22 Nov 2018 11:57:16 -0800 (PST) X-Google-Smtp-Source: AJdET5eTNinLEUkGQjW2czPzm3vn35nAmon2Z45dTdPHrqs8O+mnimofpDQcTg0A3Nl5gikSiIwO X-Received: by 2002:a62:fc52:: with SMTP id e79mr12913766pfh.8.1542916636627; Thu, 22 Nov 2018 11:57:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542916636; cv=none; d=google.com; s=arc-20160816; b=BNSmV0NgKpsJ7AF3v0j7Bbo33zD+FN5YNY3eK22aC7C8j8Bb+/z3Vh1oEyVt6c6JGw EgfE6ITDYzWHFg9dCgCfTqJkWyz6x75k7mWpSyViISKl9/ADn4PImbFYacB3WeabNM6U WURTPk8pQcstRus+bD8z1PBeP45qKO1XGlpSQ8++fXg/rf/b8Rl6DNBqkFnvwgGHrJTn SYJB/bOqfegxmI8PUUz5VC4KpkUwMMCO2NwN9dRYdLpVM5WGVPzZr5JrN7xQD86oCQMn 72D6bojk+wOJL4is5PIQg5CQgxcjGoAs06LgOFGxoUYJnop7ZfdxFkTK+x8AFmwCDytQ RtKQ== 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=BZzRQpRtt/5UW5cqm0oYhEX7WgibYFXCumBmvJGnrKY=; b=0XLkFOtDqufmnIeqHVLH80bfGpoXBlvnajdsPn0akjKI86NdwhaD4H5zBdW8J8Yu3V u7dDsAyQVbqdpC4imGITlIYD+8xHp6f7JGFthYl4MqJrfq2sSEYSB1PsxQNBA1tcUfjc 37/2AYVb+nFM7nzoAq3phJsxVJEb/1tjg9OPxRnpK+eRpWijFp23cyasaKitiMytslMR 75tbD30i1DKDkg5r7TcQdVdLcj5cU5a5sBTWH7eaiQK7G1OrN/GpXfQHbxe33JXTT2iw UJxo/5Ko/yIFbtbdQsvtcSWyubv/wBrUYFVjWpC6pLb3QJqNcJZydV7ABj5v6617Xpmo /msA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="tEXE/aBT"; 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 a18si50526782pgj.77.2018.11.22.11.57.14; Thu, 22 Nov 2018 11:57:16 -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="tEXE/aBT"; 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 S2407260AbeKWGiF (ORCPT + 32 others); Fri, 23 Nov 2018 01:38:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:36620 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726692AbeKWGiE (ORCPT ); Fri, 23 Nov 2018 01:38:04 -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 BB72D2087E; Thu, 22 Nov 2018 19:57:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542916631; bh=3xvdYav5oGXysngb01YZn4iNK2XINh11ZzNZWNUTt6s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tEXE/aBTTbSKOQwbS909MwUpr9hLxai/l3gUNClYwxmWkjpW5Mn6tRl9WncYN4VjF PXI81d0NNkliZALs17MCz9q0FJJD+e4mGajVMbTiMD3DVG5cUcwsnN0BDQMlYHwmCD FTv2FCA0nljGD24htSWJbOx/ew9M1qEFCaarHp50= 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.9 14/15] efi/arm: Revert deferred unmap of early memmap mapping Date: Thu, 22 Nov 2018 14:56:20 -0500 Message-Id: <20181122195621.13776-14-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122195621.13776-1-sashal@kernel.org> References: <20181122195621.13776-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 1d1c9693ebfb..8ee91777abce 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -256,6 +256,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 4d788e0debfe..069c5a4479e6 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -118,7 +118,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 78686443cb37..3fd2b450c649 100644 --- a/drivers/firmware/efi/memmap.c +++ b/drivers/firmware/efi/memmap.c @@ -117,6 +117,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;