November 2020 - U-Boot

[PATCH v5] net: tftp: Add client support for RFC 7440
by Ramon Fried 17 Feb '21

17 Feb '21

Add support for RFC 7440: "TFTP Windowsize Option". This optional feature allows the client and server to negotiate a window size of consecutive blocks to send as an alternative for replacing the single-block lockstep schema. windowsize can be defined statically during compilation by setting CONFIG_TFTP_WINDOWSIZE, or defined in runtime by setting an environment variable: "tftpwindowsize" If not defined, the windowsize is set to 1, meaning that it behaves as it was never defined. Choosing the appropriate windowsize depends on the specific network topology, underlying NIC. You should test various windowsize scenarios and see which best work for you. Setting a windowsize too big can actually decreases performance. Signed-off-by: Ramon Fried <rfried.dev(a)gmail.com> Reviewed-by: Marek Vasut <marex(a)denx.de> --- v2: * Don't send windowsize option on tftpput, as it's not implemented yet. * Don't send NACK for every out of order block that arrives, one nack is enough. v3: * Add option CONFIG_TFTP_WINDOWSIZE to kconfig with default 1. * Fixed some spelling errors. * Took assignment out of a loop. * simplified variable increment. v4: * send ack for last packet, so the server can finish the tranfer gracefully and not in timeout. v5: * rebase the patch on top of latest tftp changes. * Fix wraparound issue in tftp_cur_block increment. * Change strcmp to strcasecmp README | 5 ++++ net/Kconfig | 9 ++++++ net/tftp.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 86 insertions(+), 7 deletions(-) diff --git a/README b/README index 2384966a39..2ebf664848 100644 --- a/README +++ b/README @@ -3473,6 +3473,11 @@ List of environment variables (most likely not complete): downloads succeed with high packet loss rates, or with unreliable TFTP servers or client hardware. + tftpwindowsize - if this is set, the value is used for TFTP's + window size as described by RFC 7440. + This means the count of blocks we can receive before + sending ack to server. + vlan - When set to a value < 4095 the traffic over Ethernet is encapsulated/received over 802.1q VLAN tagged frames. diff --git a/net/Kconfig b/net/Kconfig index ac6d0cf8a6..7916ae305f 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -49,4 +49,13 @@ config TFTP_BLOCKSIZE almost-MTU block sizes. You can also activate CONFIG_IP_DEFRAG to set a larger block. +config TFTP_WINDOWSIZE + int "TFTP window size" + default 1 + help + Default TFTP window size. + RFC7440 defines an optional window size of transmits, + before an ack response is required. + The default TFTP implementation implies a window size of 1. + endif # if NET diff --git a/net/tftp.c b/net/tftp.c index c05b7b5532..84e970bec1 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -5,7 +5,6 @@ * Copyright 2011 Comelit Group SpA, * Luca Ceresoli <luca.ceresoli(a)comelit.it> */ - #include <common.h> #include <command.h> #include <efi_loader.h> @@ -98,6 +97,12 @@ static int tftp_tsize; /* The number of hashes we printed */ static short tftp_tsize_num_hash; #endif +/* The window size negotiated */ +static ushort tftp_windowsize; +/* Next block to send ack to */ +static ushort tftp_next_ack; +/* Last nack block we send */ +static ushort tftp_last_nack; #ifdef CONFIG_CMD_TFTPPUT /* 1 if writing, else 0 */ static int tftp_put_active; @@ -138,8 +143,19 @@ static char tftp_filename[MAX_LEN]; * (but those using CONFIG_IP_DEFRAG may want to set a larger block in cfg file) */ +/* When windowsize is defined to 1, + * tftp behaves the same way as it was + * never declared + */ +#ifdef CONFIG_TFTP_WINDOWSIZE +#define TFTP_WINDOWSIZE CONFIG_TFTP_WINDOWSIZE +#else +#define TFTP_WINDOWSIZE 1 +#endif + static unsigned short tftp_block_size = TFTP_BLOCK_SIZE; static unsigned short tftp_block_size_option = CONFIG_TFTP_BLOCKSIZE; +static unsigned short tftp_window_size_option = TFTP_WINDOWSIZE; static inline int store_block(int block, uchar *src, unsigned int len) { @@ -356,6 +372,14 @@ static void tftp_send(void) /* try for more effic. blk size */ pkt += sprintf((char *)pkt, "blksize%c%d%c", 0, tftp_block_size_option, 0); + + /* try for more effic. window size. + * Implemented only for tftp get. + * Don't bother sending if it's 1 + */ + if (tftp_state == STATE_SEND_RRQ && tftp_window_size_option > 1) + pkt += sprintf((char *)pkt, "windowsize%c%d%c", + 0, tftp_window_size_option, 0); len = pkt - xp; break; @@ -550,7 +574,17 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, (char *)pkt + i + 6, tftp_tsize); } #endif + if (strcasecmp((char *)pkt + i, "windowsize") == 0) { + tftp_windowsize = + simple_strtoul((char *)pkt + i + 11, + NULL, 10); + debug("windowsize = %s, %d\n", + (char *)pkt + i + 11, tftp_windowsize); + } } + + tftp_next_ack = tftp_windowsize; + #ifdef CONFIG_CMD_TFTPPUT if (tftp_put_active && tftp_state == STATE_OACK) { /* Get ready to send the first block */ @@ -564,7 +598,28 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, if (len < 2) return; len -= 2; - tftp_cur_block = ntohs(*(__be16 *)pkt); + + if (ntohs(*(__be16 *)pkt) != (ushort)(tftp_cur_block + 1)) { + debug("Received unexpected block: %d, expected: %d\n", + ntohs(*(__be16 *)pkt), + (ushort)(tftp_cur_block + 1)); + /* + * If one packet is dropped most likely + * all other buffers in the window + * that will arrive will cause a sending NACK. + * This just overwellms the server, let's just send one. + */ + if (tftp_last_nack != tftp_cur_block) { + tftp_send(); + tftp_last_nack = tftp_cur_block; + tftp_next_ack = (ushort)(tftp_cur_block + + tftp_windowsize); + } + break; + } + + tftp_cur_block++; + tftp_cur_block %= TFTP_SEQUENCE_SIZE; if (tftp_state == STATE_SEND_RRQ) debug("Server did not acknowledge any options!\n"); @@ -606,10 +661,15 @@ static void tftp_handler(uchar *pkt, unsigned dest, struct in_addr sip, * Acknowledge the block just received, which will prompt * the remote for the next one. */ - tftp_send(); + if (tftp_cur_block == tftp_next_ack) { + tftp_send(); + tftp_next_ack += tftp_windowsize; + } - if (len < tftp_block_size) + if (len < tftp_block_size) { + tftp_send(); tftp_complete(); + } break; case TFTP_ERROR: @@ -683,6 +743,10 @@ void tftp_start(enum proto_t protocol) if (ep != NULL) tftp_block_size_option = simple_strtol(ep, NULL, 10); + ep = env_get("tftpwindowsize"); + if (ep != NULL) + tftp_window_size_option = simple_strtol(ep, NULL, 10); + ep = env_get("tftptimeout"); if (ep != NULL) timeout_ms = simple_strtol(ep, NULL, 10); @@ -704,8 +768,8 @@ void tftp_start(enum proto_t protocol) } #endif - debug("TFTP blocksize = %i, timeout = %ld ms\n", - tftp_block_size_option, timeout_ms); + debug("TFTP blocksize = %i, TFTP windowsize = %d timeout = %ld ms\n", + tftp_block_size_option, tftp_window_size_option, timeout_ms); tftp_remote_ip = net_server_ip; if (!net_parse_bootfile(&tftp_remote_ip, tftp_filename, MAX_LEN)) { @@ -801,7 +865,8 @@ void tftp_start(enum proto_t protocol) tftp_our_port = simple_strtol(ep, NULL, 10); #endif tftp_cur_block = 0; - + tftp_windowsize = 1; + tftp_last_nack = 0; /* zero out server ether in case the server ip has changed */ memset(net_server_ethaddr, 0, 6); /* Revert tftp_block_size to dflt */ -- 2.27.0

4 10

[PATCH 0/4] common: Drop remaining includes in common.h (part A)
by Simon Glass 15 Feb '21

15 Feb '21

2 6

Boot problems imx8mp_evk
by Peter Bergin 12 Feb '21

12 Feb '21

Hi, I'm following the README (https://gitlab.denx.de/u-boot/u-boot/-/tree/master/board/freescale/imx8mp_e…) to bring up u-boot on a imx8mp EVK board. My boot ends up in this on the console: U-Boot SPL 2020.10-rc5-00049-gd44d46e9fa (Sep 30 2020 - 11:46:20 +0200) Normal Boot WDT: Started with servicing (60s timeout) Trying to boot from BOOTROM image offset 0x8000, pagesize 0x200, ivt offset 0x0 Can't support legacy image SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### Any ideas what is going wrong? How to debug further? Thanks, /Peter

3 5

[PATCH 1/4] configs: stm32mp1: enable fastboot support of eMMC boot partition
by Patrick Delaunay 09 Feb '21

09 Feb '21

From: Jean-Philippe ROMAIN <jean-philippe.romain(a)st.com> Activate fastboot support on boot partition for eMMC, mmc1 device on STMicroelectronics board (EV1). Signed-off-by: Jean-Philippe ROMAIN <jean-philippe.romain(a)st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- configs/stm32mp15_basic_defconfig | 5 +++++ configs/stm32mp15_trusted_defconfig | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/configs/stm32mp15_basic_defconfig b/configs/stm32mp15_basic_defconfig index a8c4112dbe..fc3d2cc4fb 100644 --- a/configs/stm32mp15_basic_defconfig +++ b/configs/stm32mp15_basic_defconfig @@ -80,6 +80,11 @@ CONFIG_FASTBOOT_USB_DEV=1 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_GPIO_HOG=y +CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y +CONFIG_FASTBOOT_MMC_BOOT1_NAME="mmc1boot0" +CONFIG_FASTBOOT_MMC_BOOT2_NAME="mmc1boot1" +CONFIG_FASTBOOT_MMC_USER_SUPPORT=y +CONFIG_FASTBOOT_MMC_USER_NAME="mmc1" CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y CONFIG_DM_I2C=y diff --git a/configs/stm32mp15_trusted_defconfig b/configs/stm32mp15_trusted_defconfig index 0792884a9d..bfe9e6b06c 100644 --- a/configs/stm32mp15_trusted_defconfig +++ b/configs/stm32mp15_trusted_defconfig @@ -60,6 +60,11 @@ CONFIG_FASTBOOT_USB_DEV=1 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_GPIO_HOG=y +CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y +CONFIG_FASTBOOT_MMC_BOOT1_NAME="mmc1boot0" +CONFIG_FASTBOOT_MMC_BOOT2_NAME="mmc1boot1" +CONFIG_FASTBOOT_MMC_USER_SUPPORT=y +CONFIG_FASTBOOT_MMC_USER_NAME="mmc1" CONFIG_DM_HWSPINLOCK=y CONFIG_HWSPINLOCK_STM32=y CONFIG_DM_I2C=y -- 2.17.1

