From patchwork Tue Jan 15 02:55:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 155613 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4390256jaa; Mon, 14 Jan 2019 19:04:03 -0800 (PST) X-Google-Smtp-Source: ALg8bN67lv9wAV8adJboVfoR8wIpyLxgH7x0MNW28j7pBHsRLPcZW+CGn0Z1AKQ3QlUeIy5rrzyd X-Received: by 2002:a50:8f86:: with SMTP id y6mr1643877edy.131.1547521443193; Mon, 14 Jan 2019 19:04:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547521443; cv=none; d=google.com; s=arc-20160816; b=iJzerw+Fzf5ZXC5FWtj7v1kJQihmR++lugdTQIxUwZ5bEYXRlYEyG3m8VZegB64VnC uaV3BCY6R6iGErQcAGoeCQKMTYw+YtvBt6e0vMsmxySH8pQ182Bk9uOtrvMJUJl9dPfr Fwnls7DZvRVeoeUmt898LvrEVmbUSBCQyi/otcTMRKwieNQgLA518YtSLTDaSjXooVcH 5/Ue8yMXurCuudhDAYI7kDv86L356UCkhn8FIRPvzS4lHHRsYfK2clIPh1W12MEtnRfs ywd9D9wSYxZBP1Ebrc2ZjeWDdOVuyPzC9TxKBOjr6SZrsRCGQBgh/KRR/WHEGxf8Rc+Q 3/SQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :cc:mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature; bh=hZUwT71gfMXxebhj8vjA1RVmLBZD3rgyVXJKa3dnP/c=; b=GwHPO5j4il17M6Zh7Usn0XMxqitQ/fI4IXdDopTpjixjMYTEQD73wkHoY/k3+LIB8p cbeZJtCDAlxeAEtGsCIg+PI8L548atNXnec4c97jrSj8tUGSdEk5OXl4GY2fUQFiquai hg/6rx7gs7BHPhF4/+Gvp7vDtskvZ6BXGvcow+zg8lIjeTBtQ/yc8qLhayz3u+hQaDxH eA2wPThAH0S/Bk0VnW45VNDrCsIbbs06k+DOgMSRJYTtYhKIAtrZae3JyMcCyPHedBPN NIrwNXdcl5qXzZxiB4tvf8l1WEO3uqvdm2mn7OsO57JWU5zSomyYwmV7vw7i+7bQ4hWG YmqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="UMLzJ8/M"; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id a18-v6si55441ejp.285.2019.01.14.19.04.02; Mon, 14 Jan 2019 19:04:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="UMLzJ8/M"; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.denx.de (Postfix, from userid 105) id B6AC1C221B9; Tue, 15 Jan 2019 03:01:29 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_BLOCKED, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3C7E6C2224A; Tue, 15 Jan 2019 03:01:26 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 23B7AC21F59; Tue, 15 Jan 2019 02:55:59 +0000 (UTC) Received: from mail-yb1-f195.google.com (mail-yb1-f195.google.com [209.85.219.195]) by lists.denx.de (Postfix) with ESMTPS id C2CC5C21D83 for ; Tue, 15 Jan 2019 02:55:54 +0000 (UTC) Received: by mail-yb1-f195.google.com with SMTP id 2so502725ybw.4 for ; Mon, 14 Jan 2019 18:55:54 -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=xkHHP3zn6zEoZ0ewqLyZMWIUdACBCGOn4VTxJNxw7uM=; b=UMLzJ8/MxpkrZuTqKgyglxT0ytEuSswTS/2SYcKoyz96Z2crUndmdDgncrbJwVvlTI +oOzJFJzd6Eizv5wvISAfrCv5UOO3d8jh+i8JaV9+q69UHA2vczZvEzqqcswuGxzuG8K grCDxgGw94Egy73xdGy+16TcZXPekdTsZOWfc= 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=xkHHP3zn6zEoZ0ewqLyZMWIUdACBCGOn4VTxJNxw7uM=; b=mRFr9cvAGXyzo408Fv8cdquuQPPjTxtRstwdkfgip8l6AwIZxBRuSL7gCqsCcs5vJ+ wG8DUGvj0ve47VvFSnIs122kymq/LAiF5Ajd0s0TLIQans/V+ZDmLnbpwkto60tE2isI dBVMUxY/GuVEpVyURLQEOzaXQD/dxAHUe38IvZgBJfLjVtchavh0++gJm7wxUuN1gMd8 NoAsxVWhvKRsExCFv+XkTM6bS1O3lIzIijxzLvwm0bmkfDhLjcCfQaHAY6+dqFR5/2o0 ysgcJVQ4/j9+XBBiFfwUydfS2m5VnJZuTtzKPODvS2BvGBAHUY/U/Mk7F6BZ8aM5Fw1r VT6g== X-Gm-Message-State: AJcUukeDHfbhhGmwCxKs/P861+s1u/YS9jwkC+G//R8c7GgamsSWozrI mQQGugt7ZNXX+1P667uaDbhmXQ== X-Received: by 2002:a25:d80f:: with SMTP id p15mr1293226ybg.66.1547520953744; Mon, 14 Jan 2019 18:55:53 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id x203sm697829ywd.41.2019.01.14.18.55.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 18:55:53 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de Date: Tue, 15 Jan 2019 11:55:21 +0900 Message-Id: <20190115025522.12060-9-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190115025522.12060-1-takahiro.akashi@linaro.org> References: <20190115025522.12060-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v4 8/9] cmd: efitool: export uefi variable helper functions X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Those function will be used for integration with 'env' command so as to handle uefi variables. Signed-off-by: AKASHI Takahiro --- cmd/efitool.c | 38 ++++++++++++++++++++++++++++++++++---- include/command.h | 4 ++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/cmd/efitool.c b/cmd/efitool.c index f06718ea580d..b8fe28c53aaf 100644 --- a/cmd/efitool.c +++ b/cmd/efitool.c @@ -67,7 +67,7 @@ static void dump_var_data(char *data, unsigned long len) * * efi_$guid_$varname = {attributes}(type)value */ -static int do_efi_dump_var(int argc, char * const argv[]) +static int _do_efi_dump_var(int argc, char * const argv[]) { char regex[256]; char * const regexlist[] = {regex}; @@ -130,6 +130,21 @@ static int do_efi_dump_var(int argc, char * const argv[]) return CMD_RET_SUCCESS; } +int do_efi_dump_var(int argc, char * const argv[]) +{ + efi_status_t r; + + /* Initialize EFI drivers */ + r = efi_init_obj_list(); + if (r != EFI_SUCCESS) { + printf("Error: Cannot set up EFI drivers, r = %lu\n", + r & ~EFI_ERROR_MASK); + return CMD_RET_FAILURE; + } + + return _do_efi_dump_var(argc, argv); +} + static int append_value(char **bufp, unsigned long *sizep, char *data) { char *tmp_buf = NULL, *new_buf = NULL, *value; @@ -227,7 +242,7 @@ out: return 0; } -static int do_efi_set_var(int argc, char * const argv[]) +static int _do_efi_set_var(int argc, char * const argv[]) { char *var_name, *value = NULL; efi_uintn_t size = 0; @@ -270,6 +285,21 @@ out: return ret; } +int do_efi_set_var(int argc, char * const argv[]) +{ + efi_status_t r; + + /* Initialize EFI drivers */ + r = efi_init_obj_list(); + if (r != EFI_SUCCESS) { + printf("Error: Cannot set up EFI drivers, r = %lu\n", + r & ~EFI_ERROR_MASK); + return CMD_RET_FAILURE; + } + + return _do_efi_set_var(argc, argv); +} + static int efi_get_handles_by_proto(efi_guid_t *guid, efi_handle_t **handlesp, int *num) { @@ -1016,9 +1046,9 @@ static int do_efitool(cmd_tbl_t *cmdtp, int flag, if (!strcmp(command, "boot")) return do_efi_boot_opt(argc, argv); else if (!strcmp(command, "dumpvar") || !strcmp(command, "dmpstore")) - return do_efi_dump_var(argc, argv); + return _do_efi_dump_var(argc, argv); else if (!strcmp(command, "setvar")) - return do_efi_set_var(argc, argv); + return _do_efi_set_var(argc, argv); else if (!strcmp(command, "devices")) return do_efi_show_devices(argc, argv); else if (!strcmp(command, "drivers")) diff --git a/include/command.h b/include/command.h index feddef300ccc..315e4b9aabfb 100644 --- a/include/command.h +++ b/include/command.h @@ -51,6 +51,10 @@ extern int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #if defined(CONFIG_CMD_BOOTEFI) extern int do_bootefi_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #endif +#if defined(CONFIG_CMD_EFITOOL) +int do_efi_dump_var(int argc, char * const argv[]); +int do_efi_set_var(int argc, char * const argv[]); +#endif /* common/command.c */ int _do_help (cmd_tbl_t *cmd_start, int cmd_items, cmd_tbl_t * cmdtp, int