From patchwork Mon Oct 24 11:32:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8689 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp422499wru; Mon, 24 Oct 2022 05:22:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM787B7KE2efSvz96VVm58CpFF9f5vy1HTPgtpBERHHcrQt/aww8mSNF4wvZwICkO9E+Zq88 X-Received: by 2002:a17:906:db02:b0:780:24e:cf9 with SMTP id xj2-20020a170906db0200b00780024e0cf9mr27553078ejb.460.1666614168414; Mon, 24 Oct 2022 05:22:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666614168; cv=none; d=google.com; s=arc-20160816; b=cMwsA6BHY8+qW0DIwm9nkV6au39Jd/R2w8Q+7CD4ix9S6MZ16T+HCD4ltOFNKM8IR5 tSnEdERBVRSin33BPaZBEi8NW2B2QAq2fyrkLnlJYQR28PLqoJjF+HemEoTqAwAj06fe lf3QZDSyDNHuH5IoR5L1DS32mxsYfTPJ/UzH+Sx4mpVoCvYf99yM2O2Kjp222YmaRxlW UoexWf+rYzMFkPcgThfdmtIp1P57ASf9JnScnUORZtWmX9IFRlUgKrVILv9BAKNjCj86 6YB18Lg1I4yGkMPZYNeAvLUw0wMnGlviN2HBIZ40qUdy+OZe3dQ3QDdi7bRxq1iBz5JJ KN5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KoyxwZn6X1wThRDckOywlX+i4OhYO5cRjgxTSSOJf00=; b=KLjUWLCyCv8bfp8ntjgY3ZZglCF4EFIUNfXfv2bvDyRtCoLzjhyJgUFubBOACzD3MQ 4b5OAYYjcnjaRwB2R/Mu/Hr9YSdt2byQci41yhCt9TMLNYDHLXctIcmqXYjPzyuYd67x hfetgRXhVVAt20javocxB2vNJ5w7oRUGOk3OkNf8J5sADpG97Y5WBHq0S7p30OBX2Vey k3U1nR5sVhVtrmU+PqWcH+peNLaPUBwnNQ1NlwbtM15H8by6gnI4gVdhCiFMjSbAwcoo w2nNmFPs216I8N+wEeJRVj3ejLDUG/jG6HJjm9/OQoAwsOoecI9Tq7bnQxQUzBDhZNwm ueEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lbpZ6n4R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s11-20020a056402520b00b0045db2dcff0esi21719914edd.594.2022.10.24.05.22.24; Mon, 24 Oct 2022 05:22:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=lbpZ6n4R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233367AbiJXMVX (ORCPT + 99 others); Mon, 24 Oct 2022 08:21:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40658 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233470AbiJXMTk (ORCPT ); Mon, 24 Oct 2022 08:19:40 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A4C482D3E; Mon, 24 Oct 2022 04:58:12 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E3B4DB811C5; Mon, 24 Oct 2022 11:54:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4745CC433D6; Mon, 24 Oct 2022 11:54:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612462; bh=/GUBL19Jp9NmcH/HaL4btiEfO1T1Pkk6YALZLRd1jc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lbpZ6n4RhcqCfjkWZAtn73ZM2sTC+HVgsztIbDIs5801E/Iog1IUuD+Y0yGwF8Tvx S7Tle1zSLIroqe/agDKbIR4SiQNVW9mKfoCCjFnQPkmP2RjM+8P12z/s1iNWgEFJnM Tg+C0Sx8Y9oF2YSOJ3pVc1oV5IbD6F7GuyR4Ugbs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ard Biesheuvel Subject: [PATCH 4.14 208/210] efi: libstub: drop pointless get_memory_map() call Date: Mon, 24 Oct 2022 13:32:05 +0200 Message-Id: <20221024113003.766339614@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747571618044617100?= X-GMAIL-MSGID: =?utf-8?q?1747571618044617100?= From: Ard Biesheuvel commit d80ca810f096ff66f451e7a3ed2f0cd9ef1ff519 upstream. Currently, the non-x86 stub code calls get_memory_map() redundantly, given that the data it returns is never used anywhere. So drop the call. Cc: # v4.14+ Fixes: 24d7c494ce46 ("efi/arm-stub: Round up FDT allocation to mapping size") Signed-off-by: Ard Biesheuvel Signed-off-by: Greg Kroah-Hartman --- drivers/firmware/efi/libstub/fdt.c | 8 -------- 1 file changed, 8 deletions(-) --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c @@ -301,14 +301,6 @@ efi_status_t allocate_new_fdt_and_exit_b goto fail; } - /* - * Now that we have done our final memory allocation (and free) - * we can get the memory map key needed for exit_boot_services(). - */ - status = efi_get_memory_map(sys_table, &map); - if (status != EFI_SUCCESS) - goto fail_free_new_fdt; - status = update_fdt(sys_table, (void *)fdt_addr, fdt_size, (void *)*new_fdt_addr, MAX_FDT_SIZE, cmdline_ptr, initrd_addr, initrd_size);