From patchwork Thu Nov 22 19:54:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 151824 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1152895ljp; Thu, 22 Nov 2018 11:56:08 -0800 (PST) X-Google-Smtp-Source: AFSGD/VLazioikw4R899KUqu9H53mT9lZ7mr1GmLzressZeCzt83+PM7A10NWbH/lUMUlWCGY2wp X-Received: by 2002:a17:902:bd46:: with SMTP id b6mr12450235plx.231.1542916568519; Thu, 22 Nov 2018 11:56:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542916568; cv=none; d=google.com; s=arc-20160816; b=TRBeyx4u+f3NU772fhq6UEvbA2rYlTUpsUHdPtXQiHEDuH0dz6aUE+T+AUWXnE3qmG IBwV6PbKMDbZHXQsOe+1wIsTIQPJCSCCoLpeVzPD7hTY6WBj/JM+58ryP9mk0FtUJM7J wLNkkx/7ouXbgy6UA9QdGqGuUgg+vOdfafVb8kRMNQHTC3RmVm/RI3d7QTKrf3kjB4bn esiY2HiSQ8HRoqVTjIVfWtumUOi3wNjerO/HM4V2H14puR/nAu+j1401HqbvLV4mCNfc A5sD/W3MAaXKpHeUpo/tu6/rWYVr3TqF9qSm6jIr2zfe0ziReUyjhoaInyz+j4AiiQT6 r36A== 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=X8Rdp5e1j5tuB+ftecpP1LFgCM/W/+bfgVdPoQUwA+Y=; b=wMYKL4ZIHTcokIGsa94aA3ziK3Qz9K4ZUqJWopHOFTVQPKMbfR0m8p6e0u9tEPhioL wuapTOV3ydswatAa9RFoobJEU8yo/CoWT4ju/G0HU0m8VRE17NAeksOsmw2qaYkrB3uI FrA9yOYU++1YXpImhd1di0QnsycaEBXx3qK4cl+//ebUXK3P8D5Q3iofGnnYW/FLgUXE Kr90FVGi4Oyz4Zlh8W86dtZk5I6eS397hwAL+cmxvwQejtA9/6NHa2vF/lZw97lwQcti anxST/My6Uh1Ws7fsgRbNbMnZULmCLZth4Ll0ZAHv1Jysm1vsuIE3ZjmlWuosse66CAA i06g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=rYH50YJq; 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 k5si14988440pfi.176.2018.11.22.11.56.08; Thu, 22 Nov 2018 11:56:08 -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=rYH50YJq; 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 S2407172AbeKWGg7 (ORCPT + 32 others); Fri, 23 Nov 2018 01:36:59 -0500 Received: from mail.kernel.org ([198.145.29.99]:35760 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729012AbeKWGg6 (ORCPT ); Fri, 23 Nov 2018 01:36:58 -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 4DB7520866; Thu, 22 Nov 2018 19:56:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542916565; bh=0RFHY4G6mQdlkY3gcTtFazRcTmFQaEqKAcEBYl7bA7o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rYH50YJqTVAzPKBqB0iMWS8XDc/osBbbnfZDATiKcfTfkDHDjgRpLJdtRhjI6yu78 z9eMgU9//SaN/0nrQ/7CFcsoDArkYGzUPY2eJotMqFwfzQDw0XxLlk4mR7O3Qc7VYR 18Y2Lu+DgeXMvvC2V39ujy9OJz9pxd3pQPJciKYI= 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.14 18/21] efi/arm: Revert deferred unmap of early memmap mapping Date: Thu, 22 Nov 2018 14:54:49 -0500 Message-Id: <20181122195452.13520-18-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181122195452.13520-1-sashal@kernel.org> References: <20181122195452.13520-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 a7c522eac640..312f9f32e168 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 8995a48bd067..ad1530aff633 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -122,7 +122,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;