3 11

[PATCH v2 0/3] video: sunxi: Convert DM_VIDEO
by Jagan Teki 04 Feb '21

04 Feb '21

These series supports DM_VIDEO conversation for missing sunxi platforms. Separate splash screen support is required since the video log support in legacy drivers are not supporting with driver mode video. Dependencies: http://patchwork.ozlabs.org/project/uboot/list/?series=182476 http://patchwork.ozlabs.org/project/uboot/list/?series=182477 http://patchwork.ozlabs.org/project/uboot/list/?series=182478 Changes for v2: - new splash screen support patches Any inputs? Jagan. Jagan Teki (3): logos: Add sunxi logo sunxi: Enable splash screen support video: sunxi_display: Convert to DM_VIDEO arch/arm/mach-sunxi/Kconfig | 4 +- drivers/video/sunxi/sunxi_display.c | 264 ++++++++++++++++------------ include/configs/sunxi-common.h | 26 ++- scripts/config_whitelist.txt | 1 - tools/logos/sunxi.bmp | Bin 0 -> 11018 bytes 5 files changed, 167 insertions(+), 128 deletions(-) create mode 100644 tools/logos/sunxi.bmp -- 2.25.1

5 10

Intermittent failure with test_efi_selftest_text_input
by Simon Glass 02 Feb '21

02 Feb '21

Hi Heinrich, I am seeing a failure in gitlab every now and then. Here is an example of a build that failed and then succeeded on retry: https://gitlab.denx.de/u-boot/custodians/u-boot-dm/-/jobs/149201 Here's the failing trace: https://pastebin.com/bdu6jmVy Do you have any ideas? Regards, Simon

3 4

[PATCH 00/13] Nokia RX-51: Fix USB TTY console and enable it
by Pali Rohár 01 Feb '21

01 Feb '21

