From patchwork Mon Feb 15 11:32:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 61928 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1014387lbl; Mon, 15 Feb 2016 03:41:01 -0800 (PST) X-Received: by 10.98.72.24 with SMTP id v24mr22507608pfa.15.1455536461273; Mon, 15 Feb 2016 03:41:01 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id us7si42975038pac.204.2016.02.15.03.41.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Feb 2016 03:41:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVHPU-00022H-IW; Mon, 15 Feb 2016 11:33:44 +0000 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aVHOr-0001SO-S5 for linux-arm-kernel@lists.infradead.org; Mon, 15 Feb 2016 11:33:08 +0000 Received: by mail-wm0-x231.google.com with SMTP id g62so144960745wme.0 for ; Mon, 15 Feb 2016 03:32:45 -0800 (PST) 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=tyySdSbXwu1SnoSUMX/tN06WcbR/3W/toOzaUSJW4ME=; b=dsmXSeCtJ/M6w1zAk6ndszkr8OuQbJVAVC/G9JHnXN/8RGkaA6eDWBQHgLmqIHphXT +ghL4hfL4AmT2serXSKqY4i6+5coVnSXvtGiP+uMw+nNXQKpsGPbJm/ro+3fLSfCEvkd w56C3Y+CVJ/y3yFsa3bDytD4Tz5Zm8/A0YpcY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tyySdSbXwu1SnoSUMX/tN06WcbR/3W/toOzaUSJW4ME=; b=jug25ER/haL6eohzYbRH78jWs7C0GkpxkM2RR7dPmMUJLuJGhY+iVQYV51I0eVfWcU ow4CqvfP9axANxi/4GQw+wp9XIW5yyJ0YPFST3OD63JMFmPhteNTf300Lg1GLPaVZFFi bMMiC/GTl/JK8cyxzVs9aQlyKjMIm40qOVQvPh/yOoCnThfCKewfriQEmTC1X6e0tqZs roCLzeBdXGr0hPYrQVr1Pvit7uV7r9kKv/Q97Hvab+8fjCUszNplRnvyYC4h63jcK8dI qe5tgJ9tzCaYAZT6iUotmECvl+SVpJpgaJSr4f6R+qs+GGRxxXiCJl/IMC8MBeB5ezdu cypw== X-Gm-Message-State: AG10YOSPY0BBloE/BjLonzxiT5Fb7OZhAF12ZKltFS5su9cmFkb34o0FAMpAunIKBCgud6aV X-Received: by 10.28.103.5 with SMTP id b5mr13000813wmc.5.1455535963778; Mon, 15 Feb 2016 03:32:43 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id 73sm15215449wmy.22.2016.02.15.03.32.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 15 Feb 2016 03:32:42 -0800 (PST) From: Ard Biesheuvel To: linux-efi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, leif.lindholm@linaro.org, matt@codeblueprint.co.uk, mark.rutland@arm.com, pjones@redhat.com, tbaicar@codeaurora.org Subject: [PATCH v2 2/2] arm64/efi: esrt: add missing call to efi_esrt_init() Date: Mon, 15 Feb 2016 12:32:33 +0100 Message-Id: <1455535953-5056-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455535953-5056-1-git-send-email-ard.biesheuvel@linaro.org> References: <1455535953-5056-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160215_033306_440577_1BBDD512 X-CRM114-Status: GOOD ( 11.50 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:231 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org ESRT support is built by default for all architectures that define CONFIG_EFI. However, this support was not wired up yet for ARM/arm64, since efi_esrt_init() was never called. So add the missing call. Since efi_esrt_init() uses efi_mem_desc_lookup(), which in turn relies on efi.memmap having been assigned and populated completetely, add the missing assignments of efi.memmap and efi.memmap->nr_map. Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/arm-init.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c index 9e15d571b53c..5c5e799bdb50 100644 --- a/drivers/firmware/efi/arm-init.c +++ b/drivers/firmware/efi/arm-init.c @@ -197,10 +197,13 @@ void __init efi_init(void) memmap.map_end = memmap.map + params.mmap_size; memmap.desc_size = params.desc_size; memmap.desc_version = params.desc_ver; + memmap.nr_map = params.mmap_size / params.desc_size; + efi.memmap = &memmap; if (uefi_init() < 0) return; + efi_esrt_init(); reserve_regions(); early_memunmap(memmap.map, params.mmap_size); memblock_mark_nomap(params.mmap & PAGE_MASK,