From patchwork Tue Apr  4 16:02:35 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ard Biesheuvel <ard.biesheuvel@linaro.org>
X-Patchwork-Id: 96738
Delivered-To: patch@linaro.org
Received: by 10.140.89.233 with SMTP id v96csp263112qgd;
 Tue, 4 Apr 2017 09:03:18 -0700 (PDT)
X-Received: by 10.99.171.5 with SMTP id p5mr25190505pgf.208.1491321798342;
 Tue, 04 Apr 2017 09:03:18 -0700 (PDT)
Return-Path: <linux-efi-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
 by mx.google.com with ESMTP id
 q22si2210702pfk.385.2017.04.04.09.03.18; 
 Tue, 04 Apr 2017 09:03:18 -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 S1754232AbdDDQDL (ORCPT <rfc822;patch@linaro.org> + 2 others);
 Tue, 4 Apr 2017 12:03:11 -0400
Received: from mail-wr0-f176.google.com ([209.85.128.176]:33122 "EHLO
 mail-wr0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 with ESMTP id S1754552AbdDDQDK (ORCPT
 <rfc822;linux-efi@vger.kernel.org>); Tue, 4 Apr 2017 12:03:10 -0400
Received: by mail-wr0-f176.google.com with SMTP id w43so217977601wrb.0
 for <linux-efi@vger.kernel.org>; Tue, 04 Apr 2017 09:03:09 -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=LjaFjajdwrSxiInqInTs/DvpKX2ruEZ9watTTMDq+5Y=;
 b=ZWN8CHhooVt1i1SbQjuso7z9ky+oMyDGPkeZqrX2Af1mfS310VrCUwFqHxZOJ7SL7j
 tI1ZAr/TDOn6rC3UBH7kUAS+MdPUcIfqI1SfNaZswTW7C4yHstSra0G9K4OvlWfMlqAo
 g2u7rp4pbdFaL0pmQF+NQkR1vL3PyYPJKfiJA=
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=LjaFjajdwrSxiInqInTs/DvpKX2ruEZ9watTTMDq+5Y=;
 b=a3SmClepfTH+tk6nyRCAUKesk8uksDI4vg+waJDaTVtBz5OMCB6NK3D9ymdQEZ1oFN
 COls8eN1WryaX/sHn96APnkcOrEu0J4oUhPKHFhTKT6Pf0nAEdbiEt8L+hZHMtporwru
 WvF7mM1Vvkx0+o7RZot2iV9MW+pWWt8z0d0DHZjy9vi8Nf60VTu8o9OsGb0a6evWhNJi
 ql3B0A1vkcue4thcA9Rag/OGJWRRyUrFaJnP28QoKaGnbUqXh0j8Dd1nmMyaT7I2xsQO
 jL0X137oODpV8lEDVRQDI+aTjI2zlLAwtuBR9RhI4ya8fy3y3DwCmTzSFORYqUCjlbm5
 D/qw==
X-Gm-Message-State: AFeK/H16z0eC47WDPPzifLtVUwVPwM0QOLje0nAvQc6x2fa9CfkNrcShJl5ucXGmzrznujMl
X-Received: by 10.223.162.198 with SMTP id t6mr22372182wra.155.1491321788862; 
 Tue, 04 Apr 2017 09:03:08 -0700 (PDT)
Received: from localhost.localdomain ([160.163.145.113])
 by smtp.gmail.com with ESMTPSA id
 z88sm19686465wrb.1.2017.04.04.09.03.06
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Tue, 04 Apr 2017 09:03:08 -0700 (PDT)
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-efi@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
 Thomas Gleixner <tglx@linutronix.de>, "H . Peter Anvin" <hpa@zytor.com>
Cc: "Cohen, Eugene" <eugene@hp.com>,
 Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] efi/libstub: Skip GOP with PIXEL_BLT_ONLY format
Date: Tue,  4 Apr 2017 17:02:35 +0100
Message-Id: <20170404160245.27812-2-ard.biesheuvel@linaro.org>
X-Mailer: git-send-email 2.9.3
In-Reply-To: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
References: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
Sender: linux-efi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-efi.vger.kernel.org>
X-Mailing-List: linux-efi@vger.kernel.org

From: "Cohen, Eugene" <eugene@hp.com>

The UEFI Specification permits Graphics Output Protocol (GOP) instances
without direct framebuffer access. This is indicated in the Mode structure
with a PixelFormat enumeration value of PIXEL_BLT_ONLY. Given that the
kernel does not know how to drive a Blt() only framebuffer (which is only
permitted before ExitBootServices() anyway), we should disregard such
framebuffers when looking for a GOP instance that is suitable for use as
the boot console.

So modify the EFI GOP initialization to not use a PIXEL_BLT_ONLY instance,
preventing attempts later in boot to use an invalid screen_info.lfb_base
address.

Fixes: 9822504c1fa5 ("efifb: Enable the efi-framebuffer platform driver ...")
Signed-off-by: Eugene Cohen <eugene@hp.com>
[ardb: - move Blt() only check into the loop
       - clarify that Blt() only GOPs are unusable by the kernel]
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: <stable@vger.kernel.org> # v4.7+
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/efi/libstub/gop.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

-- 
2.9.3

--
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/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c
index 932742e4cf23..24c461dea7af 100644
--- a/drivers/firmware/efi/libstub/gop.c
+++ b/drivers/firmware/efi/libstub/gop.c
@@ -149,7 +149,8 @@ setup_gop32(efi_system_table_t *sys_table_arg, struct screen_info *si,
 
 		status = __gop_query32(sys_table_arg, gop32, &info, &size,
 				       &current_fb_base);
-		if (status == EFI_SUCCESS && (!first_gop || conout_found)) {
+		if (status == EFI_SUCCESS && (!first_gop || conout_found) &&
+		    info->pixel_format != PIXEL_BLT_ONLY) {
 			/*
 			 * Systems that use the UEFI Console Splitter may
 			 * provide multiple GOP devices, not all of which are
@@ -266,7 +267,8 @@ setup_gop64(efi_system_table_t *sys_table_arg, struct screen_info *si,
 
 		status = __gop_query64(sys_table_arg, gop64, &info, &size,
 				       &current_fb_base);
-		if (status == EFI_SUCCESS && (!first_gop || conout_found)) {
+		if (status == EFI_SUCCESS && (!first_gop || conout_found) &&
+		    info->pixel_format != PIXEL_BLT_ONLY) {
 			/*
 			 * Systems that use the UEFI Console Splitter may
 			 * provide multiple GOP devices, not all of which are

From patchwork Tue Apr  4 16:02:38 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ard Biesheuvel <ard.biesheuvel@linaro.org>
X-Patchwork-Id: 96740
Delivered-To: patch@linaro.org
Received: by 10.140.89.233 with SMTP id v96csp263272qgd;
 Tue, 4 Apr 2017 09:03:34 -0700 (PDT)
X-Received: by 10.98.155.28 with SMTP id r28mr24016468pfd.212.1491321814919; 
 Tue, 04 Apr 2017 09:03:34 -0700 (PDT)
Return-Path: <linux-efi-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
 by mx.google.com with ESMTP id c1si7404096pge.59.2017.04.04.09.03.34; 
 Tue, 04 Apr 2017 09:03:34 -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 S1754906AbdDDQDU (ORCPT <rfc822;patch@linaro.org> + 2 others);
 Tue, 4 Apr 2017 12:03:20 -0400
Received: from mail-wr0-f169.google.com ([209.85.128.169]:33946 "EHLO
 mail-wr0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 with ESMTP id S1754872AbdDDQDS (ORCPT
 <rfc822;linux-efi@vger.kernel.org>); Tue, 4 Apr 2017 12:03:18 -0400
Received: by mail-wr0-f169.google.com with SMTP id t20so14490955wra.1
 for <linux-efi@vger.kernel.org>; Tue, 04 Apr 2017 09:03:17 -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=e6M+xugzcovcCd7APfm4cWPF+lU826rBLm5qBqVxvYs=;
 b=awIRBt8tkm9yYvSXCBDR0RY7UD76RC79k35gd0+wibkQm25QsZYQJrTCMFZGkQxrzQ
 0pFyGtFxdEB0i4lCaMZ5OZBa75HoQh0fNnLqYL+vYd+UfDuBJ/1HSqzQ0XVetQPWLXvS
 nFkxDqd/SOamIUPWA1hAYp2WV1eTVhyECggBs=
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=e6M+xugzcovcCd7APfm4cWPF+lU826rBLm5qBqVxvYs=;
 b=PRQqGYPfDh6yUecfMVl5QukLgq0ATbMgCBa/Yh32AtOPrTUlgeZSbI5ft72WxYcMxh
 cybC0WTqZs5L3lu4xStauz83Gcdy/uNjJwpXMA6X1ID2y78Rx+A5VlxVkQNy3LxiwcPL
 Crq+1KVaQt9mlY5ifF0KZXMCx8azSRXU7DtrgjRUGVBkAT2Tx6qBWHwJFvxHPY+VwgDY
 x6an12dQHnO6D8bKoAYN/ZNHvO1Rm+zuR0xAnJ7K5c0X1Ts/gYxt5yWkAyoUiHJHiZyM
 ot4O5WYj9FSUfNfsNNhEgIuvrYW3sE+eoLrEOpm9mj49Xee2hojZEgLTOIirt8PIvyMY
 CdPQ==
X-Gm-Message-State: AFeK/H3MnXDbxlkTRPfMN+FJposU6UNN55ENRwBe+vQQczT4xhlw5HaTfNksnX0tASsVTex9
X-Received: by 10.223.165.8 with SMTP id i8mr19926560wrb.66.1491321796651;
 Tue, 04 Apr 2017 09:03:16 -0700 (PDT)
Received: from localhost.localdomain ([160.163.145.113])
 by smtp.gmail.com with ESMTPSA id
 z88sm19686465wrb.1.2017.04.04.09.03.14
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Tue, 04 Apr 2017 09:03:15 -0700 (PDT)
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-efi@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
 Thomas Gleixner <tglx@linutronix.de>, "H . Peter Anvin" <hpa@zytor.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 2/2] efifb: Avoid reconfiguration of BAR that covers the
 framebuffer
Date: Tue,  4 Apr 2017 17:02:38 +0100
Message-Id: <20170404160245.27812-5-ard.biesheuvel@linaro.org>
X-Mailer: git-send-email 2.9.3
In-Reply-To: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
References: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
Sender: linux-efi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-efi.vger.kernel.org>
X-Mailing-List: linux-efi@vger.kernel.org

On UEFI systems, the PCI subsystem is enumerated by the firmware,
and if a graphical framebuffer is exposed by a PCI device, its base
address and size are exposed to the OS via the Graphics Output
Protocol (GOP).

On arm64 PCI systems, the entire PCI hierarchy is reconfigured from
scratch at boot. This may result in the GOP framebuffer address to
become stale, if the BAR covering the framebuffer is modified. This
will cause the framebuffer to become unresponsive, and may in some
cases result in unpredictable behavior if the range is reassigned to
another device.

So add a non-x86 quirk to the EFI fb driver to find the BAR associated
with the GOP base address, and claim the BAR resource so that the PCI
core will not move it.

Fixes: 9822504c1fa5 ("efifb: Enable the efi-framebuffer platform driver ...")
Cc: <stable@vger.kernel.org> # v4.7+
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Jones <pjones@redhat.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/video/fbdev/efifb.c | 66 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

-- 
2.9.3

--
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/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c
index 8c4dc1e1f94f..758960b6aec9 100644
--- a/drivers/video/fbdev/efifb.c
+++ b/drivers/video/fbdev/efifb.c
@@ -10,6 +10,7 @@
 #include <linux/efi.h>
 #include <linux/errno.h>
 #include <linux/fb.h>
+#include <linux/pci.h>
 #include <linux/platform_device.h>
 #include <linux/screen_info.h>
 #include <video/vga.h>
@@ -143,6 +144,8 @@ static struct attribute *efifb_attrs[] = {
 };
 ATTRIBUTE_GROUPS(efifb);
 
+static bool pci_dev_disabled;	/* FB base matches BAR of a disabled device */
+
 static int efifb_probe(struct platform_device *dev)
 {
 	struct fb_info *info;
@@ -152,7 +155,7 @@ static int efifb_probe(struct platform_device *dev)
 	unsigned int size_total;
 	char *option = NULL;
 
-	if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
+	if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI || pci_dev_disabled)
 		return -ENODEV;
 
 	if (fb_get_options("efifb", &option))
@@ -360,3 +363,64 @@ static struct platform_driver efifb_driver = {
 };
 
 builtin_platform_driver(efifb_driver);
+
+#ifndef CONFIG_X86
+
+static bool pci_bar_found;	/* did we find a BAR matching the efifb base? */
+
+static void claim_efifb_bar(struct pci_dev *dev, int idx)
+{
+	u16 word;
+
+	pci_bar_found = true;
+
+	pci_read_config_word(dev, PCI_COMMAND, &word);
+	if (!(word & PCI_COMMAND_MEMORY)) {
+		pci_dev_disabled = true;
+		dev_err(&dev->dev,
+			"BAR %d: assigned to efifb but device is disabled!\n",
+			idx);
+		return;
+	}
+
+	if (pci_claim_resource(dev, idx)) {
+		pci_dev_disabled = true;
+		dev_err(&dev->dev,
+			"BAR %d: failed to claim resource for efifb!\n", idx);
+		return;
+	}
+
+	dev_info(&dev->dev, "BAR %d: assigned to efifb\n", idx);
+}
+
+static void efifb_fixup_resources(struct pci_dev *dev)
+{
+	u64 base = screen_info.lfb_base;
+	u64 size = screen_info.lfb_size;
+	int i;
+
+	if (pci_bar_found || screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
+		return;
+
+	if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
+		base |= (u64)screen_info.ext_lfb_base << 32;
+
+	if (!base)
+		return;
+
+	for (i = 0; i < PCI_STD_RESOURCE_END; i++) {
+		struct resource *res = &dev->resource[i];
+
+		if (!(res->flags & IORESOURCE_MEM))
+			continue;
+
+		if (res->start <= base && res->end >= base + size - 1) {
+			claim_efifb_bar(dev, i);
+			break;
+		}
+	}
+}
+DECLARE_PCI_FIXUP_CLASS_HEADER(PCI_ANY_ID, PCI_ANY_ID, PCI_BASE_CLASS_DISPLAY,
+			       16, efifb_fixup_resources);
+
+#endif

From patchwork Tue Apr  4 16:02:40 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ard Biesheuvel <ard.biesheuvel@linaro.org>
X-Patchwork-Id: 96747
Delivered-To: patch@linaro.org
Received: by 10.140.89.233 with SMTP id v96csp264092qgd;
 Tue, 4 Apr 2017 09:05:08 -0700 (PDT)
X-Received: by 10.98.139.134 with SMTP id e6mr23734211pfl.257.1491321908571; 
 Tue, 04 Apr 2017 09:05:08 -0700 (PDT)
Return-Path: <linux-efi-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
 by mx.google.com with ESMTP id 17si5954615pfn.224.2017.04.04.09.05.08;
 Tue, 04 Apr 2017 09:05:08 -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 S932223AbdDDQEx (ORCPT <rfc822;patch@linaro.org> + 2 others);
 Tue, 4 Apr 2017 12:04:53 -0400
Received: from mail-wr0-f175.google.com ([209.85.128.175]:33208 "EHLO
 mail-wr0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 with ESMTP id S932098AbdDDQD0 (ORCPT
 <rfc822;linux-efi@vger.kernel.org>); Tue, 4 Apr 2017 12:03:26 -0400
Received: by mail-wr0-f175.google.com with SMTP id w43so217981597wrb.0
 for <linux-efi@vger.kernel.org>; Tue, 04 Apr 2017 09:03:26 -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=JMMbiQy4zf91ikBibISS1Qw0/+rh81hJ11dHSlrD8ak=;
 b=bFh+b8gwMEcNhX43KClK4dvBf4vMisIzN1P1BcVX/cbF6konfko08zODaXJ7N0HJ8F
 ltcp4tJRm8BggQM1qXMajOk3t4mFthF9osXYHjXY+BGZzAdS+80j3mlAQUxful1iBOUy
 Afrqw8XNbN2dUwuWQqwV3Q4K+ztJd5QjzjC54=
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=JMMbiQy4zf91ikBibISS1Qw0/+rh81hJ11dHSlrD8ak=;
 b=DhWrqZfzbfIQOnc5Fq0p2xmF9do2eEXfaVVY30COXz/WQyIWMNb375Ubce59o5esep
 PaK5skaM5w5Lkq/Ea8VgyQrhhIcFMLRXEcQAL3+2jg/yKmU3cgbxlrTXGFeAJoKHmU0e
 Il4I+LmT/604f0KFrOkoX6RgnF7/PrN9ZdnQ+rMmMF47J5q3316+CqNP5x5BNMrWVzN3
 leajNYOrdErHFSgGA6/XW3bHtVXXy80pa2bkKqEAax53jkGk0S9KzbiHQJe0P/drgGrh
 2RLiHxWNywKto4TjgqR1JQNItJOtc9u6ALuFURR5QO8MCnjpf19Sg9lrHEB9kMsZo4vP
 0zGw==
X-Gm-Message-State: AFeK/H2g4D+oRSylaalpw2Bd7QvMFpWoQfhUwoX1+dh3Lg0MLJCNjrglhmH98BjcgrZqnkzK
X-Received: by 10.223.176.133 with SMTP id i5mr22671848wra.97.1491321800476; 
 Tue, 04 Apr 2017 09:03:20 -0700 (PDT)
Received: from localhost.localdomain ([160.163.145.113])
 by smtp.gmail.com with ESMTPSA id
 z88sm19686465wrb.1.2017.04.04.09.03.18
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Tue, 04 Apr 2017 09:03:19 -0700 (PDT)
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-efi@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
 Thomas Gleixner <tglx@linutronix.de>, "H . Peter Anvin" <hpa@zytor.com>
Cc: Bhupesh Sharma <bhsharma@redhat.com>,
 Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 04/12] x86/efi-bgrt: Move efi-bgrt handling out of arch/x86
Date: Tue,  4 Apr 2017 17:02:40 +0100
Message-Id: <20170404160245.27812-7-ard.biesheuvel@linaro.org>
X-Mailer: git-send-email 2.9.3
In-Reply-To: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
References: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
Sender: linux-efi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-efi.vger.kernel.org>
X-Mailing-List: linux-efi@vger.kernel.org

From: Bhupesh Sharma <bhsharma@redhat.com>

Now with open-source boot firmware (EDK2) supporting ACPI BGRT table
addition even for architectures like AARCH64, it makes sense to move
out the 'efi-bgrt.c' file and supporting infrastructure from 'arch/x86'
directory and house it inside 'drivers/firmware/efi', so that this common
code can be used across architectures.

Cc: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Bhupesh Sharma <bhsharma@redhat.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 arch/x86/platform/efi/Makefile                         | 1 -
 drivers/firmware/efi/Makefile                          | 1 +
 {arch/x86/platform => drivers/firmware}/efi/efi-bgrt.c | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {arch/x86/platform => drivers/firmware}/efi/efi-bgrt.c (100%)

-- 
2.9.3

--
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/arch/x86/platform/efi/Makefile b/arch/x86/platform/efi/Makefile
index 066619b0700c..f1d83b34c329 100644
--- a/arch/x86/platform/efi/Makefile
+++ b/arch/x86/platform/efi/Makefile
@@ -1,6 +1,5 @@
 OBJECT_FILES_NON_STANDARD_efi_thunk_$(BITS).o := y
 
 obj-$(CONFIG_EFI) 		+= quirks.o efi.o efi_$(BITS).o efi_stub_$(BITS).o
-obj-$(CONFIG_ACPI_BGRT) += efi-bgrt.o
 obj-$(CONFIG_EARLY_PRINTK_EFI)	+= early_printk.o
 obj-$(CONFIG_EFI_MIXED)		+= efi_thunk_$(BITS).o
diff --git a/drivers/firmware/efi/Makefile b/drivers/firmware/efi/Makefile
index ad67342313ed..0329d319d89a 100644
--- a/drivers/firmware/efi/Makefile
+++ b/drivers/firmware/efi/Makefile
@@ -9,6 +9,7 @@
 #
 KASAN_SANITIZE_runtime-wrappers.o	:= n
 
+obj-$(CONFIG_ACPI_BGRT) 		+= efi-bgrt.o
 obj-$(CONFIG_EFI)			+= efi.o vars.o reboot.o memattr.o
 obj-$(CONFIG_EFI)			+= capsule.o memmap.o
 obj-$(CONFIG_EFI_VARS)			+= efivars.o
diff --git a/arch/x86/platform/efi/efi-bgrt.c b/drivers/firmware/efi/efi-bgrt.c
similarity index 100%
rename from arch/x86/platform/efi/efi-bgrt.c
rename to drivers/firmware/efi/efi-bgrt.c

From patchwork Tue Apr  4 16:02:44 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ard Biesheuvel <ard.biesheuvel@linaro.org>
X-Patchwork-Id: 96745
Delivered-To: patch@linaro.org
Received: by 10.140.89.233 with SMTP id v96csp263471qgd;
 Tue, 4 Apr 2017 09:03:56 -0700 (PDT)
X-Received: by 10.84.164.106 with SMTP id m39mr30440495plg.9.1491321836676; 
 Tue, 04 Apr 2017 09:03:56 -0700 (PDT)
Return-Path: <linux-efi-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
 by mx.google.com with ESMTP id
 m185si17949495pfm.3.2017.04.04.09.03.56; 
 Tue, 04 Apr 2017 09:03:56 -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 S932189AbdDDQDp (ORCPT <rfc822;patch@linaro.org> + 2 others);
 Tue, 4 Apr 2017 12:03:45 -0400
Received: from mail-wr0-f177.google.com ([209.85.128.177]:33277 "EHLO
 mail-wr0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 with ESMTP id S932187AbdDDQDl (ORCPT
 <rfc822;linux-efi@vger.kernel.org>); Tue, 4 Apr 2017 12:03:41 -0400
Received: by mail-wr0-f177.google.com with SMTP id w43so217984892wrb.0
 for <linux-efi@vger.kernel.org>; Tue, 04 Apr 2017 09:03:40 -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=9c2gqcDknPXxCG3TDWR8g5zKbrAWzgmc0fhSolUZZwU=;
 b=VZ+/sVlSCIXY07LNfDdmvRre8u2HuGLNc37BZBfMBqHqviXbchYZ6QWIIaj4dzAiQm
 o/EZ7Fy2/AEBm6jkIoHwd/lzWGDDnP7BLuCc0IzZ+3h7SO24/kpzPRjlVgrcurtGIHLC
 W8nlmSNZ4AMBzA/GNs017f9zTpYaguhmVdECg=
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=9c2gqcDknPXxCG3TDWR8g5zKbrAWzgmc0fhSolUZZwU=;
 b=IkU2m7l7W1pQu979PoxpEdlXXmxObLFbnqxUorgiL6QIUtewi4rTli4DhTklO36C3j
 pOGj5G4iY5tPDm/Z78ox+Ud+fwT4pD1VQLM5TsVHuC5Ji8Gp64ZV2Kk1jlIUmV2SqhQH
 mFBLMnBxfv3eMafaUWqCGKFUs/Qf0j5aosK+GyVc3Qg8DpM85Mnv1gvCCCQ4b+Mo3oO7
 WkhNYVywBIe7lfmL81TtkKW7uA4uV4E9HqptJc5OAUIMz2x3KT25t0S+z0F0jSC55Xrh
 gigmmuunzZtekUAlxvSjKOi7sHxchYRoPrzDbL9RtvpzJYRqqF+TpzMcOdV0Lvfqfq+A
 MrvA==
X-Gm-Message-State: AFeK/H2NleOiBwcU6dOmYraPjzgilgs+T8XdhdpIK36yQLI1t3/Qgc1vZ08Tz/jWh+p2GXdN
X-Received: by 10.223.152.237 with SMTP id w100mr22067805wrb.72.1491321809559; 
 Tue, 04 Apr 2017 09:03:29 -0700 (PDT)
Received: from localhost.localdomain ([160.163.145.113])
 by smtp.gmail.com with ESMTPSA id
 z88sm19686465wrb.1.2017.04.04.09.03.27
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Tue, 04 Apr 2017 09:03:28 -0700 (PDT)
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-efi@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
 Thomas Gleixner <tglx@linutronix.de>, "H . Peter Anvin" <hpa@zytor.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 08/12] efi/arm32-stub: Allow boottime allocations in the
 vmlinux region
Date: Tue,  4 Apr 2017 17:02:44 +0100
Message-Id: <20170404160245.27812-11-ard.biesheuvel@linaro.org>
X-Mailer: git-send-email 2.9.3
In-Reply-To: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
References: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
Sender: linux-efi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-efi.vger.kernel.org>
X-Mailing-List: linux-efi@vger.kernel.org

The arm32 kernel decompresses itself to the base of DRAM unconditionally,
and so it is the EFI stub's job to ensure that the region is available.

Currently, we do this by creating an allocation there, and giving up if
that fails. However, any boot services regions occupying this area are
not an issue, given that the decompressor executes strictly after the
stub calls ExitBootServices().

So let's try a bit harder to proceed if the initial allocation fails,
and check whether any memory map entries occupying the region may be
considered safe.

Cc: Matt Fleming <matt@codeblueprint.co.uk>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Eugene Cohen <eugene@hp.com>
Reviewed-by: Roy Franz <roy.franz@cavium.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/efi/libstub/arm32-stub.c | 148 ++++++++++++++++++++++++++----
 1 file changed, 128 insertions(+), 20 deletions(-)

-- 
2.9.3

--
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/libstub/arm32-stub.c b/drivers/firmware/efi/libstub/arm32-stub.c
index e1f0b28e1dcb..18a8b5eb55e7 100644
--- a/drivers/firmware/efi/libstub/arm32-stub.c
+++ b/drivers/firmware/efi/libstub/arm32-stub.c
@@ -63,6 +63,132 @@ void free_screen_info(efi_system_table_t *sys_table_arg, struct screen_info *si)
 	efi_call_early(free_pool, si);
 }
 
+static efi_status_t reserve_kernel_base(efi_system_table_t *sys_table_arg,
+					unsigned long dram_base,
+					unsigned long *reserve_addr,
+					unsigned long *reserve_size)
+{
+	efi_physical_addr_t alloc_addr;
+	efi_memory_desc_t *memory_map;
+	unsigned long nr_pages, map_size, desc_size, buff_size;
+	efi_status_t status;
+	unsigned long l;
+
+	struct efi_boot_memmap map = {
+		.map		= &memory_map,
+		.map_size	= &map_size,
+		.desc_size	= &desc_size,
+		.desc_ver	= NULL,
+		.key_ptr	= NULL,
+		.buff_size	= &buff_size,
+	};
+
+	/*
+	 * Reserve memory for the uncompressed kernel image. This is
+	 * all that prevents any future allocations from conflicting
+	 * with the kernel. Since we can't tell from the compressed
+	 * image how much DRAM the kernel actually uses (due to BSS
+	 * size uncertainty) we allocate the maximum possible size.
+	 * Do this very early, as prints can cause memory allocations
+	 * that may conflict with this.
+	 */
+	alloc_addr = dram_base + MAX_UNCOMP_KERNEL_SIZE;
+	nr_pages = MAX_UNCOMP_KERNEL_SIZE / EFI_PAGE_SIZE;
+	status = efi_call_early(allocate_pages, EFI_ALLOCATE_MAX_ADDRESS,
+				EFI_BOOT_SERVICES_DATA, nr_pages, &alloc_addr);
+	if (status == EFI_SUCCESS) {
+		if (alloc_addr == dram_base) {
+			*reserve_addr = alloc_addr;
+			*reserve_size = MAX_UNCOMP_KERNEL_SIZE;
+			return EFI_SUCCESS;
+		}
+		/*
+		 * If we end up here, the allocation succeeded but starts below
+		 * dram_base. This can only occur if the real base of DRAM is
+		 * not a multiple of 128 MB, in which case dram_base will have
+		 * been rounded up. Since this implies that a part of the region
+		 * was already occupied, we need to fall through to the code
+		 * below to ensure that the existing allocations don't conflict.
+		 * For this reason, we use EFI_BOOT_SERVICES_DATA above and not
+		 * EFI_LOADER_DATA, which we wouldn't able to distinguish from
+		 * allocations that we want to disallow.
+		 */
+	}
+
+	/*
+	 * If the allocation above failed, we may still be able to proceed:
+	 * if the only allocations in the region are of types that will be
+	 * released to the OS after ExitBootServices(), the decompressor can
+	 * safely overwrite them.
+	 */
+	status = efi_get_memory_map(sys_table_arg, &map);
+	if (status != EFI_SUCCESS) {
+		pr_efi_err(sys_table_arg,
+			   "reserve_kernel_base(): Unable to retrieve memory map.\n");
+		return status;
+	}
+
+	for (l = 0; l < map_size; l += desc_size) {
+		efi_memory_desc_t *desc;
+		u64 start, end;
+
+		desc = (void *)memory_map + l;
+		start = desc->phys_addr;
+		end = start + desc->num_pages * EFI_PAGE_SIZE;
+
+		/* Skip if entry does not intersect with region */
+		if (start >= dram_base + MAX_UNCOMP_KERNEL_SIZE ||
+		    end <= dram_base)
+			continue;
+
+		switch (desc->type) {
+		case EFI_BOOT_SERVICES_CODE:
+		case EFI_BOOT_SERVICES_DATA:
+			/* Ignore types that are released to the OS anyway */
+			continue;
+
+		case EFI_CONVENTIONAL_MEMORY:
+			/*
+			 * Reserve the intersection between this entry and the
+			 * region.
+			 */
+			start = max(start, (u64)dram_base);
+			end = min(end, (u64)dram_base + MAX_UNCOMP_KERNEL_SIZE);
+
+			status = efi_call_early(allocate_pages,
+						EFI_ALLOCATE_ADDRESS,
+						EFI_LOADER_DATA,
+						(end - start) / EFI_PAGE_SIZE,
+						&start);
+			if (status != EFI_SUCCESS) {
+				pr_efi_err(sys_table_arg,
+					"reserve_kernel_base(): alloc failed.\n");
+				goto out;
+			}
+			break;
+
+		case EFI_LOADER_CODE:
+		case EFI_LOADER_DATA:
+			/*
+			 * These regions may be released and reallocated for
+			 * another purpose (including EFI_RUNTIME_SERVICE_DATA)
+			 * at any time during the execution of the OS loader,
+			 * so we cannot consider them as safe.
+			 */
+		default:
+			/*
+			 * Treat any other allocation in the region as unsafe */
+			status = EFI_OUT_OF_RESOURCES;
+			goto out;
+		}
+	}
+
+	status = EFI_SUCCESS;
+out:
+	efi_call_early(free_pool, memory_map);
+	return status;
+}
+
 efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
 				 unsigned long *image_addr,
 				 unsigned long *image_size,
@@ -71,10 +197,7 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
 				 unsigned long dram_base,
 				 efi_loaded_image_t *image)
 {
-	unsigned long nr_pages;
 	efi_status_t status;
-	/* Use alloc_addr to tranlsate between types */
-	efi_physical_addr_t alloc_addr;
 
 	/*
 	 * Verify that the DRAM base address is compatible with the ARM
@@ -85,27 +208,12 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table,
 	 */
 	dram_base = round_up(dram_base, SZ_128M);
 
-	/*
-	 * Reserve memory for the uncompressed kernel image. This is
-	 * all that prevents any future allocations from conflicting
-	 * with the kernel. Since we can't tell from the compressed
-	 * image how much DRAM the kernel actually uses (due to BSS
-	 * size uncertainty) we allocate the maximum possible size.
-	 * Do this very early, as prints can cause memory allocations
-	 * that may conflict with this.
-	 */
-	alloc_addr = dram_base;
-	*reserve_size = MAX_UNCOMP_KERNEL_SIZE;
-	nr_pages = round_up(*reserve_size, EFI_PAGE_SIZE) / EFI_PAGE_SIZE;
-	status = sys_table->boottime->allocate_pages(EFI_ALLOCATE_ADDRESS,
-						     EFI_LOADER_DATA,
-						     nr_pages, &alloc_addr);
+	status = reserve_kernel_base(sys_table, dram_base, reserve_addr,
+				     reserve_size);
 	if (status != EFI_SUCCESS) {
-		*reserve_size = 0;
 		pr_efi_err(sys_table, "Unable to allocate memory for uncompressed kernel.\n");
 		return status;
 	}
-	*reserve_addr = alloc_addr;
 
 	/*
 	 * Relocate the zImage, so that it appears in the lowest 128 MB

From patchwork Tue Apr  4 16:02:45 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ard Biesheuvel <ard.biesheuvel@linaro.org>
X-Patchwork-Id: 96743
Delivered-To: patch@linaro.org
Received: by 10.140.89.233 with SMTP id v96csp263296qgd;
 Tue, 4 Apr 2017 09:03:37 -0700 (PDT)
X-Received: by 10.99.177.4 with SMTP id r4mr24476009pgf.16.1491321817046;
 Tue, 04 Apr 2017 09:03:37 -0700 (PDT)
Return-Path: <linux-efi-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
 by mx.google.com with ESMTP id c1si7404096pge.59.2017.04.04.09.03.36; 
 Tue, 04 Apr 2017 09:03:37 -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 S932162AbdDDQDe (ORCPT <rfc822;patch@linaro.org> + 2 others);
 Tue, 4 Apr 2017 12:03:34 -0400
Received: from mail-wm0-f50.google.com ([74.125.82.50]:37421 "EHLO
 mail-wm0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 with ESMTP id S932122AbdDDQDd (ORCPT
 <rfc822;linux-efi@vger.kernel.org>); Tue, 4 Apr 2017 12:03:33 -0400
Received: by mail-wm0-f50.google.com with SMTP id x124so32352428wmf.0
 for <linux-efi@vger.kernel.org>; Tue, 04 Apr 2017 09:03:32 -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=ff4hQUtQmqYHUaLpVoZ9JEJ65lK1TiqAHW+FNJv26tA=;
 b=cibboHqjmh7kl3lIgwxB3ZP4HZacLJE0yOeTsSOmrg+IP1tJzgVpMNE3hTEw5C+PLW
 1werf3bPocQKuPSrIe/ElZRtGatt/S8KGFU7UA6ueToGUngP8Y/pElC1mNXzZS+drysl
 FflBw+dYvIdRiWjFE2Z7AeC6FRSNYGwo/opV0=
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=ff4hQUtQmqYHUaLpVoZ9JEJ65lK1TiqAHW+FNJv26tA=;
 b=FD1a8CKUahuwmq4R+to+At4ULfvTtzNieH7klB6McjtImfkAez0+sQYYkfQD171sxG
 of1jJVQazMxgdE8GcB2Vb6HbCkf1MCd4CQMVjJFGFg/AqBZ4FRkTiwZk8COwijmGEfhB
 srNsofe6DLBHG+MsVEiQAwm1imNEU09Qh9Bmf4diRQYyycGc5geejg+E2qABVVsHu1DG
 DG4NNlaPHiug0s/0K4hDj1e/yeGEF2QKybGT7RQv2A5OaWg/1NeAEKSbXIojcJ2x3hUo
 WlO+6PA2H+oQvGtW1/F/4JyAgXWIqG3ucFnqTxVkFa3HSaQefiqpByTaldRTtcQiV1NY
 WmGA==
X-Gm-Message-State: AFeK/H2/7G1pPGYTK9JnZDh0vo4g+0WQHpw22fYsrk92Ij1TX+HndyZI
 2VmhLV03yhD6goXB
X-Received: by 10.28.73.197 with SMTP id w188mr15233557wma.46.1491321811967; 
 Tue, 04 Apr 2017 09:03:31 -0700 (PDT)
Received: from localhost.localdomain ([160.163.145.113])
 by smtp.gmail.com with ESMTPSA id
 z88sm19686465wrb.1.2017.04.04.09.03.29
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Tue, 04 Apr 2017 09:03:31 -0700 (PDT)
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-efi@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
 Thomas Gleixner <tglx@linutronix.de>, "H . Peter Anvin" <hpa@zytor.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 09/12] efi/libstub: Fix harmless command line parsing bug
Date: Tue,  4 Apr 2017 17:02:45 +0100
Message-Id: <20170404160245.27812-12-ard.biesheuvel@linaro.org>
X-Mailer: git-send-email 2.9.3
In-Reply-To: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
References: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
Sender: linux-efi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-efi.vger.kernel.org>
X-Mailing-List: linux-efi@vger.kernel.org

When we parse the 'efi=' command line parameter in the stub, we
fail to take spaces into account. Currently, the only way this
could result in unexpected behavior is when the string 'nochunk'
appears as a separate command line argument after 'efi=xxx,yyy,zzz ',
so this is harmless in practice. But let's fix it nonetheless.

Cc: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/efi/libstub/efi-stub-helper.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.9.3

--
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/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c
index 919822b7773d..3290fae0b38f 100644
--- a/drivers/firmware/efi/libstub/efi-stub-helper.c
+++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
@@ -436,14 +436,14 @@ efi_status_t efi_parse_options(char *cmdline)
 	 * Remember, because efi= is also used by the kernel we need to
 	 * skip over arguments we don't understand.
 	 */
-	while (*str) {
+	while (*str && *str != ' ') {
 		if (!strncmp(str, "nochunk", 7)) {
 			str += strlen("nochunk");
 			__chunk_size = -1UL;
 		}
 
 		/* Group words together, delimited by "," */
-		while (*str && *str != ',')
+		while (*str && *str != ' ' && *str != ',')
 			str++;
 
 		if (*str == ',')

From patchwork Tue Apr  4 16:09:08 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ard Biesheuvel <ard.biesheuvel@linaro.org>
X-Patchwork-Id: 96750
Delivered-To: patch@linaro.org
Received: by 10.140.89.233 with SMTP id v96csp266182qgd;
 Tue, 4 Apr 2017 09:09:25 -0700 (PDT)
X-Received: by 10.99.36.194 with SMTP id k185mr24372160pgk.201.1491322164984; 
 Tue, 04 Apr 2017 09:09:24 -0700 (PDT)
Return-Path: <linux-efi-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67])
 by mx.google.com with ESMTP id d2si621402pgf.380.2017.04.04.09.09.24; 
 Tue, 04 Apr 2017 09:09:24 -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 S1754608AbdDDQJY (ORCPT <rfc822;patch@linaro.org> + 2 others);
 Tue, 4 Apr 2017 12:09:24 -0400
Received: from mail-wm0-f44.google.com ([74.125.82.44]:36214 "EHLO
 mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
 with ESMTP id S1754357AbdDDQJW (ORCPT
 <rfc822;linux-efi@vger.kernel.org>); Tue, 4 Apr 2017 12:09:22 -0400
Received: by mail-wm0-f44.google.com with SMTP id o81so29640054wmb.1
 for <linux-efi@vger.kernel.org>; Tue, 04 Apr 2017 09:09:22 -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=6Zxzc4GkG+kOyey08Yr4oFn06f7WyX1qFrzNgBTfLI0=;
 b=VbjBDDYvPOygQsUZrcZDYEd5vJ2/oGYX0UtRPrKhNNqq8+cmRjLjwDmx81kMkfVxj3
 Bgp1qWXrml9tDr1+GrGWIjimSPgJ7JSKfmIp8RGwNu7JujKdDgDFkwy4HI/aB9Fpsz26
 CyyRMHXKkMfD5XJEwL7tVgHrdO4mQu/kZwMRU=
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=6Zxzc4GkG+kOyey08Yr4oFn06f7WyX1qFrzNgBTfLI0=;
 b=niP4KwGB2GIr4cXtP9LTCED93y5VOS3ymg3Uc9bdYMs/JD67sjAiJOjj+CrIe8n5gX
 9OE4IKIwv/2NAh6eTtWJqUSRGe2dV+Nj3DfsR7sQN2M3gP3a2ABQov0NEjthrHpZ/rJE
 LO5jjepDNBst1LNBuPtFKd8wrTEJ1kfL1qEWqMQlIK21XIlbAGQ8/JrUWLBv64Hv7/b9
 BQh1/GjXwQpE+L4ihARuE5RYzAj1SaCSPvgExBhbqqnrjxLzy6CXjmHtufDPWtwcRUh6
 4s7KD+UVqMZNnw88H7dw6oCwAy3B8KzdHmqMBuGTfO2Km5dsRraslSAkRFzSSze11vzM
 eOSg==
X-Gm-Message-State: AFeK/H0iT0DcTPc7c6Pp01KVtbf3Zb7i0ZwdD3hKrYqBryUhfQVnCNWtxit9NWfvYwODjOfm
X-Received: by 10.28.16.149 with SMTP id 143mr14622372wmq.42.1491322161300; 
 Tue, 04 Apr 2017 09:09:21 -0700 (PDT)
Received: from localhost.localdomain ([160.163.145.113])
 by smtp.gmail.com with ESMTPSA id
 u66sm19003333wmd.24.2017.04.04.09.09.18
 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
 Tue, 04 Apr 2017 09:09:20 -0700 (PDT)
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-efi@vger.kernel.org, Ingo Molnar <mingo@kernel.org>,
 Thomas Gleixner <tglx@linutronix.de>, "H . Peter Anvin" <hpa@zytor.com>
Cc: matt@codeblueprint.co.uk, mark.rutland@arm.com,
 roy.franz@cavium.com, rruigrok@codeaurora.org,
 leif.lindholm@linaro.org, jhugo@codeaurora.org,
 evgeny.kalugin@intel.com, eugene@hp.com, bp@alien8.de,
 bhsharma@redhat.com, bhe@redhat.com,
 Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-kernel@vger.kernel.org
Subject: [PATCH 10/12] efi/libstub: Unify command line param parsing
Date: Tue,  4 Apr 2017 17:09:08 +0100
Message-Id: <20170404160910.28115-1-ard.biesheuvel@linaro.org>
X-Mailer: git-send-email 2.9.3
In-Reply-To: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
References: <20170404160245.27812-1-ard.biesheuvel@linaro.org>
Sender: linux-efi-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-efi.vger.kernel.org>
X-Mailing-List: linux-efi@vger.kernel.org

Merge the parsing of the command line carried out in arm-stub.c with
the handling in efi_parse_options. Note that this also fixes the
missing handling of CONFIG_CMDLINE_FORCE=y, in which case the builtin
command line should supersede the one passed by the firmware.

Cc: Matt Fleming <matt@codeblueprint.co.uk>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 drivers/firmware/efi/libstub/arm-stub.c        | 24 +++++++-----------------
 drivers/firmware/efi/libstub/arm64-stub.c      |  4 +---
 drivers/firmware/efi/libstub/efi-stub-helper.c | 19 +++++++++++--------
 drivers/firmware/efi/libstub/efistub.h         |  2 ++
 include/linux/efi.h                            |  2 +-
 5 files changed, 22 insertions(+), 29 deletions(-)

-- 
2.9.3

--
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/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index 02049ff25c6b..ac3222f6f805 100644
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -18,8 +18,6 @@
 
 #include "efistub.h"
 
-bool __nokaslr;
-
 efi_status_t efi_open_volume(efi_system_table_t *sys_table_arg,
 			     void *__image, void **__fh)
 {
@@ -153,18 +151,6 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table,
 		goto fail;
 	}
 
-	/* check whether 'nokaslr' was passed on the command line */
-	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {
-		static const u8 default_cmdline[] = CONFIG_CMDLINE;
-		const u8 *str, *cmdline = cmdline_ptr;
-
-		if (IS_ENABLED(CONFIG_CMDLINE_FORCE))
-			cmdline = default_cmdline;
-		str = strstr(cmdline, "nokaslr");
-		if (str == cmdline || (str > cmdline && *(str - 1) == ' '))
-			__nokaslr = true;
-	}
-
 	si = setup_graphics(sys_table);
 
 	status = handle_kernel_image(sys_table, image_addr, &image_size,
@@ -176,9 +162,13 @@ unsigned long efi_entry(void *handle, efi_system_table_t *sys_table,
 		goto fail_free_cmdline;
 	}
 
-	status = efi_parse_options(cmdline_ptr);
-	if (status != EFI_SUCCESS)
-		pr_efi_err(sys_table, "Failed to parse EFI cmdline options\n");
+	if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) ||
+	    IS_ENABLED(CONFIG_CMDLINE_FORCE) ||
+	    cmdline_size == 0)
+		efi_parse_options(CONFIG_CMDLINE);
+
+	if (!IS_ENABLED(CONFIG_CMDLINE_FORCE) && cmdline_size > 0)
+		efi_parse_options(cmdline_ptr);
 
 	secure_boot = efi_get_secureboot(sys_table);
 
diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
index eae693eb3e91..b4c2589d7c91 100644
--- a/drivers/firmware/efi/libstub/arm64-stub.c
+++ b/drivers/firmware/efi/libstub/arm64-stub.c
@@ -16,8 +16,6 @@
 
 #include "efistub.h"
 
-extern bool __nokaslr;
-
 efi_status_t check_platform_features(efi_system_table_t *sys_table_arg)
 {
 	u64 tg;
@@ -52,7 +50,7 @@ efi_status_t handle_kernel_image(efi_system_table_t *sys_table_arg,
 	u64 phys_seed = 0;
 
 	if (IS_ENABLED(CONFIG_RANDOMIZE_BASE)) {
-		if (!__nokaslr) {
+		if (!nokaslr()) {
 			status = efi_get_random_bytes(sys_table_arg,
 						      sizeof(phys_seed),
 						      (u8 *)&phys_seed);
diff --git a/drivers/firmware/efi/libstub/efi-stub-helper.c b/drivers/firmware/efi/libstub/efi-stub-helper.c
index 3290fae0b38f..2e17d2b8787c 100644
--- a/drivers/firmware/efi/libstub/efi-stub-helper.c
+++ b/drivers/firmware/efi/libstub/efi-stub-helper.c
@@ -32,6 +32,13 @@
 
 static unsigned long __chunk_size = EFI_READ_CHUNK_SIZE;
 
+static int __section(.data) __nokaslr;
+
+int __pure nokaslr(void)
+{
+	return __nokaslr;
+}
+
 #define EFI_MMAP_NR_SLACK_SLOTS	8
 
 struct file_info {
@@ -409,17 +416,13 @@ static efi_status_t efi_file_close(void *handle)
  * environments, first in the early boot environment of the EFI boot
  * stub, and subsequently during the kernel boot.
  */
-efi_status_t efi_parse_options(char *cmdline)
+efi_status_t efi_parse_options(char const *cmdline)
 {
 	char *str;
 
-	/*
-	 * Currently, the only efi= option we look for is 'nochunk', which
-	 * is intended to work around known issues on certain x86 UEFI
-	 * versions. So ignore for now on other architectures.
-	 */
-	if (!IS_ENABLED(CONFIG_X86))
-		return EFI_SUCCESS;
+	str = strstr(cmdline, "nokaslr");
+	if (str == cmdline || (str && str > cmdline && *(str - 1) == ' '))
+		__nokaslr = 1;
 
 	/*
 	 * If no EFI parameters were specified on the cmdline we've got
diff --git a/drivers/firmware/efi/libstub/efistub.h b/drivers/firmware/efi/libstub/efistub.h
index 71c4d0e3c4ed..a7a2a2c3f199 100644
--- a/drivers/firmware/efi/libstub/efistub.h
+++ b/drivers/firmware/efi/libstub/efistub.h
@@ -24,6 +24,8 @@
 #define EFI_ALLOC_ALIGN		EFI_PAGE_SIZE
 #endif
 
+extern int __pure nokaslr(void);
+
 void efi_char16_printk(efi_system_table_t *, efi_char16_t *);
 
 efi_status_t efi_open_volume(efi_system_table_t *sys_table_arg, void *__image,
diff --git a/include/linux/efi.h b/include/linux/efi.h
index 94d34e0be24f..e485e87615d1 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -1471,7 +1471,7 @@ efi_status_t handle_cmdline_files(efi_system_table_t *sys_table_arg,
 				  unsigned long *load_addr,
 				  unsigned long *load_size);
 
-efi_status_t efi_parse_options(char *cmdline);
+efi_status_t efi_parse_options(char const *cmdline);
 
 efi_status_t efi_setup_gop(efi_system_table_t *sys_table_arg,
 			   struct screen_info *si, efi_guid_t *proto,