From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0C74FC433EF for ; Mon, 7 Feb 2022 04:52:55 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2E0A183C22; Mon, 7 Feb 2022 05:52:53 +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="detrPdQj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 668A383C27; Mon, 7 Feb 2022 05:52:51 +0100 (CET) Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) (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 2C26C83C21 for ; Mon, 7 Feb 2022 05:52:47 +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=takahiro.akashi@linaro.org Received: by mail-pj1-x1034.google.com with SMTP id v5-20020a17090a4ec500b001b8b702df57so1852834pjl.2 for ; Sun, 06 Feb 2022 20:52:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:mail-followup-to:references :mime-version:content-disposition:in-reply-to; bh=5z8s/q3XW3Ov7FenJ3oCgb86h84zY3xXQIE7BmEzhPA=; b=detrPdQj9Vt4Nl3nha+O6Mq7uLvs09DyiRB15uuXT/cjzOifj9Ebgpb+HemvWjmLV2 9a7gdH5nKWBcGlb23tG65ahuWeT6X1dehFuvUwlJvy3ezFco2I+F/QzEJBQhFACyhpCE H0/gfkcNz8ZzcGKZW0yAwecdG9ICNCXyu2obFrFKQssvZd8CzyvbfP2Q4mpH2Mz3S3O4 /T1+p40j53OUVWjzEov8okOP17dx54LSXKf/mcXGLkr02lAszsrl8FM64M3+26+zTLuE wPQH26ossawVlYW2/Lz4jLTAN+UCkPZFdvb+6/gsk3r6nkx8ld8b3UMFU12VxLjG6fBq DbzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:references:mime-version:content-disposition :in-reply-to; bh=5z8s/q3XW3Ov7FenJ3oCgb86h84zY3xXQIE7BmEzhPA=; b=np09TO3P7+tt7FkwLKwGl1sFvqdGLxaz2/tJBYfhU7m/NKoObxbOrowO2Tcon4hoNB zrHyS1ZmHikczHkJYSPp5g0uKbid0u3WgAJjCuwKFy7J7/6g/+XQ4G+k3vCuIaQRmlXM 67HTCaSo1DP9fJ8AmVxpOHNtaHADon1ztTOEevsoXVsDwlnkbF3SIC4zH1ACaAi5vE17 HSYM0fabPZN36G2iB+djYHTesILmnblXeeVoyu2jkNrQ0+wauGYVUppYSEnC2GYlC4oN 7fHPrpCAjDZmBLM4JerGxShs8+7Vwiuxyuudagom7dx1wvJFqm352mVqXjY8unbp0YPG e3xg== X-Gm-Message-State: AOAM530GKhfr+5QWMeWgZTMYVdxKwXDrjRMVmNcCaFWdNW57SrprO5yQ 5mu10bbSXDmPqF8LzQq04wO03w== X-Google-Smtp-Source: ABdhPJyTIGKi0kJ9m9iEmwHFp7YiXShtENcKdO0/Kq61SDldTU3GiWDYrzw1VWN7xPVvcUHOUIRCTA== X-Received: by 2002:a17:902:e742:: with SMTP id p2mr14488467plf.130.1644209565203; Sun, 06 Feb 2022 20:52:45 -0800 (PST) Received: from laputa ([2400:4050:c3e1:100:ecd4:c151:c93a:2608]) by smtp.gmail.com with ESMTPSA id 17sm10547310pfl.175.2022.02.06.20.52.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 20:52:44 -0800 (PST) Date: Mon, 7 Feb 2022 13:52:39 +0900 From: AKASHI Takahiro To: Heinrich Schuchardt Cc: sjg@chromium.org, ilias.apalodimas@linaro.org, sughosh.ganu@linaro.org, masami.hiramatsu@linaro.org, mark.kettenis@xs4all.nl, u-boot@lists.denx.de, agraf@csgraf.de Subject: Re: [PATCH v10 4/9] doc: update UEFI document for usage of mkeficapsule Message-ID: <20220207045239.GB41683@laputa> Mail-Followup-To: AKASHI Takahiro , Heinrich Schuchardt , sjg@chromium.org, ilias.apalodimas@linaro.org, sughosh.ganu@linaro.org, masami.hiramatsu@linaro.org, mark.kettenis@xs4all.nl, u-boot@lists.denx.de, agraf@csgraf.de References: <20220201012740.63070-1-takahiro.akashi@linaro.org> <20220201012740.63070-5-takahiro.akashi@linaro.org> <2ea75091-b9d8-91a3-40de-668982e7a78e@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2ea75091-b9d8-91a3-40de-668982e7a78e@gmx.de> 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.5 at phobos.denx.de X-Virus-Status: Clean On Sat, Feb 05, 2022 at 10:14:06AM +0100, Heinrich Schuchardt wrote: > On 2/1/22 02:27, AKASHI Takahiro wrote: > > Now we can use mkeficapsule command instead of EDK-II's script > > to create a signed capsule file. So update the instruction for > > capsule authentication. > > > > Signed-off-by: AKASHI Takahiro > > Reviewed-by: Simon Glass > > Acked-by: Ilias Apalodimas > > This patch breaks 'make htmldocs' due to a couple of errors. Okay, I fixed it. -Takahiro Akashi > Best regards > > Heinrich > > > --- > > doc/develop/uefi/uefi.rst | 147 +++++++++++++++++++------------------- > > 1 file changed, 74 insertions(+), 73 deletions(-) > > > > diff --git a/doc/develop/uefi/uefi.rst b/doc/develop/uefi/uefi.rst > > index 43fb10f7978e..7e1eb8256259 100644 > > --- a/doc/develop/uefi/uefi.rst > > +++ b/doc/develop/uefi/uefi.rst > > @@ -284,37 +284,56 @@ Support has been added for the UEFI capsule update feature which > > enables updating the U-Boot image using the UEFI firmware management > > protocol (FMP). The capsules are not passed to the firmware through > > the UpdateCapsule runtime service. Instead, capsule-on-disk > > -functionality is used for fetching the capsule from the EFI System > > -Partition (ESP) by placing the capsule file under the > > -\EFI\UpdateCapsule directory. > > - > > -The directory \EFI\UpdateCapsule is checked for capsules only within the > > -EFI system partition on the device specified in the active boot option > > -determined by reference to BootNext variable or BootOrder variable processing. > > -The active Boot Variable is the variable with highest priority BootNext or > > -within BootOrder that refers to a device found to be present. Boot variables > > -in BootOrder but referring to devices not present are ignored when determining > > -active boot variable. > > -Before starting a capsule update make sure your capsules are installed in the > > -correct ESP partition or set BootNext. > > +functionality is used for fetching capsules from the EFI System > > +Partition (ESP) by placing capsule files under the directory:: > > + > > + \EFI\UpdateCapsule > > + > > +The directory is checked for capsules only within the > > +EFI system partition on the device specified in the active boot option, > > +which is determined by BootXXXX variable in BootNext, or if not, the highest > > +priority one within BootOrder. Any BootXXXX variables referring to devices > > +not present are ignored when determining the active boot option. > > + > > +Please note that capsules will be applied in the alphabetic order of > > +capsule file names. > > + > > +Creating a capsule file > > +*********************** > > + > > +A capsule file can be created by using tools/mkeficapsule. > > +To build this tool, enable:: > > + > > + CONFIG_TOOLS_MKEFICAPSULE=y > > + CONFIG_TOOLS_LIBCRYPTO=y > > + > > +Run the following command:: > > + > > +.. code-block:: console > > + > > + $ mkeficapsule \ > > + --index 1 --instance 0 \ > > + [--fit | --raw ] \ > > + > > > > Performing the update > > ********************* > > > > -Since U-boot doesn't currently support SetVariable at runtime there's a Kconfig > > -option (CONFIG_EFI_IGNORE_OSINDICATIONS) to disable the OsIndications variable > > -check. If that option is enabled just copy your capsule to \EFI\UpdateCapsule. > > +Put capsule files under the directory mentioned above. > > +Then, following the UEFI specification, you'll need to set > > +the EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED > > +bit in OsIndications variable with:: > > > > -If that option is disabled, you'll need to set the OsIndications variable with:: > > +.. code-block:: console > > > > => setenv -e -nv -bs -rt -v OsIndications =0x04 > > > > -Finally, the capsule update can be initiated either by rebooting the board, > > -which is the preferred method, or by issuing the following command:: > > +Since U-boot doesn't currently support SetVariable at runtime, its value > > +won't be taken over across the reboot. If this is the case, you can skip > > +this feature check with the Kconfig option (CONFIG_EFI_IGNORE_OSINDICATIONS) > > +set. > > > > - => efidebug capsule disk-update > > - > > -**The efidebug command is should only be used during debugging/development.** > > +Finally, the capsule update can be initiated by rebooting the board. > > > > Enabling Capsule Authentication > > ******************************* > > @@ -324,82 +343,64 @@ be updated by verifying the capsule signature. The capsule signature > > is computed and prepended to the capsule payload at the time of > > capsule generation. This signature is then verified by using the > > public key stored as part of the X509 certificate. This certificate is > > -in the form of an efi signature list (esl) file, which is embedded as > > -part of U-Boot. > > +in the form of an efi signature list (esl) file, which is embedded in > > +a device tree. > > > > The capsule authentication feature can be enabled through the > > following config, in addition to the configs listed above for capsule > > update:: > > > > CONFIG_EFI_CAPSULE_AUTHENTICATE=y > > - CONFIG_EFI_CAPSULE_KEY_PATH= > > > > The public and private keys used for the signing process are generated > > -and used by the steps highlighted below:: > > +and used by the steps highlighted below. > > > > - 1. Install utility commands on your host > > - * OPENSSL > > +1. Install utility commands on your host > > + * openssl > > * efitools > > > > - 2. Create signing keys and certificate files on your host > > +2. Create signing keys and certificate files on your host:: > > + > > +.. code-block:: console > > > > $ openssl req -x509 -sha256 -newkey rsa:2048 -subj /CN=CRT/ \ > > -keyout CRT.key -out CRT.crt -nodes -days 365 > > $ cert-to-efi-sig-list CRT.crt CRT.esl > > > > - $ openssl x509 -in CRT.crt -out CRT.cer -outform DER > > - $ openssl x509 -inform DER -in CRT.cer -outform PEM -out CRT.pub.pem > > - > > - $ openssl pkcs12 -export -out CRT.pfx -inkey CRT.key -in CRT.crt > > - $ openssl pkcs12 -in CRT.pfx -nodes -out CRT.pem > > - > > -The capsule file can be generated by using the GenerateCapsule.py > > -script in EDKII:: > > - > > - $ ./BaseTools/BinWrappers/PosixLike/GenerateCapsule -e -o \ > > - --monotonic-count --fw-version \ > > - --lsv --guid \ > > - e2bb9c06-70e9-4b14-97a3-5a7913176e3f --verbose \ > > - --update-image-index --signer-private-cert \ > > - /path/to/CRT.pem --trusted-public-cert \ > > - /path/to/CRT.pub.pem --other-public-cert /path/to/CRT.pub.pem \ > > - > > +3. Run the following command to create and sign the capsule file:: > > > > -Place the capsule generated in the above step on the EFI System > > -Partition under the EFI/UpdateCapsule directory > > +.. code-block:: console > > > > -Testing on QEMU > > -*************** > > + $ mkeficapsule --monotonic-count 1 \ > > + --private-key CRT.key \ > > + --certificate CRT.crt \ > > + --index 1 --instance 0 \ > > + [--fit | --raw ] \ > > + > > > > -Currently, support has been added on the QEMU ARM64 virt platform for > > -updating the U-Boot binary as a raw image when the platform is booted > > -in non-secure mode, i.e. with CONFIG_TFABOOT disabled. For this > > -configuration, the QEMU platform needs to be booted with > > -'secure=off'. The U-Boot binary placed on the first bank of the NOR > > -flash at offset 0x0. The U-Boot environment is placed on the second > > -NOR flash bank at offset 0x4000000. > > +4. Insert the signature list into a device tree in the following format:: > > > > -The capsule update feature is enabled with the following configuration > > -settings:: > > + { > > + signature { > > + capsule-key = [ ]; > > + } > > + ... > > + } > > > > - CONFIG_MTD=y > > - CONFIG_FLASH_CFI_MTD=y > > - CONFIG_CMD_MTDPARTS=y > > - CONFIG_CMD_DFU=y > > - CONFIG_DFU_MTD=y > > - CONFIG_PCI_INIT_R=y > > - CONFIG_EFI_CAPSULE_ON_DISK=y > > - CONFIG_EFI_CAPSULE_FIRMWARE_MANAGEMENT=y > > - CONFIG_EFI_CAPSULE_FIRMWARE=y > > - CONFIG_EFI_CAPSULE_FIRMWARE_RAW=y > > + You can do this manually with:: > > > > -In addition, the following config needs to be disabled(QEMU ARM specific):: > > +.. code-block:: console > > > > - CONFIG_TFABOOT > > + $ dtc -@ -I dts -O dtb -o signature.dtbo signature.dts > > + $ fdtoverlay -i orig.dtb -o new.dtb -v signature.dtbo > > > > -The capsule file can be generated by using the tools/mkeficapsule:: > > + where signature.dts looks like:: > > > > - $ mkeficapsule --raw --index 1 > > + &{/} { > > + signature { > > + capsule-key = /incbin/("CRT.esl"); > > + }; > > + }; > > > > Executing the boot manager > > ~~~~~~~~~~~~~~~~~~~~~~~~~~ >