| Message ID | 20181210162949.8597-5-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show
Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3751347ljp; Mon, 10 Dec 2018 08:30:40 -0800 (PST) X-Google-Smtp-Source: AFSGD/X4rlHpGnenQNB7g7VuFqqqRLclhvP6mGG7240yu6kH4c7GDxlJmdQKr4EcwDJTvDd/oRp5 X-Received: by 2002:a63:ff62:: with SMTP id s34mr11488227pgk.325.1544459440625; Mon, 10 Dec 2018 08:30:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544459440; cv=none; d=google.com; s=arc-20160816; b=udUN2LTKpa38FfzgEhsc9NSrj0aEvPGDJjNW3cQeh35MUI5hfB+tj+J+E98i/zTaJh XI2APBQtCljXkDnM6/0r9ri1wgQ35EH1gjKtaeUxGB0CerYvgKU7AgMxeVDl/mSu3CoP bjd5sdMB7Ui6+ljWR0pYWkDnF02M+wt9V4YMLvyJoss5TXD0fl2kVcP4+4i/nmp/hqOl tFOboHtxf4Dmrkp/OG3zK8hKnv5oKMc9j/thjNxbcKar14tW1t/27k7CbPevwfV+CI0I hkgw0btSV+YXVGlH+OaKtvPFmg3FiA4bnNLrKXnKLj61dxp6KuJV5mPTLnMeN5wMhVhf xtuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lz9cl2063s35V8iKDCeCGlB15ecDD/QJENBVOnRhRaw=; b=Zx5bH3v4v6XMXaLdundKtiKB2oq3/CCkreN0qVHfeIzhbKMmT28jmQR3lt70o1tA/v JJ4UXVkmdsecgem7wKBL0QHGo85wic4N9amh7zUl2UNP3VkxTFBNp0A2q9pHil/DNiqX KpECx5oZVlbNGEcHHkl2eIdf37efk5EhneuugZ7mUfCAGenu+pKg3CIOlBVWiYlWQENq /bvqCP8vh+cKdxhXFRAl2TIvfp8lNkez0HUgMT7IFIJ17bsB2uZ65iUfe5gU/EyKKBye FtFCWEGgBRoaez7NFYV7+Ixx2D69hoHzdBCpS1iqt2fX8KJ4GZBGqGho0Pp17ushVZxC CdhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iKY3AgxN; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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 i6si9670663pgq.207.2018.12.10.08.30.40; Mon, 10 Dec 2018 08:30:40 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=iKY3AgxN; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728445AbeLJQaj (ORCPT <rfc822; heyi.guo@linaro.org> + 3 others); Mon, 10 Dec 2018 11:30:39 -0500 Received: from mail-wr1-f66.google.com ([209.85.221.66]:37723 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728320AbeLJQaR (ORCPT <rfc822; linux-efi@vger.kernel.org>); Mon, 10 Dec 2018 11:30:17 -0500 Received: by mail-wr1-f66.google.com with SMTP id j10so11134629wru.4 for <linux-efi@vger.kernel.org>; Mon, 10 Dec 2018 08:30:16 -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 :mime-version:content-transfer-encoding; bh=lz9cl2063s35V8iKDCeCGlB15ecDD/QJENBVOnRhRaw=; b=iKY3AgxNBVgdUBQYyW2FEBFqU10aU92NdgP+jq7/Q6tVFD7yMTboJvZ5KCTd6P40d5 VDzyKlyl/7lc5JBrRycE/il7YzRjaoAt7hB5IPlhe0VRn4D/rhS8OeRYmpu2wMWIIHKH cl/S/LQyyDr6ig3mdbCYgVzbAE1tmPXsTMWGk= 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:mime-version:content-transfer-encoding; bh=lz9cl2063s35V8iKDCeCGlB15ecDD/QJENBVOnRhRaw=; b=eSVtr4mF7QmQY7XTRf+9TWwsyJ/3v8xbBrP8eDBUBKBOT5iDbZZ+4mavhYChQLoQuA 68+eT/7KtJSqpHRTLm++VzFAeFhccdv5fZUpuMp5fqiihXwcknlTZroWEqs2qrzP48OP crKTQ65Rq6wI+Z2+11oMYbumOkza5M7SC8WTEobmTS/uquQ5WVTDgJjsh0Q24Sd2cNGW FmkVBWG5O3VVXSmN56V0bfJv3vMZZ+QkptxLrUhBIFEpf6ISKrSLF0+6mlrlpQMcEQPl UtT7Mti03nMQMKcnS6ujjG7XX/dlsZb2VCWMlz2LgSUvc0ZFcteByzN68lh7x3EfT1XU Y5Ig== X-Gm-Message-State: AA+aEWYGMPFSgaeh5nEUSGYjqiUR3j7KVQGGKaP+6wQabIYMMCdkGIWj rHLOzyyL0LdlVGaUhXDJ1I68KQ== X-Received: by 2002:adf:b6a1:: with SMTP id j33mr10493657wre.55.1544459416126; Mon, 10 Dec 2018 08:30:16 -0800 (PST) Received: from localhost.localdomain (astlambert-681-1-52-199.w90-86.abo.wanadoo.fr. [90.86.17.199]) by smtp.gmail.com with ESMTPSA id i186sm3480531wmd.19.2018.12.10.08.30.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Dec 2018 08:30:15 -0800 (PST) From: Ard Biesheuvel <ard.biesheuvel@linaro.org> To: linux-arm-kernel@lists.infradead.org Cc: linux-efi@vger.kernel.org, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Russell King <linux@armlinux.org.uk>, Marc Zyngier <marc.zyngier@arm.com> Subject: [PATCH 4/4] efi/arm: re-enable the memreserve table for 32-bit ARM Date: Mon, 10 Dec 2018 17:29:49 +0100 Message-Id: <20181210162949.8597-5-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181210162949.8597-1-ard.biesheuvel@linaro.org> References: <20181210162949.8597-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: <linux-efi.vger.kernel.org> X-Mailing-List: linux-efi@vger.kernel.org |
| Series |
ARM: re-enable EFI persistent memory reservations
|
expand
|
diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c index 3d36142cf812..30ac0c975f8a 100644 --- a/drivers/firmware/efi/libstub/arm-stub.c +++ b/drivers/firmware/efi/libstub/arm-stub.c @@ -75,9 +75,6 @@ void install_memreserve_table(efi_system_table_t *sys_table_arg) efi_guid_t memreserve_table_guid = LINUX_EFI_MEMRESERVE_TABLE_GUID; efi_status_t status; - if (IS_ENABLED(CONFIG_ARM)) - return; - status = efi_call_early(allocate_pool, EFI_LOADER_DATA, sizeof(*rsv), (void **)&rsv); if (status != EFI_SUCCESS) {
Now that we have readded the call to efi_apply_persistent_mem_reservations in the 32-bit ARM boot path in a place where potentially creating many memblock reservations is permissible, re-enable the MEMRESERVE table in the 32-bit ARM EFI stub. This brings ARM back in line with arm64 in terms of support for efi_mem_reserve_persistent(). Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- drivers/firmware/efi/libstub/arm-stub.c | 3 --- 1 file changed, 3 deletions(-) -- 2.19.2