From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: u-boot@lists.denx.de
Subject: [PATCH v5 15/17] tools: add mkeficapsule command for UEFI capsule update
Date: Mon, 31 Aug 2020 13:54:27 +0900 [thread overview]
Message-ID: <20200831045427.GA751239@laputa> (raw)
In-Reply-To: <83576d5c-5860-a7ec-466a-99755e0fde20@gmx.de>
On Fri, Aug 28, 2020 at 05:58:00AM +0200, Heinrich Schuchardt wrote:
> On 8/3/20 7:43 AM, AKASHI Takahiro wrote:
> > This is a utility mainly for test purpose.
> > mkeficapsule -f: create a test capsule file for FIT image firmware
> >
> > Having said that, you will be able to customize the code to fit
> > your specific requirements for your platform.
> >
> > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
> > ---
> > tools/Makefile | 3 +
> > tools/mkeficapsule.c | 237 +++++++++++++++++++++++++++++++++++++++++++
> > 2 files changed, 240 insertions(+)
> > create mode 100644 tools/mkeficapsule.c
> >
> > diff --git a/tools/Makefile b/tools/Makefile
> > index 51123fd92983..153235612997 100644
> > --- a/tools/Makefile
> > +++ b/tools/Makefile
> > @@ -218,6 +218,9 @@ hostprogs-$(CONFIG_MIPS) += mips-relocs
> > hostprogs-$(CONFIG_ASN1_COMPILER) += asn1_compiler
> > HOSTCFLAGS_asn1_compiler.o = -idirafter $(srctree)/include
> >
> > +# TODO: only build this for capsule pytest
>
> Wouldn't the user need the mkeficapsule tool for developing capsules
> anyway? So why would you want to restrict this to testing?
Indeed.
Originally, this command was intended to be used in testing
capsule update for 'variables' and had bunch of test-specific features.
I will drop this line.
> > +hostprogs-$(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) += mkeficapsule
> > +
> > # We build some files with extra pedantic flags to try to minimize things
> > # that won't build on some weird host compiler -- though there are lots of
> > # exceptions for files that aren't complaint.
> > diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c
> > new file mode 100644
> > index 000000000000..93f22192fdb4
> > --- /dev/null
> > +++ b/tools/mkeficapsule.c
> > @@ -0,0 +1,237 @@
> > +// SPDX-License-Identifier: GPL-2.0
> > +/*
> > + * Copyright 2018 Linaro Limited
> > + * Author: AKASHI Takahiro
> > + */
> > +
> > +#include <getopt.h>
> > +#include <malloc.h>
> > +#include <stdbool.h>
> > +#include <stdio.h>
> > +#include <stdlib.h>
> > +#include <string.h>
> > +#include <linux/types.h>
> > +#include <sys/stat.h>
> > +#include <sys/types.h>
> > +
> > +typedef __u8 u8;
> > +typedef __u16 u16;
> > +typedef __u32 u32;
> > +typedef __u64 u64;
> > +typedef __s16 s16;
> > +typedef __s32 s32;
> > +
> > +#define aligned_u64 __aligned_u64
> > +
> > +#ifndef __packed
> > +#define __packed __attribute__((packed))
> > +#endif
> > +
> > +#include <efi.h>
> > +#include <efi_api.h>
> > +
> > +static const char *tool_name = "mkeficapsule";
> > +
> > +efi_guid_t efi_guid_fm_capsule = EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID;
> > +efi_guid_t efi_guid_image_type_uboot_fit =
> > + EFI_FIRMWARE_IMAGE_TYPE_UBOOT_FIT_GUID;
> > +efi_guid_t efi_guid_image_type_uboot_raw =
> > + EFI_FIRMWARE_IMAGE_TYPE_UBOOT_RAW_GUID;
> > +
> > +static struct option options[] = {
> > + {"fit", required_argument, NULL, 'f'},
> > + {"raw", required_argument, NULL, 'r'},
> > + {"index", required_argument, NULL, 'i'},
> > + {"instance", required_argument, NULL, 'I'},
> > + {"version", required_argument, NULL, 'v'},
> > + {"help", no_argument, NULL, 'h'},
> > + {NULL, 0, NULL, 0},
> > +};
> > +
> > +static void print_usage(void)
> > +{
> > + printf("Usage: %s [options] <output file>\n"
> > + "Options:\n"
> > + "\t--fit <fit image> new FIT image file\n"
> > + "\t--raw <raw image> new raw image file\n"
> > + "\t--index <index> update image index\n"
> > + "\t--instance <instance> update hardware instance\n"
> > + "\t--version <version> firmware version\n"
> > + "\t--help print a help message\n",
> > + tool_name);
> > +}
> > +
> > +static int create_fwbin(char *path, char *bin, efi_guid_t *guid,
> > + unsigned long version, unsigned long index,
> > + unsigned long instance)
> > +{
> > + struct efi_capsule_header header;
> > + struct efi_firmware_management_capsule_header capsule;
> > + struct efi_firmware_management_capsule_image_header image;
> > + FILE *f, *g;
> > + struct stat bin_stat;
> > + u8 *data;
> > + size_t size;
> > +
> > +#ifdef DEBUG
> > + printf("For output: %s\n", path);
> > + printf("\tbin: %s\n\ttype: %pUl\n" bin, guid);
> > + printf("\tversion: %ld\n\tindex: %ld\n\tinstance: %ld\n",
> > + version, index, instance);
> > +#endif
> > +
> > + g = fopen(bin, "r");
> > + if (!g) {
> > + printf("cannot open %s\n", bin);
> > + return -1;
> > + }
> > + if (stat(bin, &bin_stat) < 0) {
> > + printf("cannot determine the size of %s\n", bin);
> > + goto err_1;
> > + }
> > + data = malloc(bin_stat.st_size);
> > + if (!data) {
> > + printf("cannot allocate memory: %lx\n", bin_stat.st_size);
> > + goto err_1;
> > + }
> > + f = fopen(path, "w");
> > + if (!f) {
> > + printf("cannot open %s\n", path);
> > + goto err_2;
> > + }
> > + header.capsule_guid = efi_guid_fm_capsule;
> > + header.header_size = sizeof(header);
> > + header.flags = CAPSULE_FLAGS_PERSIST_ACROSS_RESET; /* TODO */
>
> This TODO needs some description in the comment.
Sure.
The intent here was that any values in flags would be ignored
under the current implementation (as mentioned in TODO in the cover letter).
-Takahiro Akashi
>
> Best regards
>
> Heinrich
>
> > + header.capsule_image_size = sizeof(header)
> > + + sizeof(capsule) + sizeof(u64)
> > + + sizeof(image)
> > + + bin_stat.st_size;
> > +
> > + size = fwrite(&header, 1, sizeof(header), f);
> > + if (size < sizeof(header)) {
> > + printf("write failed (%lx)\n", size);
> > + goto err_3;
> > + }
> > +
> > + capsule.version = 0x00000001;
> > + capsule.embedded_driver_count = 0;
> > + capsule.payload_item_count = 1;
> > + capsule.item_offset_list[0] = sizeof(capsule) + sizeof(u64);
> > + size = fwrite(&capsule, 1, sizeof(capsule) + sizeof(u64), f);
> > + if (size < (sizeof(capsule) + sizeof(u64))) {
> > + printf("write failed (%lx)\n", size);
> > + goto err_3;
> > + }
> > +
> > + image.version = version;
> > + memcpy(&image.update_image_type_id, guid, sizeof(*guid));
> > + image.update_image_index = index;
> > + image.update_image_size = bin_stat.st_size;
> > + image.update_vendor_code_size = 0; /* none */
> > + image.update_hardware_instance = instance;
> > +
> > + size = fwrite(&image, 1, sizeof(image), f);
> > + if (size < sizeof(image)) {
> > + printf("write failed (%lx)\n", size);
> > + goto err_3;
> > + }
> > + size = fread(data, 1, bin_stat.st_size, g);
> > + if (size < bin_stat.st_size) {
> > + printf("read failed (%lx)\n", size);
> > + goto err_3;
> > + }
> > + size = fwrite(data, 1, bin_stat.st_size, f);
> > + if (size < bin_stat.st_size) {
> > + printf("write failed (%lx)\n", size);
> > + goto err_3;
> > + }
> > +
> > + fclose(f);
> > + fclose(g);
> > + free(data);
> > +
> > + return 0;
> > +
> > +err_3:
> > + fclose(f);
> > +err_2:
> > + free(data);
> > +err_1:
> > + fclose(g);
> > +
> > + return -1;
> > +}
> > +
> > +/*
> > + * Usage:
> > + * $ mkeficapsule -f <firmware binary> <output file>
> > + */
> > +int main(int argc, char **argv)
> > +{
> > + char *file;
> > + efi_guid_t *guid;
> > + unsigned long index, instance, version;
> > + int c, idx;
> > +
> > + file = NULL;
> > + guid = NULL;
> > + index = 0;
> > + instance = 0;
> > + version = 0;
> > + for (;;) {
> > + c = getopt_long(argc, argv, "f:r:i:I:v:h", options, &idx);
> > + if (c == -1)
> > + break;
> > +
> > + switch (c) {
> > + case 'f':
> > + if (file) {
> > + printf("Image already specified\n");
> > + return -1;
> > + }
> > + file = optarg;
> > + guid = &efi_guid_image_type_uboot_fit;
> > + break;
> > + case 'r':
> > + if (file) {
> > + printf("Image already specified\n");
> > + return -1;
> > + }
> > + file = optarg;
> > + guid = &efi_guid_image_type_uboot_raw;
> > + break;
> > + case 'i':
> > + index = strtoul(optarg, NULL, 0);
> > + break;
> > + case 'I':
> > + instance = strtoul(optarg, NULL, 0);
> > + break;
> > + case 'v':
> > + version = strtoul(optarg, NULL, 0);
> > + break;
> > + case 'h':
> > + print_usage();
> > + return 0;
> > + }
> > + }
> > +
> > + /* need a output file */
> > + if (argc != optind + 1) {
> > + print_usage();
> > + return -1;
> > + }
> > +
> > + /* need a fit image file or raw image file */
> > + if (!file) {
> > + print_usage();
> > + return -1;
> > + }
> > +
> > + if (create_fwbin(argv[optind], file, guid, version, index, instance)
> > + < 0) {
> > + printf("Creating firmware capsule failed\n");
> > + return -1;
> > + }
> > +
> > + return 0;
> > +}
> >
>
next prev parent reply other threads:[~2020-08-31 4:54 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 5:43 [PATCH v5 00/17] efi_loader: add capsule update support AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 01/17] dfu: rename dfu_tftp_write() to dfu_write_by_name() AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 02/17] dfu: modify an argument type for an address AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 03/17] common: update: add a generic interface for FIT image AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 04/17] dfu: export dfu_list AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 05/17] efi_loader: add option to initialise EFI subsystem early AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 06/17] efi_loader: add efi_create_indexed_name() AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 07/17] efi_loader: define UpdateCapsule api AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 08/17] efi_loader: capsule: add capsule_on_disk support AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 09/17] efi_loader: capsule: add memory range capsule definitions AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 10/17] efi_loader: capsule: support firmware update AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 11/17] efi_loader: add firmware management protocol for FIT image AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 12/17] dfu: add dfu_write_by_alt() AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 13/17] efi_loader: add firmware management protocol for raw image AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 14/17] cmd: add "efidebug capsule" command AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 15/17] tools: add mkeficapsule command for UEFI capsule update AKASHI Takahiro
2020-08-28 3:58 ` Heinrich Schuchardt
2020-08-31 4:54 ` AKASHI Takahiro [this message]
2020-08-03 5:43 ` [PATCH v5 16/17] test/py: add a test for uefi firmware update capsule of FIT image AKASHI Takahiro
2020-08-31 11:44 ` Heinrich Schuchardt
2020-09-01 5:20 ` AKASHI Takahiro
2020-08-03 5:43 ` [PATCH v5 17/17] test/py: add a test for uefi firmware update capsule of raw image AKASHI Takahiro
2020-08-28 4:07 ` Heinrich Schuchardt
2020-08-31 5:15 ` AKASHI Takahiro
2020-08-31 11:45 ` Heinrich Schuchardt
2020-08-17 10:42 ` [PATCH v5 00/17] efi_loader: add capsule update support Heinrich Schuchardt
2020-08-25 5:42 ` AKASHI Takahiro
2020-08-31 4:32 ` AKASHI Takahiro
2020-08-31 20:15 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200831045427.GA751239@laputa \
--to=takahiro.akashi@linaro.org \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox