From patchwork Mon Jul 9 00:07:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 141354 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp2054630ljj; Sun, 8 Jul 2018 17:07:30 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeZXTcLWHwXxOdqXeaJ+XlDqhLqlBrdlGvDc8oJMWrYkTrASlO9IFeAW1zjzvQSlA+xvfCV X-Received: by 2002:a63:6e07:: with SMTP id j7-v6mr17271462pgc.251.1531094850485; Sun, 08 Jul 2018 17:07:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531094850; cv=none; d=google.com; s=arc-20160816; b=Jx+ul/VuE6OUp/iXXvaYloeBDDI2M8kOU8cKHJHMO+akZNQpuT5/CcaeKaTbZb+TlB wTDSa0yv9WdVIO2UruLCW2lkQ0r2J+ePPRzOLsXEuDnnZDd2AugU2lCJM+Q0jQATCMR/ XKFlgfCmdspj9mQlfI3R1mc+Mkw+HYQ7ibgIi8ZXWwQeU899UWokxN0Xl+lyNBG9oca3 YV8M7ZFOSyUuC2hFTriyQ8VhujSoVi8cw69kKgduo4vHiyvtwJtC0bAIZmlmzdYgonUx P5uSPhvbpIxGe1KOUJnnoPv2LXO6t3wdTO41R0j3M4fxvetO8++meLwvV2DVIg9ssCFN ue4A== 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=6svwEjRZKw/fRIHWE4svwtkCI66G0b2U5AUFtaL5oWI=; b=GagMYv61MsPwDP0eY93s2WJPYnYPkx0MNn2bsdDGpozzw8lKdkjREBWYfbYbH3qUMD 7Of46FeLTfH7xiz66sNfLCLWbojyNPZERRiJ7H7YuqCqRmxZ/cTn9hP0UkBsKjUCJUyv awHWMcGG1RtY2llNN9bkTrWJIgKE9sFBNG3QWziIFY5QwowXi94rPcdY+hJyhXBA64CA kWUv6NrODWCYy74O/TO0DNSaJGc/uBHU2ud7kpg+eM3lnhYjbdiIbtFV8sJw9umb2lPT NOPaXmqBK3ccG4iS99CBnfnS6wYSpKSlQwYwm26G28bBqDSeN+Mo9IP2hDGefBgL6kQK +1DQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=aVO9AxUa; 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=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si13339670plu.282.2018.07.08.17.07.30; Sun, 08 Jul 2018 17:07:30 -0700 (PDT) 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=@linaro.org header.s=google header.b=aVO9AxUa; 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=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933475AbeGIAH2 (ORCPT + 28 others); Sun, 8 Jul 2018 20:07:28 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:46242 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932942AbeGIAH1 (ORCPT ); Sun, 8 Jul 2018 20:07:27 -0400 Received: by mail-pf0-f193.google.com with SMTP id l123-v6so12307688pfl.13 for ; Sun, 08 Jul 2018 17:07:27 -0700 (PDT) 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=6svwEjRZKw/fRIHWE4svwtkCI66G0b2U5AUFtaL5oWI=; b=aVO9AxUa84C7u9yYJC2JIvknxGTWlFrP3nLGGLmn+vzBj9YBWrAOxTM3jsnL1Npp45 nNvzR39Yp4ZU9xrjRqBSrzxSNm2k4yNEGNYwuJI2rfY41LNeYPZmhUNQ1IQL9X6YSnIx Kkm+cULSU/ki+V+IMYVjDzPDNC7q/dTFxCowg= 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=6svwEjRZKw/fRIHWE4svwtkCI66G0b2U5AUFtaL5oWI=; b=TKvcE3FLdgUSI3/FuIRaM6YHoGk6r1HlUYUkOHf4YR4Z7dA7ABLIJmp7YWjMqIewev dZAcK/xab5SjMNjYDAulmJqBtihiGGicqYu7+nP5ClXHqXcPrhrWPn9qeVUdxi0VORrp wtOjJs6wkbkXtUuou0I4YTHm6ZWub/rLwslMjj4EGVKqFTvun1MOXMQDlQf81o5ocN2v toH0ZCLTeNkt4d48mfQ1n0IL1y5fkSA6jIdhWDvh1xKyp8jvoqjChjvks1llXiGRQc0H 46WbT++TlJGtJTtslvtzsH9np9qN8AUx8ewNn0rvOv+kCdzzFRLbyDKVaYUKSN9aBIXH dMFQ== X-Gm-Message-State: APt69E2fWowYWZ6QmeRCzBPkkgOyaTyW6/duDquK37m7wQ/kCGijaZlU HKk85+w76gXBjhIocq4cuyp6TN8IhV8= X-Received: by 2002:a62:e30c:: with SMTP id g12-v6mr19139845pfh.25.1531094846860; Sun, 08 Jul 2018 17:07:26 -0700 (PDT) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id j5-v6sm24598310pfc.56.2018.07.08.17.07.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 17:07:26 -0700 (PDT) From: AKASHI Takahiro To: catalin.marinas@arm.com, will.deacon@arm.com, ard.biesheuvel@linaro.org Cc: tbaicar@codeaurora.org, bhsharma@redhat.com, dyoung@redhat.com, james.morse@arm.com, mark.rutland@arm.com, al.stone@linaro.org, graeme.gregory@linaro.org, hanjun.guo@linaro.org, lorenzo.pieralisi@arm.com, sudeep.holla@arm.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kexec@lists.infradead.org, AKASHI Takahiro Subject: [PATCH v3 2/3] efi/arm: map UEFI memory map even w/o runtime services enabled Date: Mon, 9 Jul 2018 09:07:49 +0900 Message-Id: <20180709000750.22172-3-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180709000750.22172-1-takahiro.akashi@linaro.org> References: <20180709000750.22172-1-takahiro.akashi@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Under the current implementation, UEFI memory map will be mapped and made available in virtual mappings only if runtime services are enabled. But in a later patch, we want to use UEFI memory map in acpi_os_ioremap() to create mappings of ACPI tables using memory attributes described in UEFI memory map. See the following commit: arm64: acpi: fix alignment fault in accessing ACPI tables So, as a first step, arm_enter_runtime_services() is modified, alongside Ard's patch[1], so that UEFI memory map will not be freed even if efi=noruntime. [1] https://marc.info/?l=linux-efi&m=152930773507524&w=2 Signed-off-by: AKASHI Takahiro Reviewed-by: Ard Biesheuvel --- drivers/firmware/efi/arm-runtime.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.17.0 diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c index 59a8c0ec94d5..a00934d263c5 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c @@ -117,6 +117,13 @@ static int __init arm_enable_runtime_services(void) efi_memmap_unmap(); + mapsize = efi.memmap.desc_size * efi.memmap.nr_map; + + if (efi_memmap_init_late(efi.memmap.phys_map, mapsize)) { + pr_err("Failed to remap EFI memory map\n"); + return 0; + } + if (efi_runtime_disabled()) { pr_info("EFI runtime services will be disabled.\n"); return 0; @@ -129,13 +136,6 @@ static int __init arm_enable_runtime_services(void) pr_info("Remapping and enabling EFI services.\n"); - mapsize = efi.memmap.desc_size * efi.memmap.nr_map; - - if (efi_memmap_init_late(efi.memmap.phys_map, mapsize)) { - pr_err("Failed to remap EFI memory map\n"); - return -ENOMEM; - } - if (!efi_virtmap_init()) { pr_err("UEFI virtual mapping missing or invalid -- runtime services will not be available\n"); return -ENOMEM;