From patchwork Tue Jan 15 02:55:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 155607 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4386636jaa; Mon, 14 Jan 2019 18:59:57 -0800 (PST) X-Google-Smtp-Source: ALg8bN5d+Mk4RVnEb9Jc4ijCyhNz4ks4Ffbel+VnIF4+g1IPU8KzZC7ag7Hu8uZydbpaOZdTk47H X-Received: by 2002:a17:906:90d9:: with SMTP id v25-v6mr1451343ejw.214.1547521197466; Mon, 14 Jan 2019 18:59:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547521197; cv=none; d=google.com; s=arc-20160816; b=k7Wubk5PCAR41YATeN9W65kvsz0zT0Go9vSHdMhW7eSAAdpNOjGozb3lruUsZSuhQP z2yiUfTm8LwDL5mLebWVl8WKpvVrbIb5/TE/rFMyaVMcZN23aJCfArQRNhUy8lAAt3F+ U+dqKUtnZV92+JtOVAcJFEb1a1zYnwfnF/QLYYS8WLIgVPRyqgEayR57y359pE/V1wHM 2qIhvT7ZMMfPxeFeWTzg344P412+ai0wUsaaJYYKKmgKS7ghfjOp6AwVtKjWoClmPMOe mOY8GbI8cosXd6wk2hBaCsSJifAgmPyKTE+yOh23fY0kpxAc9JrWMb61Mkz7TrEUYqpq Vwvg== 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:message-id:date:to:from:dkim-signature; bh=CCarfR6dkXiDATsTbrMvGbwF+s7Sv0baI2PYrFyio+M=; b=heQ/U/ZL+fRXNFe3vItOF4gEd9dAAIX8iAxM0tvr53P7VYzrABlnY1/QAoCS+2qToX jJdZtEro6Ym2RJfmhF2+DHT1Hs0Uga1WuSvNSFuF7sKKO8dPp3uatZKXkm+RCJ+y4WJ0 IE+yBzPS5ahS8cgsL8WARgWKCdn+w2cocMjJOYmSeHqQpfURl1g8CP3d2bPXgiot8hYI MV5pUafB6w2T/jfGrWuKiW1AFJd0DwBJno7xu2OgltotNJ5UN+bFeD43CpA2TO5FKb5U dcXC3p2pZOUpX7pG9hfr4q8y0lWJP2lNzd422FOTu5GdFx+FKckXB5ZR3dYpCLtFNMP+ emlw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Nsq3N/cR"; 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 r2-v6si1118713ejn.298.2019.01.14.18.59.57; Mon, 14 Jan 2019 18:59:57 -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="Nsq3N/cR"; 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 0E34CC21FD4; Tue, 15 Jan 2019 02:57:21 +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, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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 A0888C21D65; Tue, 15 Jan 2019 02:57:08 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id ADFFCC21D65; Tue, 15 Jan 2019 02:55:24 +0000 (UTC) Received: from mail-yw1-f65.google.com (mail-yw1-f65.google.com [209.85.161.65]) by lists.denx.de (Postfix) with ESMTPS id 9277EC21F9B for ; Tue, 15 Jan 2019 02:55:20 +0000 (UTC) Received: by mail-yw1-f65.google.com with SMTP id i73so517317ywg.3 for ; Mon, 14 Jan 2019 18:55:20 -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:mime-version :content-transfer-encoding; bh=wvhOhTsKxPaTSZfFLXCsZSc2h+WT2CkWNMmaas3FPCc=; b=Nsq3N/cRo7fnExzi3wv2jqDzUoK5Ic1BxpJGtEs1AcCJE/ht30abtBzftYMuuEnpNr YUJVx+/Y6MB8Dx4JXEoQD6qn+iU5sGINDKIWz4Cm9nLQyXJXwJ6S22V0w9V538nwkmaE geJQYKPBtke+33LAorKYomFyjMbhRC5u7u/GQ= 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:mime-version :content-transfer-encoding; bh=wvhOhTsKxPaTSZfFLXCsZSc2h+WT2CkWNMmaas3FPCc=; b=WcQOH/qqGmfuJNYwJ+MErnCwXoGmCGF3hyzuu2MBLzCvJN2A5AJnc0PPftpoTYbklF pzRTsCZVMgOgqiws1roT77FSD2kd6Wn1vJ9FPXnVLiILa4ah0+pvA3fM09T6u4X+0Hxz V76qUyaNjEXTBbZTgwnjy1KAMqgFQj47qJJUfuOzQK//XTVqG7DQWe3uBzlH+cojTWQ4 IYmiJv/ZGoE/x8BRoONDygLgCFy17Df5yreIQyZGvtPN6TfXOUVSKOTlV3mZY5sPsZMX be3+JAOvX2xXrz6KG68eI8MTvkXG90eg6XhwWsODa0s4ofdkBgPYWYUQsVJ02l2k1syi fqhg== X-Gm-Message-State: AJcUukcUNRaLFbBQuLV51zaqI8S//9Kqh+dGahcKFaR9KlZlQNbHwbyR 5rR558PPoF1DcUuTyDHpXLfNdQ== X-Received: by 2002:a81:650b:: with SMTP id z11mr1219546ywb.441.1547520919376; Mon, 14 Jan 2019 18:55:19 -0800 (PST) Received: from linaro.org ([121.95.100.191]) by smtp.googlemail.com with ESMTPSA id 77sm786646ywb.54.2019.01.14.18.55.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 Jan 2019 18:55:18 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, agraf@suse.de, xypron.glpk@gmx.de Date: Tue, 15 Jan 2019 11:55:13 +0900 Message-Id: <20190115025522.12060-1-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH v4 0/9] cmd: add efitool for efi environment 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" This patch set is a collection of patches to enhance efi user interfaces /commands. It will help improve user experience on efi boot and make it more usable *without* edk2's shell utility. Let's see how it works: => efitool boot add 1 SHELL mmc 0:1 /Shell.efi "" => efitool boot add 2 HELLO mmc 0:1 /hello.efi "" => efitool boot dump Boot0001: attributes: A-- (0x00000001) label: SHELL file_path: /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/SD(0)/SD(0)/HD(1,MBR,0x086246ba,0x800,0x40000)/\\Shell.efi data: Boot0002: attributes: A-- (0x00000001) label: HELLO file_path: /VenHw(e61d73b9-a384-4acc-aeab-82e828f3628b)/SD(0)/SD(0)/HD(1,MBR,0x086246ba,0x800,0x40000)/\\hello.efi data: => efitool boot order 1 2 => efitool boot order 1: Boot0001: SHELL 2: Boot0002: HELLO => run -e Boot0002 (or bootefi bootmgr - 2) ; '-' means no dtb specified WARNING: booting without device tree Booting: HELLO ## Starting EFI application at 000000007db8b040 ... Hello, world! ## Application terminated, r = 0 => env set -e PlatformLang en ; important! (or you can do "efitool setvar PlatformLang en") => env print -e Boot0001: {boot,run}(blob) 00000000: 01 00 00 00 68 00 53 00 ....h.S. 00000010: 48 00 45 00 4c 00 4c 00 H.E.L.L. 00000020: 00 00 01 04 14 00 b9 73 .......s 00000030: 1d e6 84 a3 cc 4a ae ab .....J.. 00000040: 82 e8 28 f3 62 8b 03 1a ..(.b... 00000050: 05 00 00 03 1a 05 00 00 ........ 00000060: 04 01 2a 00 01 00 00 00 ..*..... 00000070: 00 08 00 00 00 00 00 00 ........ 00000080: 00 00 04 00 00 00 00 00 ........ 00000090: ba 46 62 08 00 00 00 00 .Fb..... 000000a0: 00 00 00 00 00 00 00 00 ........ 000000b0: 01 01 04 04 1c 00 5c 00 ......\. 000000c0: 5c 00 53 00 68 00 65 00 \.S.h.e. 000000d0: 6c 00 6c 00 2e 00 65 00 l.l...e. 000000e0: 66 00 69 00 00 00 7f ff f.i.... 000000f0: 04 00 00 ... Boot0002: {boot,run}(blob) 00000000: 01 00 00 00 68 00 48 00 ....h.H. 00000010: 45 00 4c 00 4c 00 4f 00 E.L.L.O. 00000020: 00 00 01 04 14 00 b9 73 .......s 00000030: 1d e6 84 a3 cc 4a ae ab .....J.. 00000040: 82 e8 28 f3 62 8b 03 1a ..(.b... 00000050: 05 00 00 03 1a 05 00 00 ........ 00000060: 04 01 2a 00 01 00 00 00 ..*..... 00000070: 00 08 00 00 00 00 00 00 ........ 00000080: 00 00 04 00 00 00 00 00 ........ 00000090: ba 46 62 08 00 00 00 00 .Fb..... 000000a0: 00 00 00 00 00 00 00 00 ........ 000000b0: 01 01 04 04 1c 00 5c 00 ......\. 000000c0: 5c 00 68 00 65 00 6c 00 \.h.e.l. 000000d0: 6c 00 6f 00 2e 00 65 00 l.o...e. 000000e0: 66 00 69 00 00 00 7f ff f.i.... 000000f0: 04 00 00 ... BootOrder: {boot,run}(blob) 00000000: 01 00 02 00 .... OsIndicationsSupported: {ro,boot}(blob) 00000000: 00 00 00 00 00 00 00 00 ........ PlatformLang: {boot,run}(blob) 00000000: 65 6e en => run -e Boot0001 or bootefi bootmgr (UEFI shell ...) "setvar" command now supports efi shell-like syntax: => env set -e foo =S\"akashi\" =0x012345 =Habcdef => env print -e foo foo: {boot,run}(blob) 00000000: 61 6b 61 73 68 69 45 23 akashiE# 00000010: 01 00 ab cd ef ..... Other useful sub commands are: => efitool devices ; print uefi devices => efitool drivers ; print uefi drivers => efitool dh ; print uefi handles => efitool images ; print loaded images => efitool memmap ; dump uefi memory map Enjoy! -Takahiro Akashi Changes in v4 (Jan 15, 2019) * rename the command name from efishell to efitool * use efi_uintn_t for "size" if appropriate * correct a help text for "boot add" sub-command * "boot" sub-command always takes a hexadecimal number * use systab.boottime directly instead of a local variable, bs * fix a bug in "setvar" sub-command * fix a bug in "devices" and "dh" sub-command * fix a bug in "memmap" sub-command * add "boot next" sub-command to set BootNext variable * "drivers" sub-command prints more useful info, including a driver's name which originates from a corresponding u-boot efi driver * "dh" sub-commands prints more useful info, including a list of protocols which are bound to a given handle Changes in v3 (Dec 18, 2018) * split v2 into two separate patch series * add CONFIG_CMD_EFISHELL to enable/disable efishell command * add missing free() at several places in efishell command Changes in v2 (Nov 5, 2018) * modify efi_dp_from_name() for use in efishell * rename efi_marshal_load_option() to efi_serialize_load_option(), taking a "struct efi_load_option" as an argument * improve a format in dumping uefi variables * enhance a setvar syntax as efi's shell does * change a syntax from "bootefi bootmgr -2" to "bootefi bootmgr - 2" * add -e option to run command * add -e option to env command * add more sub-commands AKASHI Takahiro (9): cmd: add efitool command cmd: efitool: add devices command efi_driver: add name to driver binding protocol cmd: efitool: add drivers command cmd: efitool: add dh command cmd: efitool: add images command cmd: efitool: add memmap command cmd: efitool: export uefi variable helper functions cmd: env: add "-e" option for handling UEFI variables cmd/Kconfig | 10 + cmd/Makefile | 1 + cmd/efitool.c | 1103 +++++++++++++++++++++++++++++++++++ cmd/nvedit.c | 61 +- include/command.h | 4 + include/efi_driver.h | 1 + lib/efi_driver/efi_uclass.c | 1 + 7 files changed, 1179 insertions(+), 2 deletions(-) create mode 100644 cmd/efitool.c