This patch series fix usbtty code (serial console via USB peripheral mode), fix underlying musb peripheral code, fix compilation of CONFIG_USB_DEVICE (used by usbtty), remove unused Nokia RX-51 code to decrease size of U-Boot binary and finally enable usbtty serial console for Nokia RX-51. With this patch series debugging of Nokia RX-51 can be done also via USB serial console. On computer this serial console is accessible via /dev/ttyACM0 device. With current implementation there is an issue in musb driver that it loose receiving bytes from USB bus when too many a characters are send over USB tty from computer. Typing on keyboard to kermit terminal connected to /dev/ttyACM0 is working fine. But pasting more more bytes to terminal cause data lost on receiving side. I do not know where is the issue or how to fix it (it looks like that data are lost at low level when reading them from msub FIFO hardware) but typing on keyboard is working fine. This is rather issue for sending files via x/y/z-modem or kermit protocol. Currently U-Boot is not able to receive any file via usbtty with musb driver due to this issue. Pali Rohár (13): serial: usbtty: Fix puts function usb: musb: Fix compilation of gadget code usb: musb: Always clear the data toggle bit when configuring ep usb: musb: Fix configuring FIFO for endpoints usb: musb: Read value of PERI_RXCSR to 16bit variable usb: musb: Fix transmission of bigger buffers usb: gadget: Do not export usbd_device_* arrays usb: gadget: Use dbg_ep0() macro instead of serial_printf() arm: omap3: Compile lowlevel_init() function only when it is used arm: omap3: Compile s_init() function only when it is used Nokia RX-51: Remove function set_muxconf_regs() Nokia RX-51: Move content of rx51.h to rx51.c Nokia RX-51: Enable usbtty serial console by default Makefile | 1 + arch/arm/mach-omap2/omap3/board.c | 3 + arch/arm/mach-omap2/omap3/lowlevel_init.S | 6 +- board/nokia/rx51/rx51.c | 28 +- board/nokia/rx51/rx51.h | 377 ---------------------- configs/nokia_rx51_defconfig | 6 +- doc/README.nokia_rx51 | 15 +- drivers/serial/usbtty.c | 4 +- drivers/usb/gadget/core.c | 38 +-- drivers/usb/gadget/ep0.c | 47 ++- drivers/usb/musb/musb_core.c | 10 +- drivers/usb/musb/musb_udc.c | 19 +- include/configs/nokia_rx51.h | 16 +- include/usbdevice.h | 15 - 14 files changed, 92 insertions(+), 493 deletions(-) delete mode 100644 board/nokia/rx51/rx51.h -- 2.20.1

4 48

[PATCH 00/11] dm: Simplify livetree handling
by Simon Glass 01 Feb '21

01 Feb '21

At present there are separate code paths for livetree and flattree in places where they can be made common. Also there are a few functions that support flattree but can be moved over to use the livetree API (i.e. ofnode instead of a DT offset). This series tidies up these areas. Simon Glass (11): dm: core: Rename device_bind() to device_bind_offset() dm: core: Rename device_bind_ofnode() to device_bind() dm: core: Add a livetree function to check node status dm: Remove uses of device_bind_offset() dm: Drop uses of dev_set_of_offset() dm: core: Drop dev_set_of_offset() dm: core: Drop device_bind_offset() dm: core: Add an ofnode function to get the devicetree root dm: core: Combine the flattree and livetree binding code dm: core: Drop unused parameter from dm_scan_fdt() dm: core: Drop unused parameter from dm_extended_scan_fdt() drivers/clk/at91/compat.c | 20 ++--- drivers/clk/clk.c | 2 +- drivers/core/device.c | 10 +-- drivers/core/ofnode.c | 10 +++ drivers/core/root.c | 97 ++++++--------------- drivers/firmware/scmi/scmi_agent-uclass.c | 4 +- drivers/gpio/dwapb_gpio.c | 4 +- drivers/gpio/mt7621_gpio.c | 5 +- drivers/gpio/s5p_gpio.c | 6 +- drivers/gpio/sunxi_gpio.c | 5 +- drivers/gpio/tegra186_gpio.c | 3 +- drivers/gpio/tegra_gpio.c | 4 +- drivers/misc/i2c_eeprom.c | 4 +- drivers/mtd/spi/sandbox.c | 2 +- drivers/net/mvpp2.c | 4 +- drivers/pci/pci-uclass.c | 4 +- drivers/pci/pci_mvebu.c | 4 +- drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 2 +- drivers/pinctrl/meson/pinctrl-meson.c | 5 +- drivers/pinctrl/mscc/pinctrl-jr2.c | 2 +- drivers/pinctrl/mscc/pinctrl-luton.c | 2 +- drivers/pinctrl/mscc/pinctrl-ocelot.c | 2 +- drivers/pinctrl/mscc/pinctrl-serval.c | 2 +- drivers/pinctrl/mscc/pinctrl-servalt.c | 2 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 8 +- drivers/usb/host/usb-uclass.c | 4 +- include/dm/device-internal.h | 10 +-- include/dm/device.h | 5 -- include/dm/ofnode.h | 23 +++++ include/dm/root.h | 8 +- test/dm/core.c | 6 +- test/dm/ofnode.c | 12 +++ test/dm/test-fdt.c | 4 +- test/dm/test-main.c | 4 +- 34 files changed, 130 insertions(+), 159 deletions(-) -- 2.29.2.454.gaff20da3a2-goog

