From patchwork Fri Jul 15 14:27:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahisa Kojima X-Patchwork-Id: 590836 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5817:0:0:0:0 with SMTP id j23csp551517max; Fri, 15 Jul 2022 07:25:32 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ssll1QgTq1E9QlUfUb7Ft4dZx3dSLw6uuuN9gW6+346FUrCvBCR56ooZRZ4TGBs6G8HbCY X-Received: by 2002:a05:6638:31c2:b0:335:dd22:83ec with SMTP id n2-20020a05663831c200b00335dd2283ecmr7731720jav.88.1657895132146; Fri, 15 Jul 2022 07:25:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657895132; cv=none; d=google.com; s=arc-20160816; b=AnZVZ7FqGGLBAd1MlejNL6sQi1j4qi5qpXE84R8rQRszMQK8w90gCdW7o+MeLNRdOK 9KLOtm35ivda83BYM/in4NH1OYNb3RLMxHuE9iwtBWabQMPQaN9DbyN3mWrKpZjNpTck 5jFxEyYd9BCoQVnZucty2ySY69ntUsXMSkFk4k9w8vV9vA+zI4MwVeBGScf7tUFP3Fp8 fhqxyXcqUOW0uDciiE4n08ZAisk7ONxRdjmMtLz+GYUEIpKjjshhwStAsm5SONbivd77 qJeVsbCubJC7uM5TksA9X4QoqUV9NKLHQ6uQEQVq0urqUAf2A6DWgFLJmSBTL09hX6US vkVg== 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:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=aQaX4258rFTXTFVQ01ZAB87u4TgPi8pZqYYB5qeGH1A=; b=vvWiq6cxsBsPuc/a+cVbLVcxBepBvsMnYU/HrJe9N7ZS21oSbXwOiRg/u5ckwcwoDw Y7x5RGSA0APdytRbC+XUo4pgS1c0LtrVUL9Cc3bbtPWcBcSKtbgrnehrU10fgmfXIfCD j65cdFFMZP9Ma7OFkHjq3V1uopgKTjAm8beDz2lZ1uia7Ws79g6Yy3WVt9CWPlVkEyKV aEGma224tVmDNsef1IMAvbJxBTDfP+4AKyJb2sOlMptifC9bHYGTnSjYcWk82YgKzSNg xijgE/jIH1rvOqSZ8s/aMZC9jO1iIkYCzUgpA/g9l+pSF5GwBYOx2lrLAiZzE3nKsg5G GA3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=au7pmbd6; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id ay4-20020a5d9d84000000b0067b997b8b12si4536687iob.88.2022.07.15.07.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 07:25:32 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=au7pmbd6; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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 4CD7781118; Fri, 15 Jul 2022 16:25:12 +0200 (CEST) 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="au7pmbd6"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 407A581118; Fri, 15 Jul 2022 16:25:11 +0200 (CEST) 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-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) (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 8D62B81118 for ; Fri, 15 Jul 2022 16:25:06 +0200 (CEST) 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-x633.google.com with SMTP id w7so3358391ply.12 for ; Fri, 15 Jul 2022 07:25:06 -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=aQaX4258rFTXTFVQ01ZAB87u4TgPi8pZqYYB5qeGH1A=; b=au7pmbd6Rxy038k0/ZjwGcpmymY3hOW46eHZN2NT2bIAHtxISNiQEJPdMSvyxtfS+F A/QLO6tNdCfWYhhNGO7H+6G92YU3JuhVUQ8roCP4CfmCnTFAxH+d0LAr/s2pxcUdClpf flDlRr0uANI6hg+kEtf5SU9sFXC1kS4zC57v0SQM+684bWC4noz+O7AHOc0lOwe8NKuX 8QCIw9pTwMwjqStASYV88b87oBdOfU3ayPhtJziN5eIVYIUXEPIifzpLJtRVFTOAfKyz FIqi8ZkJES+xkJjcOCxpYobbc9XCVb39/0vSOGcmWoz5EAYuhzpAsyeh0+VHH7XmcqyL 1K5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=aQaX4258rFTXTFVQ01ZAB87u4TgPi8pZqYYB5qeGH1A=; b=mx0b0tQUdDs0RisjFzZqHAcpAbC3GWhr6cqXzsYFQcpvXIJMyn9bOeGiEdptgWFKhE 2V1dsGrkV4T01a9lXUg29IMMXlJ0lSu7fXSKhBoqND+cRxDM5WpbtkRa8/+uOAkv+5lQ YzBeVB/FzbOoa2XpAF7D1KZbDeUWw17Ag1M8ry0eAoRxMbNEhGDsYkgCATQCUW+kMHfr ih+MKhWa3hQV+kA4OiIEqhUDssrjV0l5Y6rKu5gQ32dN7v+epkx5MtHP1G23kwOOHjaI AzqSbHcNbFeGnSMPiRQConeShQ/7tQA877Emmeemn37GjBzZHyJpg0MJoTaWcCXfr6vH cLvQ== X-Gm-Message-State: AJIora/neoFaJk7WZZuDq0GluE2yYT0EaxnFmGqfEZWE8862p+WkA4iq awsAoCjTLhlZ+yZ47ysO2aFenE8wQZV5/Q== X-Received: by 2002:a17:90a:b114:b0:1ef:7d95:347 with SMTP id z20-20020a17090ab11400b001ef7d950347mr23030901pjq.137.1657895104528; Fri, 15 Jul 2022 07:25:04 -0700 (PDT) Received: from localhost.localdomain ([240d:1a:cf7:5800:82fa:5bff:fe4b:26b1]) by smtp.gmail.com with ESMTPSA id d22-20020aa797b6000000b0051c49fb62b7sm3891174pfq.165.2022.07.15.07.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jul 2022 07:25:04 -0700 (PDT) From: Masahisa Kojima To: u-boot@lists.denx.de Cc: Heinrich Schuchardt , Ilias Apalodimas , Simon Glass , Takahiro Akashi , Mark Kettenis , Masahisa Kojima Subject: [PATCH 3/9] eficonfig: add "Edit Boot Option" menu entry Date: Fri, 15 Jul 2022 23:27:37 +0900 Message-Id: <20220715142743.30137-4-masahisa.kojima@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220715142743.30137-1-masahisa.kojima@linaro.org> References: <20220715142743.30137-1-masahisa.kojima@linaro.org> 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.6 at phobos.denx.de X-Virus-Status: Clean This commit adds the menu entry to edit the existing BOOT#### variable contents. User selects the item from the boot option list, then user can edit the description, file path and optional_data. Note that automatically generated boot option entry by bootmenu to support the removable media device is filtered out and user can not edit the automatically generated entry. Signed-off-by: Masahisa Kojima --- Changes in v9: - add function comment Changes in v8: - fix menu header string - fix function and structure prefix to "eficonfig" Newly created in v7 cmd/eficonfig.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 235d5014c7..d923afe726 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -78,6 +78,17 @@ struct eficonfig_file_entry_data { u16 *file_name; }; +/** + * struct eficonfig_boot_selection_data - structure to be used to select the boot option entry + * + * @bootorder_index: index in the BootOrder variable + * @selected: pointer to store the selected index in the BootOrder variable + */ +struct eficonfig_boot_selection_data { + u16 bootorder_index; + int *selected; +}; + /** * eficonfig_print_msg() - print message * @@ -1246,6 +1257,196 @@ out: return ret; } +/** + * eficonfig_process_boot_selected() - handler to select boot option entry + * + * @data: pointer to the data for each entry + * Return: status code + */ +static efi_status_t eficonfig_process_boot_selected(void *data) +{ + struct eficonfig_boot_selection_data *info = data; + + if (info) + *info->selected = info->bootorder_index; + + return EFI_SUCCESS; +} + +/** + * eficonfig_show_boot_selection() - construct boot option menu entry + * + * @bootorder: pointer to the BootOrder variable + * @count: the number of BootOrder + * @selected: pointer to store the selected index of BootOrder variable + * Return: status code + */ +static efi_status_t eficonfig_show_boot_selection(u16 *bootorder, efi_uintn_t count, + int *selected) +{ + u32 i; + efi_status_t ret; + efi_uintn_t size, actual_count = 1; /* include "Quit" entry */ + void *load_option; + struct efi_load_option lo; + u16 varname[] = u"Boot####"; + struct eficonfig_item *menu_item, *iter; + + menu_item = calloc(count + 1, sizeof(struct eficonfig_item)); + if (!menu_item) { + ret = EFI_OUT_OF_RESOURCES; + goto out; + } + + iter = menu_item; + for (i = 0; i < count; i++) { + efi_create_indexed_name(varname, sizeof(varname), + "Boot", bootorder[i]); + load_option = efi_get_var(varname, &efi_global_variable_guid, &size); + if (!load_option) + continue; + + ret = efi_deserialize_load_option(&lo, load_option, &size); + if (ret != EFI_SUCCESS) { + log_warning("Invalid load option for %ls\n", varname); + free(load_option); + continue; + } + + if (size >= sizeof(efi_guid_t) && + !guidcmp(lo.optional_data, &efi_guid_bootmenu_auto_generated)) { + /* + * auto generated entry has GUID in optional_data, + * skip auto generated entry because it will be generated + * again even if it is edited or deleted. + */ + free(load_option); + continue; + } + + if (lo.attributes & LOAD_OPTION_ACTIVE) { + char *buf, *p; + struct eficonfig_boot_selection_data *info; + + info = calloc(1, sizeof(struct eficonfig_boot_selection_data)); + if (!info) { + free(load_option); + ret = EFI_OUT_OF_RESOURCES; + goto out; + } + + buf = calloc(1, utf16_utf8_strlen(lo.label) + 1); + if (!buf) { + free(load_option); + free(info); + ret = EFI_OUT_OF_RESOURCES; + goto out; + } + p = buf; + utf16_utf8_strcpy(&p, lo.label); + info->bootorder_index = i; + info->selected = selected; + iter->title = buf; + iter->func = eficonfig_process_boot_selected; + iter->data = info; + iter++; + actual_count++; + } + free(load_option); + } + + /* add "Quit" entry */ + iter->title = strdup("Quit"); + iter->func = eficonfig_process_quit; + iter->data = NULL; + + ret = eficonfig_process_common(menu_item, actual_count, " ** Select Boot Option **"); + +out: + iter = menu_item; + for (i = 0; i < actual_count; i++, iter++) { + free(iter->title); + free(iter->data); + } + + free(menu_item); + + return ret; +} + +/** + * eficonfig_process_edit_boot_option() - handler to edit boot option + * + * @data: pointer to the data for each entry + * Return: status code + */ +static efi_status_t eficonfig_process_edit_boot_option(void *data) +{ + u16 *bootorder; + efi_status_t ret; + efi_uintn_t num, size; + struct eficonfig_boot_option *bo = NULL; + + bootorder = efi_get_var(u"BootOrder", &efi_global_variable_guid, &size); + if (!bootorder) { + eficonfig_print_msg("BootOrder is not defined!"); + ret = EFI_NOT_FOUND; + return ret; + } + + num = size / sizeof(u16); + while (1) { + int selected; + void *load_option; + struct efi_load_option lo; + u16 varname[] = u"Boot####"; + + ret = eficonfig_show_boot_selection(bootorder, num, &selected); + if (ret != EFI_SUCCESS) + break; + + bo = calloc(1, sizeof(struct eficonfig_boot_option)); + if (!bo) { + ret = EFI_OUT_OF_RESOURCES; + goto out; + } + + bo->boot_index = selected; + efi_create_indexed_name(varname, sizeof(varname), + "Boot", bootorder[selected]); + load_option = efi_get_var(varname, &efi_global_variable_guid, &size); + if (!load_option) { + free(bo); + ret = EFI_NOT_FOUND; + goto out; + } + + ret = efi_deserialize_load_option(&lo, load_option, &size); + if (ret != EFI_SUCCESS) { + free(bo); + free(load_option); + goto out; + } + + ret = eficonfig_edit_boot_option(varname, bo, lo.label, lo.optional_data, + size, lo.file_path, + " ** Edit Boot Option ** "); + + free(load_option); + free(bo); + if (ret != EFI_SUCCESS && ret != EFI_ABORTED) + break; + } + +out: + free(bootorder); + + /* to stay the parent menu */ + ret = (ret == EFI_ABORTED) ? EFI_NOT_READY : ret; + + return ret; +} + /** * eficonfig_init() - do required initialization for eficonfig command * @@ -1275,6 +1476,7 @@ static efi_status_t eficonfig_init(void) static const struct eficonfig_item maintenance_menu_items[] = { {"Add Boot Option", eficonfig_process_add_boot_option}, + {"Edit Boot Option", eficonfig_process_edit_boot_option}, {"Quit", eficonfig_process_quit}, };