From patchwork Wed Dec 20 08:41:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 756398 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp240256wrw; Wed, 20 Dec 2023 00:43:51 -0800 (PST) X-Google-Smtp-Source: AGHT+IFNlIMPOpGErxxrmuB0X+7GrNMwZgzURVBIBnsgJERut+GFuZ4nGcntstQAf6QRKSPE7zNW X-Received: by 2002:a05:6000:181c:b0:336:68f9:a1b8 with SMTP id m28-20020a056000181c00b0033668f9a1b8mr1818048wrh.42.1703061831074; Wed, 20 Dec 2023 00:43:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703061831; cv=none; d=google.com; s=arc-20160816; b=KdJG9s4z79tpxis9EnBAqVWBeARHikgXULuTldWufOEbk4IOaqiNdxyyxUpGj7jAwQ 77or6Sc2PNaRMdlCIDpwZQEdf6/HoOYE1rDWe82Tjaw+9nLedzqbM2Lfb/i6XNJmihiC 6E2cbJUbcrEAZsOZvw4BDdfdc6dnlNqW8UiYUd9r2Tcq/KXZruKygEgw8tUZKJSpsB6D c+thEoejYEJ2tQiJMuyKDxRRW8/zd3YTYu1f7uF0MMfQWqIb89nHwm6R9unOMpZ1Gma6 mH8vkxGtq1FnpzWh10QogL6+JjpoHIYPRPzDwi+r4Qayk+7+fwJV27PguRGe82u6LlAo KJ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DmGgBfSQr7vKFYTwf/qAKZkof3bWieFVSPdJmkpTVMg=; fh=YtnCJplQ1DA0Rz8c1dg8CfrVxTgSI4BIXB9JUZxV1zk=; b=rJURKqlOYaycvLfIsDVzps5SyuR9ugONmkMUX+JkJiDCqIrWEqzDTPWst8g91+P2eE 7hbswSFZyvz858MfRSIS6xYFL40Zeh6M3pJKb/1Sa9saiedbAdthwvrVkiofnMUXlEAG quu0FjZiXk4EGGZzDgTfGEK/u+R6xA6KXq4rQbL4gvDbFi69L4Yv7WO0wtunQcNCo3db AeTXSTao54iDLt+Qrzhi/in6lcGHm/fjqIQtX/da8Rny2cMNX9YiZZvyXYe/AQPw0WCb tJIKyRSEQ2qOaOig9ffFHD5ADDdHlH+c9Gr0lY+oEatRKAHPuiUznbpLVz201jthp+Lc V+ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mDfwDfha; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id v7-20020a5d43c7000000b003367d80d901si179444wrr.933.2023.12.20.00.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 00:43:51 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mDfwDfha; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D4CA086FFE; Wed, 20 Dec 2023 09:43:39 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mDfwDfha"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D294586FFE; Wed, 20 Dec 2023 09:43:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id F275B8761C for ; Wed, 20 Dec 2023 09:43:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=masahisa.kojima@linaro.org Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-1d337dc9697so44074045ad.3 for ; Wed, 20 Dec 2023 00:43:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1703061813; x=1703666613; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DmGgBfSQr7vKFYTwf/qAKZkof3bWieFVSPdJmkpTVMg=; b=mDfwDfharR3d/lawt6n0pnQ5AZjEatmOLAkeCb13uyiWuwZPZrm7Rh9uuK69PjIYNK X3Qx0oNpl+aDra+WTtPZuFDpoZOE8dpXMHQTjJbzHq++rC8VljLRE6/ljYABhvlsrSrW Gm2Y6FfUaF80WcweOLq3vGWYBZx2j7S917I4b+rr384RjZzJa1nqPYnfkHBjWf6mg6Lo 8g9et98a6rxgMhvhKBU/SLdXY18gqipvWpzagm/Hx5y82Z4Ov8AfBBlDv7gGNkrgBT16 s40wMYKaKgJF2JJMIqoyWSrL1feg/MaUB3ycQQ4frP80YDWZT+p7E8dIhcy+WAg2u27V blag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703061813; x=1703666613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DmGgBfSQr7vKFYTwf/qAKZkof3bWieFVSPdJmkpTVMg=; b=IhN1KbSMU8n/B82TyLB+eT1GjF4hXBF+eMDqbD2JSyppBo5Nq6nzl/YjLRaHuqiBQ8 dK8+dYOBtc0d/cGTnh5rmS793aZAlUYgigsChGxCviZVZec0P8MyXVGuPeOAzIvJfIvo 6MtQNej/lTFmcTQBEFZTfVq8GvxV5rJ79eUUXcD/IDaNmuyS3awNedevRW+2Ye38x/8K ZBnR909Sx8Qs6on+EExEJDUpgp8e3C1JZf/2ye4aVa92dISuj9SEiMCHXDRfCxvz68+D cAIlzZ5B+pLXyT7Y2M/GHFP+bXjHu83r2B2ZNAuvTXcRbrhX7kfvGgssiPP5uv/aAX9Z Ewyg== X-Gm-Message-State: AOJu0YzP9zmKBoJr2bEVh8fp/TSG0KmU1zjB8mhuG6sJV3MfJd9HvJq3 EF7UAKe1y7ZTgS/alsSPxhPURTiMQCKAhi1wVXo= X-Received: by 2002:a17:902:7ec1:b0:1d0:6297:150a with SMTP id p1-20020a1709027ec100b001d06297150amr16662788plb.47.1703061813451; Wed, 20 Dec 2023 00:43:33 -0800 (PST) Received: from localhost ([164.70.16.189]) by smtp.gmail.com with ESMTPSA id z3-20020a170902834300b001d1d1ef8be5sm22409694pln.173.2023.12.20.00.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Dec 2023 00:43:32 -0800 (PST) From: Masahisa Kojima To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Masahisa Kojima Subject: [PATCH 2/2] efi_loader: auto-generate removable media boot option first Date: Wed, 20 Dec 2023 17:41:32 +0900 Message-Id: <20231220084133.435240-3-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231220084133.435240-1-masahisa.kojima@linaro.org> References: <20231220084133.435240-1-masahisa.kojima@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean This commit auto-generates the boot option for removable block io devices followed by fixed block io devices. This is what EDK II reference implementation does. Signed-off-by: Masahisa Kojima --- lib/efi_loader/efi_bootmgr.c | 37 ++++++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index 636f01e2eb..6b02abcf0d 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -584,7 +584,6 @@ static efi_status_t try_load_from_media(struct efi_device_path *file_path, efi_status_t ret = EFI_SUCCESS; struct efi_device_path *rem, *dp = NULL; struct efi_device_path *final_dp = file_path; - h = efi_dp_find_obj(file_path, &efi_block_io_guid, &rem); if (h) { if (rem->type == DEVICE_PATH_TYPE_END) { @@ -788,15 +787,19 @@ error: * efi_bootmgr_enumerate_boot_option() - enumerate the possible bootable media * * @opt: pointer to the media boot option structure + * @index: index of the opt array to store the boot option * @handles: pointer to the efi handles * @count: number of efi handle + * @removable: flag to parse removable only * Return: status code */ static efi_status_t efi_bootmgr_enumerate_boot_option(struct eficonfig_media_boot_option *opt, + efi_uintn_t index, efi_handle_t *handles, - efi_uintn_t *count) + efi_uintn_t *count, + bool removable) { - u32 i, num = 0; + u32 i, num = index; struct efi_handler *handler; efi_status_t ret = EFI_SUCCESS; @@ -810,12 +813,20 @@ static efi_status_t efi_bootmgr_enumerate_boot_option(struct eficonfig_media_boo struct efi_device_path *short_dp; struct efi_block_io *blkio; + if (num >= *count) { + ret = EFI_INVALID_PARAMETER; + goto out; + } + ret = efi_search_protocol(handles[i], &efi_block_io_guid, &handler); blkio = handler->protocol_interface; if (blkio->media->logical_partition) continue; + if (removable != (blkio->media->removable_media != 0)) + continue; + ret = efi_search_protocol(handles[i], &efi_guid_device_path, &handler); if (ret != EFI_SUCCESS) continue; @@ -1105,7 +1116,7 @@ efi_status_t efi_bootmgr_update_media_device_boot_option(void) { u32 i; efi_status_t ret; - efi_uintn_t count; + efi_uintn_t count, num, total; efi_handle_t *handles = NULL; struct eficonfig_media_boot_option *opt = NULL; @@ -1122,22 +1133,32 @@ efi_status_t efi_bootmgr_update_media_device_boot_option(void) goto out; } - ret = efi_bootmgr_enumerate_boot_option(opt, handles, &count); + /* parse removable block io followed by fixed block io */ + num = count; + ret = efi_bootmgr_enumerate_boot_option(opt, 0, handles, &num, true); if (ret != EFI_SUCCESS) goto out; + total = num; + num = count; + ret = efi_bootmgr_enumerate_boot_option(opt, total, handles, &num, false); + if (ret != EFI_SUCCESS) + goto out; + + total = num; + /* * System hardware configuration may vary depending on the user setup. * The boot option is automatically added by the bootmenu. * If the device is not attached to the system, the boot option needs * to be deleted. */ - ret = efi_bootmgr_delete_invalid_boot_option(opt, count); + ret = efi_bootmgr_delete_invalid_boot_option(opt, total); if (ret != EFI_SUCCESS) goto out; /* add non-existent boot option */ - for (i = 0; i < count; i++) { + for (i = 0; i < total; i++) { u32 boot_index; u16 var_name[9]; @@ -1166,7 +1187,7 @@ efi_status_t efi_bootmgr_update_media_device_boot_option(void) out: if (opt) { - for (i = 0; i < count; i++) + for (i = 0; i < total; i++) free(opt[i].lo); } free(opt);