2 27

[PATCH v1] doc: README.distro: Special case with Windows formatted disk
by Andy Shevchenko 30 Jan '21

30 Jan '21

If someone wants to use shared (by installed OS) eMMC partition to the Windows to boot from, it's not possible due to U-Boot limitations. Describe this case and possible workaround. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- doc/README.distro | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/doc/README.distro b/doc/README.distro index ab6e6f4e74..807a82c910 100644 --- a/doc/README.distro +++ b/doc/README.distro @@ -405,3 +405,23 @@ of the boot environment and are not guaranteed to exist or work in the same way in future u-boot versions. In particular the <device type>_boot variables (e.g. mmc_boot, usb_boot) are a strictly internal implementation detail and must not be used as a public interface. + +Using a eMMC partition that has been formatted as a disk by Windows 10 +====================================================================== + +Let's assume we have an (embedded) board with U-Boot and Linux OS +installed on eMMC. Linux OS shares one of the eMMC partitions as +a disk via USB Mass Storage protocol. + +It may be useful to utilize that disk to copy bootable files from +Windows machine to the board in case someone doesn't want to erase +stock installation on it. + +Unfortunately, Windows 10 doesn't provide knobs and always formats +that disk as a whole, meaning that it creates a partition table on it +with requested (FAT) partition. As a result U-Boot may not see any +files on it due to nesting partition tables. + +The workaround may be in formatting the partition under Linux OS, +setting up a network connection between Linux OS and Windows 10 and +use it to copy files to the partition. -- 2.24.1

5 10

[PATCH v8 00/18] efi_loader: add capsule update support
by AKASHI Takahiro 29 Jan '21

29 Jan '21

