From patchwork Fri Mar 17 19:06:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 95436 Delivered-To: patch@linaro.org Received: by 10.140.89.134 with SMTP id v6csp440726qgd; Fri, 17 Mar 2017 12:07:31 -0700 (PDT) X-Received: by 10.98.42.151 with SMTP id q145mr18216975pfq.175.1489777651189; Fri, 17 Mar 2017 12:07:31 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g9si5275314pln.12.2017.03.17.12.07.31; Fri, 17 Mar 2017 12:07:31 -0700 (PDT) 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; 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 S1751047AbdCQTH2 (ORCPT + 2 others); Fri, 17 Mar 2017 15:07:28 -0400 Received: from mail-wr0-f181.google.com ([209.85.128.181]:35912 "EHLO mail-wr0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751150AbdCQTH0 (ORCPT ); Fri, 17 Mar 2017 15:07:26 -0400 Received: by mail-wr0-f181.google.com with SMTP id u108so57838287wrb.3 for ; Fri, 17 Mar 2017 12:07:25 -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=7bY+yT47U4yHYCNPJOrzeoYksgoYxqXSGwepKurJrng=; b=h4xTPizhGOKwLdRJ0/10yH5Hmapbg6l4ksxdzyBxJXTIJGfo1hh6BLiXd9Vqry/Mm4 xzBjbsiLshqoxP/K9vGCYDqA3HeLCxWmWZnNS8p4jerXokBWLq7LWDIIrMzMER3J74gd ST1nJhhyA0IwmDAeLS3UHa1JeCDD8TTt/M9lA= 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=7bY+yT47U4yHYCNPJOrzeoYksgoYxqXSGwepKurJrng=; b=hD3o3WJZaa9UOTANvrkRer/01JwDqsGQf3ESZfDIVGOaO2cktroSufjPfz8MhFWfMU Uj7ARv4r5TzSfuUuS2BZG87Ft7ku6iAk1YfoJXB3Uhm5tHQcJhWeYhSJ8S0YQzQfZ74b yhq4SIh0R30zHLN/oNnbV5pJrGeND/1NtjJjtJ46Uh2ELxyohf7InXQZVfQYfIpnwTle vr18dkRomGSoSJQHpNMy04e0VuUHljQI3ILDAW96zU7manCbyJcYx+WgFUA3LtSouo/k lW0aOHICxEyzyPDTDgVWMxrZv2wwUjPvrl2cXtQdDL8OCcY+RG80KIn/kEWf+Z1FF+Ok vkog== X-Gm-Message-State: AFeK/H3e4SxFMKU3ytNWkwja07B9GcMowrndu4Esydi6BEjEzzB+kdyxDCFtas7za5K/03hn X-Received: by 10.223.173.53 with SMTP id p50mr15554554wrc.112.1489777644275; Fri, 17 Mar 2017 12:07:24 -0700 (PDT) Received: from localhost.localdomain ([105.144.205.163]) by smtp.gmail.com with ESMTPSA id c8sm10963677wrd.34.2017.03.17.12.07.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 17 Mar 2017 12:07:23 -0700 (PDT) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Daniel Drake , Ard Biesheuvel , linux-kernel@vger.kernel.org, Matt Fleming Subject: [PATCH] efi/esrt: Cleanup bad memory map log messages Date: Fri, 17 Mar 2017 19:06:45 +0000 Message-Id: <1489777605-8363-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489777605-8363-1-git-send-email-ard.biesheuvel@linaro.org> References: <1489777605-8363-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org From: Daniel Drake The Intel Compute Stick STCK1A8LFC and Weibu F3C platforms both log 2 error messages during boot: efi: requested map not found. esrt: ESRT header is not in the memory map. Searching the web, this seems to affect many other platforms too. Since these messages are logged as errors, they appear on-screen during the boot process even when using the "quiet" boot parameter used by distros. Demote the ESRT error to a warning so that it does not appear on-screen, and delete the error logging from efi_mem_desc_lookup; both callsites of that function log more specific messages upon failure. Out of curiosity I looked closer at the Weibu F3C. There is no entry in the UEFI-provided memory map which corresponds to the ESRT pointer, but hacking the code to map it anyway, the ESRT does appear to be valid with 2 entries. Signed-off-by: Daniel Drake Cc: Matt Fleming Acked-by: Peter Jones Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/efi.c | 1 - drivers/firmware/efi/esrt.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) -- 2.7.4 -- 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/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index e7d404059b73..b372aad3b449 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -389,7 +389,6 @@ int __init efi_mem_desc_lookup(u64 phys_addr, efi_memory_desc_t *out_md) return 0; } } - pr_err_once("requested map not found.\n"); return -ENOENT; } diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c index 08b026864d4e..8554d7aec31c 100644 --- a/drivers/firmware/efi/esrt.c +++ b/drivers/firmware/efi/esrt.c @@ -254,7 +254,7 @@ void __init efi_esrt_init(void) rc = efi_mem_desc_lookup(efi.esrt, &md); if (rc < 0) { - pr_err("ESRT header is not in the memory map.\n"); + pr_warn("ESRT header is not in the memory map.\n"); return; }