Summary ======= 'UpdateCapsule' is one of runtime services defined in UEFI specification and its aim is to allow a caller (OS) to pass information to the firmware, i.e. U-Boot. This is mostly used to update firmware binary on devices by instructions from OS. While 'UpdateCapsule' is a runtime services function, it is, at least initially, supported only before exiting boot services alike other runtime functions, [Get/]SetVariable. This is because modifying storage which may be shared with OS must be carefully designed and there is no general assumption that we can do it. Therefore, we practically support only "capsule on disk"; any capsule can be handed over to UEFI subsystem as a file on a specific file system. In this patch series, all the related definitions and structures are given as UEFI specification describes, and basic framework for capsule support is provided. Currently supported is * firmware update (Firmware Management Protocol or simply FMP) Most of functionality of firmware update is provided by FMP driver and it can be, by nature, system/platform-specific. So you can and should implement your own FMP driver(s) based on your system requirements. Under the current implementation, we provide two basic but generic drivers with two formats: * FIT image format (as used in TFTP update and dfu) * raw image format It's totally up to users which one, or both, should be used on users' system depending on user requirements. Quick usage =========== 1. You can create a capsule file with the following host command: $ mkeficapsule [--fit <fit image> | --raw <raw image>] <output file> 2. Put the file under: /EFI/UpdateCapsule of UEFI system partition 3. Specify firmware storage to be updated in "dfu_alt_info" variable (Please follow README.dfu for details.) ==> env set dfu_alt_info '...' 4. After setting up UEFI's OsIndications variable, reboot U-Boot: OsIndications <= EFI_OS_INDICATIONS_FILE_CAPSULE_DELIVERY_SUPPORTED Patch structure =============== Patch#1-#4,#12: preparatory patches Patch#5-#11,#13: main part of implementation Patch#14-#15: utilities Patch#16-#17: pytests Patch#18: for sandbox test [1] https://git.linaro.org/people/takahiro.akashi/u-boot.git efi/capsule Prerequisite patches ==================== None Test ==== * passed all the pytests which are included in this patch series on sandbox build locally. * skipped (or 'S', but it's not a failure, 'F') in Travis CI because "virt-make-fs" cannot be executed. Issues ====== * Timing of executing capsules-on-disk Currently, processing a capsule is triggered only as part of UEFI subsystem initialization. This means that, for example, firmware update, may not take place at system booting time and will potentially be delayed until a first call of any UEFI functions. => See patch#5 for my proposal * A bunch of warnings like WARNING: Use 'if (IS_ENABLED(CONFIG...))' instead of '#if or #ifdef' where possible I don't think that fixing those improves anything. * Add a document in uefi.rst TODO's ====== (Won't be addressed in this series.) * capsule authentication * capsule dependency (dependency expression instruction set, or depex) * loading drivers in a capsule * handling RESET flag in a capsule and QeuryCapsuleCaps * full semantics of ESRT (EFI System Resource Table) * enabling capsule API at runtime * json capsule * recovery from update failure Changes ======= v8 (November 13, 2020) * fix a "not used" warning against update_load() in some configuration (Patch#3) * fix failures (marked as 'F') in *secure boot* test in Travis CI by making "EFI_CAPSULE_ON_DISK_EARLY" 'default n' (Patch#8) * fix failures (marked as 'E') at pytest setup in Travis CI by changing a python file's name along with removing unused definitions (Patch#16) * add Patch#18 to enable tests to be run with default sandbox config (Patch#18) v7 (October 29, 2020) * rename CONFIG_DFU_ALT to CONFIG_DFU_WRITE_ALT (Patch#1,#3,#13) v6 RESEND (October 29, 2020) * rebased on v2021.01-rc1 v6 (September 7, 2020) * temporarily drop the prerequisite patch[2] * add a missing field (dependencies) in efi_api.h (but never used) (Patch#10) * add a missing field (image_capsule_support) and related definitions in efi_api.h (Patch#10, #15) * cosmetic changes on constant definitions in efi_api.h (Patch#10) * strict check for INVALID_PARAMETER at GET_IMAGE_INFO api (Patch#11,#13) * fix warnings in pytest (Patch#16,#17) v5 (August 3, 2020) * removed superfluous type conversion at dfu_write_from_mem_addr() (Patch#2) * introduced a common helper function, efi_create_indexed_name() (Patch#6,#7,#8) * use efi_[get|set]_variable_int(), if necessary, with READ_ONLY (Patch#7,#8) * return EFI_UNSUPPORTED at Patch#7 * changed the word, number, to 'index' (Patch#7,#8) * removed 'ifdef CONFIG_EFI_CAPSULE_ON_DISK' from a header (Patch#8) * initialize 'CapsuleLast' in efi_init_obj_list() (Patch#7,#8) * added 'const' qualifier for filename argument at efi_capsule_[read|delete]_file() (Patch#8) v4 (July 22, 2020) * rebased to Heinrich's current efi-2020-10 * rework dfu-related code to align with Heinrich's change (Patch#1,#3) * change a type of 'addr' argument from int to 'void *' per Sughosh's comment (Patch#2-#3,#11-#12) * rework/simplify pytests (Patch#15-#16) - utilize virt-make-fs - drop Test Case 1 (updating U-Boot environment data) - remove useless definitions (MNT_PNT, EFI_CAPSULE_IMAGE_NAME) - apply autopep8 v3 (July 10, 2020) * rebased to Heinrich's current efi-2020-10-rc1 * refactor efi_firmware_[fit|raw]_get_image_info() (patch#11,#13) v2 (June 17, 2020) * rebased to v2020.07-rc4 * add preparatory patches for dfu (Patch#1-#5, #12) * rework FIT capsule driver to utilize dfu_alt_info instead of CONFIG_xxx (patch#11) * extend get_image_info() to correspond to dfu_alt_info (patch#11) * add a 'raw binary' capsule support (patch#13, #17) * allow multiple capsule formats (with different GUIDs) to be installed (patch#11, #13) * extend mkeficapsule command to accept additional parameters, like version/index/hardware instance for a capsule header info. (patch#15) * mkeficapsule can now also generate raw-binary capsule (patch#16) * add function descriptions * apply autopep8 to pytests and fix more against pylint v1 (April 27, 2020) * rebased to v2020.07-rc * removed already-merged patches (RFC's #1 to #4) * dropped 'variable update' capsule support (RFC's patch#10) * dropped 'variable configuration table' support (RFC's patch#11) (Those two should be discussed separately.) * add preparatory patches (patch#1/#2) * fix several build errors * rename some Kconfig options to be aligned with UEFI specification's terms (patch#3,4,6,7) * enforce UpdateCapsule API to be disabled after ExitBootServices (patch#3) * use config table, runtime_services_supported, instead of variable (patch#3) * make EFI_CAPSULE_ON_DISK buildable even if UpdateCapsule API is disabled (patch4) * support OsIndications, invoking capsule-on-disk only if the variable indicates so (patch#4) * introduced EFI_CAPSULE_ON_DISK_EARLY to invoke capsule-on-disk in U-Boot initialization (patch#4) * detect capsule files only if they are on EFI system partition (patch#4) * use printf, rather than EFI_PRINT, in error cases (patch#4) * use 'header_size' field to retrieve capsule data, adding sanity checks against capsule size (patch#6) * call fmpt driver interfaces with EFI_CALL (patch#6) * remove 'variable update capsule'-related code form mkeficapsule (patch#9) * add a test case of OsIndications not being set properly (patch#10) * adjust test scenario for EFI_CAPSULE_ON_DISK_EARLY (patch#10) * revise pytest scripts (patch#10) Initial release as RFC (March 17, 2020) AKASHI Takahiro (18): dfu: rename dfu_tftp_write() to dfu_write_by_name() dfu: modify an argument type for an address common: update: add a generic interface for FIT image dfu: export dfu_list efi_loader: add option to initialise EFI subsystem early efi_loader: add efi_create_indexed_name() efi_loader: define UpdateCapsule api efi_loader: capsule: add capsule_on_disk support efi_loader: capsule: add memory range capsule definitions efi_loader: capsule: support firmware update efi_loader: add firmware management protocol for FIT image dfu: add dfu_write_by_alt() efi_loader: add firmware management protocol for raw image cmd: add "efidebug capsule" command tools: add mkeficapsule command for UEFI capsule update test/py: efi_capsule: test for FIT image capsule test/py: efi_capsule: test for raw image capsule sandbox: enable capsule update for testing cmd/efidebug.c | 235 +++++ common/Kconfig | 15 + common/Makefile | 3 +- common/board_r.c | 6 + common/main.c | 4 + common/update.c | 77 +- configs/sandbox64_defconfig | 6 + configs/sandbox_defconfig | 6 + drivers/dfu/Kconfig | 5 + drivers/dfu/Makefile | 2 +- drivers/dfu/dfu.c | 2 +- drivers/dfu/dfu_alt.c | 125 +++ drivers/dfu/dfu_tftp.c | 65 -- include/dfu.h | 57 +- include/efi_api.h | 166 ++++ include/efi_loader.h | 30 + include/image.h | 12 + lib/efi_loader/Kconfig | 72 ++ lib/efi_loader/Makefile | 2 + lib/efi_loader/efi_capsule.c | 917 ++++++++++++++++++ lib/efi_loader/efi_firmware.c | 403 ++++++++ lib/efi_loader/efi_runtime.c | 104 +- lib/efi_loader/efi_setup.c | 106 +- .../py/tests/test_efi_capsule/capsule_defs.py | 5 + test/py/tests/test_efi_capsule/conftest.py | 74 ++ .../test_efi_capsule/test_capsule_firmware.py | 241 +++++ .../tests/test_efi_capsule/uboot_bin_env.its | 36 + tools/Makefile | 2 + tools/mkeficapsule.c | 239 +++++ 29 files changed, 2877 insertions(+), 140 deletions(-) create mode 100644 drivers/dfu/dfu_alt.c delete mode 100644 drivers/dfu/dfu_tftp.c create mode 100644 lib/efi_loader/efi_capsule.c create mode 100644 lib/efi_loader/efi_firmware.c create mode 100644 test/py/tests/test_efi_capsule/capsule_defs.py create mode 100644 test/py/tests/test_efi_capsule/conftest.py create mode 100644 test/py/tests/test_efi_capsule/test_capsule_firmware.py create mode 100644 test/py/tests/test_efi_capsule/uboot_bin_env.its create mode 100644 tools/mkeficapsule.c -- 2.28.0

7 41