December 2020 - U-Boot

[PATCH 0/4] usbtty/musb: Fix file transfers
by Pali Rohár 23 Jan '21

23 Jan '21

This is second usbtty patch series which is fixing stability of musb code and allows usage of file transfers via Kermit protocol on Nokia N900. Kermit file transfer via U-Boot loadb command is stable on Nokia N900 and gives about 52kB/s transfer rate. This patch series depends on previous patch series: "Nokia RX-51: Fix USB TTY console and enable it" Pali Rohár (4): serial: usbtty: Send urb data in correct order usb: musb: Fix receiving of bigger buffers usb: musb: Fix handling interrupts for EP0 and SET ADDRESS commmand usb: musb: Ensure that we set musb dynamic FIFO buffer for every endpoint drivers/serial/usbtty.c | 12 +++-------- drivers/usb/musb/musb_udc.c | 42 ++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 30 deletions(-) -- 2.20.1

2 8

[PATCH v4 00/59] dm: Add programatic generation of ACPI tables (part D)
by Simon Glass 23 Jan '21

23 Jan '21

Note: This is part D of this effort. With this, Coral includes all required ACPI tables. At present on x86 U-Boot supports creating ACPI (Advanced Configuration and Power Interface) tables using the Intel ACPI Source Language (ASL) compiler. This is good enough for basic operation but some devices need to add their information dynamically at runtime. An example is a device that needs to report its enable GPIO. This is described in the device tree, so we want to add code in the driver to convert that device-tree description into an ACPI description for use on Linux. This series adds support for generation of ACPI tables and fragments by devices. The core support is built into driver model. Several files are brought over from coreboot to do the actual generation. As an example of using this new feature, chromebook_coral is updated to write out a wide array of ACPI tables including DSDT and SSDT. This initial version of the series lays out the general approach. More work is needed to figure out the difference between CONFIG_ACPIGEN and CONFIG_GENERATE_ACPI_TABLE with respect to what is built. Changes in v4: - Add Andy's documentation to struct acpi_gpio - Add logging when writinge NHLT - Add new patch to use I2cSerialBusV2() instead of I2cSerialBus() - Change table version to 3 - Correct DPTF enable property - Correct comment for dm_test_acpi_write_prw() - Correct compatible string for gma device Drop extra acpi_align() in apl_acpi_hb_write_tables() Changes in v3: - Rebase to master Changes in v2: - Add new patch to allow more space for U-Boot on link - Add new patch to move include of bitops out of ACPI region - Fix incorrect space in enable-off-delay-ms - Rebase to master - add new patch to fix polarity type in acpi_dp_add_gpio() Changes in v1: - Add NHLT audio support - Add NHLT information - Add comments - Add more comments and rename cpu_get_bus_clock to cpu_get_bus_clock_khz() - Add new patch with coral audio descriptor files - Add support for NHLT table - Adjust implementation to match new ACPI GPIO generation - Capitalise ACPI_OPS_PTR - Don't build for SPL - Drop unnecessary callbacks - Fix i2c PCI addresses - Handle table generation without callbacks - Move ASL_REVISION define into this patch - Move acpi_create_dbg2() into generic code - Move the acpi.h header file to this commit - Move this code into an x86-specific file - Put this code in an x86-specific place and update commit message - Rename acpi-probed to linux,probed - Rename cpi,hid-desc-reg-offset to hid-desc-addr - Split PCT and PTC tables into a separate patch - Support hid-over-i2c separately as well - UIse hid-over-i2 compatible string - Update ACPI ordering to include multiple CPUs - Update commit message - Update commit message with a comma - Update for acpi_device_write_i2c_dev() return-value change - Use OEM_TABLE_ID instead of ACPI_TABLE_CREATOR - Use SHIFT and MASK for defines - Use acpi,ddn instead of acpi,desc - Use this file in APL - Use updated acpi_device_write_dsm_i2c_hid() function Simon Glass (59): x86: acpi: Add cros_ec tables x86: acpi: Add base asl files for common x86 devices x86: acpi: apl: Add asl files for Apollo Lake x86: acpi: Add DPTF asl files x86: apl: Correct PCIE_ECAM_BASE x86: Add a config for the systemagent PCIEX regions size x86: Add a common global NVS structure x86: acpi: Support external GNVS tables x86: acpi: Expand the GNVS x86: coral: Add ACPI tables for coral acpi: Add support for writing a _PRW acpi: Add support for conditions and return values acpi: Support generating a multi-function _DSM for devices dm: acpi: Use correct GPIO polarity type in acpi_dp_add_gpio() x86: link: Allow more space for U-Boot i2c: Add a generic driver to generate ACPI info x86: Add wake sources for the acpi_gpe driver x86: apl: Support writing the IntelGraphicsMem table x86: acpi: Add a common routine to write WiFi info x86: Add some definitions for SMM x86: apl: Add power-management definitions x86: apl: Update iomap for ACPI x86: Add a few common Intel CPU functions x86: acpi: Support generation of the HPET table x86: acpi: Support generation of the DBG2 table acpi: Add support for generating processor tables x86: acpi: Add PCT and PTC tables acpi: Add more support for generating processor tables x86: acpi: Add common Intel ACPI tables x86: Support Atom SoCs using SWSMISCI rather than the SWSCI x86: acpi: Add support for additional Intel tables x86: apl: Allow reading hostbridge base addresses p2sb: Add some definitions used for ACPI x86: apl: Generate required ACPI tables x86: apl: Add support for hostbridge ACPI generation x86: apl: Generate CPU tables x86: apl: Generate ACPI table for LPC x86: apl: Drop unnecessary code in PMC driver tpm: cr50: Add ACPI support x86: fsp: Update the FSP API with the end-firmware method x86: cpu: Report address width from cpu_get_info() x86: Sort the MTRR table x86: Notify the FSP of the 'end firmware' event x86: Correct the assembly guard in e820.h x86: Add a header guard to asm/acpi_table.h x86: Correct handling of MADT table CPUs acpi: tpm: Add a TPM2 table acpi: tpm: Add a TPM1 table x86: acpi: Set the log category for x86 table generation x86: coral: Add audio descriptor files x86: apl: Check low-level init in FSP-S pre-init x86: fsp: Add more debugging for silicon init x86: fsp: Show FSP-S or FSP-M address in fsp_get_header() acpi: Use defines for field lengths x86: Add a way to add to the e820 memory table x86: Move include of bitops out of ACPI region x86: coral: Update config and device tree for ACPI acpi: Add more documentation for struct acpi_gpio acpi: Use I2cSerialBusV2() instead of I2cSerialBus() arch/x86/Kconfig | 47 ++ arch/x86/cpu/apollolake/Kconfig | 4 + arch/x86/cpu/apollolake/Makefile | 1 + arch/x86/cpu/apollolake/acpi.c | 211 ++++++ arch/x86/cpu/apollolake/cpu.c | 77 +++ arch/x86/cpu/apollolake/fsp_s.c | 2 + arch/x86/cpu/apollolake/hostbridge.c | 243 ++++++- arch/x86/cpu/apollolake/lpc.c | 18 + arch/x86/cpu/apollolake/pmc.c | 8 +- arch/x86/cpu/cpu.c | 15 + arch/x86/cpu/i386/cpu.c | 23 + arch/x86/cpu/intel_common/Makefile | 7 + arch/x86/cpu/intel_common/acpi.c | 377 ++++++++++ arch/x86/cpu/intel_common/cpu.c | 79 +++ arch/x86/cpu/intel_common/generic_wifi.c | 120 ++++ arch/x86/cpu/intel_common/intel_opregion.c | 168 +++++ arch/x86/cpu/mtrr.c | 12 + arch/x86/cpu/x86_64/cpu.c | 5 + arch/x86/dts/chromebook_coral.dts | 226 +++++- arch/x86/include/asm/acpi/chromeos.asl | 108 +++ arch/x86/include/asm/acpi/cpu.asl | 25 + arch/x86/include/asm/acpi/cros_ec/ac.asl | 22 + arch/x86/include/asm/acpi/cros_ec/als.asl | 56 ++ arch/x86/include/asm/acpi/cros_ec/battery.asl | 411 +++++++++++ arch/x86/include/asm/acpi/cros_ec/cros_ec.asl | 57 ++ arch/x86/include/asm/acpi/cros_ec/ec.asl | 557 +++++++++++++++ arch/x86/include/asm/acpi/cros_ec/emem.asl | 53 ++ .../asm/acpi/cros_ec/keyboard_backlight.asl | 52 ++ arch/x86/include/asm/acpi/cros_ec/pd.asl | 15 + arch/x86/include/asm/acpi/cros_ec/superio.asl | 159 +++++ arch/x86/include/asm/acpi/cros_ec/tbmc.asl | 23 + arch/x86/include/asm/acpi/cros_gnvs.asl | 29 + arch/x86/include/asm/acpi/dptf/charger.asl | 65 ++ arch/x86/include/asm/acpi/dptf/cpu.asl | 186 +++++ arch/x86/include/asm/acpi/dptf/dptf.asl | 121 ++++ arch/x86/include/asm/acpi/dptf/fan.asl | 57 ++ arch/x86/include/asm/acpi/dptf/thermal.asl | 521 ++++++++++++++ arch/x86/include/asm/acpi/global_nvs.h | 5 +- arch/x86/include/asm/acpi/lpc.asl | 141 ++++ arch/x86/include/asm/acpi/pci_osc.asl | 21 + arch/x86/include/asm/acpi/pcr.asl | 80 +++ arch/x86/include/asm/acpi/ramoops.asl | 32 + arch/x86/include/asm/acpi/sleepstates.asl | 12 +- arch/x86/include/asm/acpi_table.h | 162 +++++ arch/x86/include/asm/acpigen.h | 35 + arch/x86/include/asm/arch-apollolake/acpi.h | 18 + .../include/asm/arch-apollolake/acpi/dptf.asl | 35 + .../asm/arch-apollolake/acpi/globalnvs.asl | 41 ++ .../include/asm/arch-apollolake/acpi/gpio.asl | 191 ++++++ .../asm/arch-apollolake/acpi/gpiolib.asl | 109 +++ .../include/asm/arch-apollolake/acpi/lpss.asl | 105 +++ .../asm/arch-apollolake/acpi/northbridge.asl | 120 ++++ .../asm/arch-apollolake/acpi/pch_hda.asl | 77 +++ .../asm/arch-apollolake/acpi/pci_irqs.asl | 52 ++ .../include/asm/arch-apollolake/acpi/pcie.asl | 22 + .../asm/arch-apollolake/acpi/pcie_port.asl | 113 +++ .../asm/arch-apollolake/acpi/platform.asl | 10 + .../asm/arch-apollolake/acpi/pmc_ipc.asl | 49 ++ .../include/asm/arch-apollolake/acpi/scs.asl | 173 +++++ .../asm/arch-apollolake/acpi/soc_int.asl | 50 ++ .../asm/arch-apollolake/acpi/southbridge.asl | 34 + .../include/asm/arch-apollolake/acpi/xhci.asl | 33 + .../arch-apollolake/acpi/xhci_apl_ports.asl | 23 + .../arch-apollolake/acpi/xhci_glk_ports.asl | 24 + .../include/asm/arch-apollolake/global_nvs.h | 23 +- arch/x86/include/asm/arch-apollolake/gpe.h | 135 ++++ arch/x86/include/asm/arch-apollolake/gpio.h | 3 + arch/x86/include/asm/arch-apollolake/iomap.h | 16 + arch/x86/include/asm/arch-apollolake/pm.h | 40 +- .../include/asm/arch-apollolake/systemagent.h | 31 + arch/x86/include/asm/cpu.h | 9 + arch/x86/include/asm/cpu_common.h | 56 ++ arch/x86/include/asm/e820.h | 3 +- arch/x86/include/asm/fsp/fsp_api.h | 15 +- arch/x86/include/asm/intel_acpi.h | 52 ++ arch/x86/include/asm/intel_gnvs.h | 44 ++ arch/x86/include/asm/intel_opregion.h | 247 +++++++ arch/x86/include/asm/smm.h | 27 + arch/x86/lib/Makefile | 1 + arch/x86/lib/acpi_table.c | 383 ++++++++++- arch/x86/lib/acpigen.c | 96 +++ arch/x86/lib/fsp/fsp_common.c | 16 + arch/x86/lib/fsp/fsp_dram.c | 17 + arch/x86/lib/fsp/fsp_graphics.c | 32 + arch/x86/lib/fsp2/fsp_silicon_init.c | 4 +- arch/x86/lib/fsp2/fsp_support.c | 22 +- board/google/chromebook_coral/Kconfig | 2 +- board/google/chromebook_coral/Makefile | 1 + .../chromebook_coral/baseboard_dptf.asl | 71 ++ board/google/chromebook_coral/coral.c | 136 ++++ .../chromebook_coral/dialog-2ch-48khz-24b.dat | Bin 0 -> 100 bytes .../chromebook_coral/dmic-1ch-48khz-16b.dat | Bin 0 -> 3048 bytes .../chromebook_coral/dmic-2ch-48khz-16b.dat | Bin 0 -> 3048 bytes .../chromebook_coral/dmic-4ch-48khz-16b.dat | Bin 0 -> 3048 bytes board/google/chromebook_coral/dsdt.asl | 60 ++ .../max98357-render-2ch-48khz-24b.dat | Bin 0 -> 116 bytes .../google/chromebook_coral/variant_dptf.asl | 6 + board/google/chromebook_coral/variant_ec.h | 75 ++ board/google/chromebook_coral/variant_gpio.h | 63 ++ configs/chromebook_coral_defconfig | 13 +- configs/chromebook_link_defconfig | 2 +- doc/device-tree-bindings/chosen.txt | 18 + doc/device-tree-bindings/device.txt | 3 + doc/device-tree-bindings/i2c/generic-acpi.txt | 42 ++ drivers/core/Kconfig | 9 + drivers/i2c/Makefile | 3 + drivers/i2c/acpi_i2c.c | 226 ++++++ drivers/i2c/acpi_i2c.h | 15 + drivers/i2c/i2c-uclass.c | 17 + drivers/sound/max98357a.c | 2 +- drivers/tpm/cr50_i2c.c | 55 ++ include/acpi/acpi_device.h | 93 ++- include/acpi/acpi_dp.h | 2 +- include/acpi/acpi_s3.h | 4 + include/acpi/acpi_table.h | 140 +++- include/acpi/acpigen.h | 415 +++++++++++ include/bloblist.h | 8 + include/i2c.h | 23 + include/p2sb.h | 8 + include/power/acpi_pmc.h | 4 +- lib/acpi/acpi_device.c | 45 +- lib/acpi/acpi_dp.c | 4 +- lib/acpi/acpi_table.c | 64 ++ lib/acpi/acpigen.c | 354 ++++++++++ test/dm/acpi_dp.c | 4 +- test/dm/acpigen.c | 647 ++++++++++++++++++ 126 files changed, 9722 insertions(+), 111 deletions(-) create mode 100644 arch/x86/cpu/apollolake/acpi.c create mode 100644 arch/x86/cpu/intel_common/acpi.c create mode 100644 arch/x86/cpu/intel_common/generic_wifi.c create mode 100644 arch/x86/cpu/intel_common/intel_opregion.c create mode 100644 arch/x86/include/asm/acpi/chromeos.asl create mode 100644 arch/x86/include/asm/acpi/cpu.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/ac.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/als.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/battery.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/cros_ec.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/ec.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/emem.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/keyboard_backlight.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/pd.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/superio.asl create mode 100644 arch/x86/include/asm/acpi/cros_ec/tbmc.asl create mode 100644 arch/x86/include/asm/acpi/cros_gnvs.asl create mode 100644 arch/x86/include/asm/acpi/dptf/charger.asl create mode 100644 arch/x86/include/asm/acpi/dptf/cpu.asl create mode 100644 arch/x86/include/asm/acpi/dptf/dptf.asl create mode 100644 arch/x86/include/asm/acpi/dptf/fan.asl create mode 100644 arch/x86/include/asm/acpi/dptf/thermal.asl create mode 100644 arch/x86/include/asm/acpi/lpc.asl create mode 100644 arch/x86/include/asm/acpi/pci_osc.asl create mode 100644 arch/x86/include/asm/acpi/pcr.asl create mode 100644 arch/x86/include/asm/acpi/ramoops.asl create mode 100644 arch/x86/include/asm/acpigen.h create mode 100644 arch/x86/include/asm/arch-apollolake/acpi.h create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/dptf.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/globalnvs.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/gpio.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/gpiolib.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/lpss.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/northbridge.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pch_hda.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pci_irqs.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pcie.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pcie_port.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/platform.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/pmc_ipc.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/scs.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/soc_int.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/southbridge.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci_apl_ports.asl create mode 100644 arch/x86/include/asm/arch-apollolake/acpi/xhci_glk_ports.asl create mode 100644 arch/x86/include/asm/arch-apollolake/gpe.h create mode 100644 arch/x86/include/asm/intel_acpi.h create mode 100644 arch/x86/include/asm/intel_gnvs.h create mode 100644 arch/x86/include/asm/intel_opregion.h create mode 100644 arch/x86/include/asm/smm.h create mode 100644 arch/x86/lib/acpigen.c create mode 100644 board/google/chromebook_coral/baseboard_dptf.asl create mode 100644 board/google/chromebook_coral/dialog-2ch-48khz-24b.dat create mode 100644 board/google/chromebook_coral/dmic-1ch-48khz-16b.dat create mode 100644 board/google/chromebook_coral/dmic-2ch-48khz-16b.dat create mode 100644 board/google/chromebook_coral/dmic-4ch-48khz-16b.dat create mode 100644 board/google/chromebook_coral/dsdt.asl create mode 100644 board/google/chromebook_coral/max98357-render-2ch-48khz-24b.dat create mode 100644 board/google/chromebook_coral/variant_dptf.asl create mode 100644 board/google/chromebook_coral/variant_ec.h create mode 100644 board/google/chromebook_coral/variant_gpio.h create mode 100644 doc/device-tree-bindings/i2c/generic-acpi.txt create mode 100644 drivers/i2c/acpi_i2c.c create mode 100644 drivers/i2c/acpi_i2c.h -- 2.28.0.681.g6f77f65b4e-goog

3 62

[PATCH] doc: FIT image: Clarify format and simplify syntax
by Alexandru Gagniuc 23 Jan '21

23 Jan '21

** Introduction There are currently four ways to load an OS image with u-boot 1. SPL -> u-boot -> bootm 2. SPL blue falcon mode 3. "Basic" FIT image (CONFIG_LOAD_FIT) 4. "Full-featured" FIT image (CONFIG_LOAD_FIT_FULL) These four code paths were developed independently, and share very little code. (3) and (4), behave very differently, are littered with special cases. They even have different DTS syntax and properties. The cause of this divergence is that the FIT format specification leaves a number of things open to interpretation. The purpose of this change is to enable the reduction of code size, duplication, and complexity by updating and streamlining the FIT format. We are only marginally concerned with backwards compatibility, because we don't have inter-compatibility. For example, CONFIG_LOAD_FIT is able to load images that CONFIG_LOAD_FIT_FULL won't. This is a direct result of the incompatible syntax between the two implementations. Ideally, these changes would enable "simple" FIT to be a subset of the "full" fit implementation, and share most code. These changes should also eliminate the need for falcon mode (although we are not advocating for the removal of falcon mode at this time). ** Description of changes * The "configurations" node is now mandatory Guessing how to load components based on their "os" and "type" invites confusion and superfluous heuristics. Instead, require each FIT image to be explicit on how components should be loaded. * Eliminate "ramdisk", "setup", "standalone", and "fpga" properties Having too many special purpose properties requires special-casing FIT loading code. When a special property can be handled by another property, it is redundant. - A "ramdisk" is identical to a loadable. Thus ramdisk images should be placed under "loadables". - A "setup" node can be achieved by using a "kernel" or "firmware" property instead. - "standalone" is used for u-boot nodes. The correct property to use in this case is "firmware". - "fpga" is a loadable * Prioritize control between "firmware" and "kernel" "firmware" and "kernel" are special nodes in that control is passed to the "entry-point" of the image. Both can be present, for example, an OP-TEE firmware with a linux kernel. When both are present, control is passed to the "firmware" image. ** Further generalizations (not included herein) The "firmware" and "kernel" properties could be generalized as a "next-boot-stage", or similar name. This "next" stage would be special in that it is both executable, and is the stage that is passed control. For example, "next-stage" could be an op-tee image, with linux as a loadable, or a u-boot image. Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- doc/uImage.FIT/source_file_format.txt | 33 ++++++++++++--------------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index 884a58456f..2e7e11747c 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -126,12 +126,10 @@ Root node of the uImage Tree should have the following layout: load addresses supplied within sub-image nodes. May be omitted when no entry or load addresses are used. - Mandatory node: + Mandatory nodes: - images : This node contains a set of sub-nodes, each of them representing single component sub-image (like kernel, ramdisk, etc.). At least one sub-image is required. - - Optional node: - configurations : Contains a set of available configuration nodes and defines a default configuration. @@ -169,8 +167,8 @@ the '/images' node should have the following layout: to "none". Conditionally mandatory property: - - os : OS name, mandatory for types "kernel" and "ramdisk". Valid OS names - are: "openbsd", "netbsd", "freebsd", "4_4bsd", "linux", "svr4", "esix", + - os : OS name, mandatory for types "kernel". Valid OS names are: + "openbsd", "netbsd", "freebsd", "4_4bsd", "linux", "svr4", "esix", "solaris", "irix", "sco", "dell", "ncr", "lynxos", "vxworks", "psos", "qnx", "u_boot", "rtems", "unity", "integrity". - arch : Architecture name, mandatory for types: "standalone", "kernel", @@ -179,10 +177,13 @@ the '/images' node should have the following layout: "sparc64", "m68k", "microblaze", "nios2", "blackfin", "avr32", "st200", "sandbox". - entry : entry point address, address size is determined by - '#address-cells' property of the root node. Mandatory for for types: - "standalone" and "kernel". + '#address-cells' property of the root node. + Mandatory for types: "firmware", and "kernel". - load : load address, address size is determined by '#address-cells' - property of the root node. Mandatory for types: "standalone" and "kernel". + property of the root node. + Mandatory for types: "firmware", and "kernel". + - compatible : compatible method for loading image. + Mandatory for types: "fpga", and images that do not specify a load address. Optional nodes: - hash-1 : Each hash sub-node represents separate hash or checksum @@ -205,9 +206,8 @@ o hash-1 6) '/configurations' node ------------------------- -The 'configurations' node is optional. If present, it allows to create a -convenient, labeled boot configurations, which combine together kernel images -with their ramdisks and fdt blobs. +The 'configurations' node creates convenient, labeled boot configurations, +which combine together kernel images with their ramdisks and fdt blobs. The 'configurations' node has has the following structure: @@ -236,27 +236,22 @@ Each configuration has the following structure: o config-1 |- description = "configuration description" |- kernel = "kernel sub-node unit name" - |- ramdisk = "ramdisk sub-node unit name" |- fdt = "fdt sub-node unit-name" [, "fdt overlay sub-node unit-name", ...] - |- fpga = "fpga sub-node unit-name" |- loadables = "loadables sub-node unit-name" |- compatible = "vendor,board-style device tree compatible string" Mandatory properties: - description : Textual configuration description. - - kernel : Unit name of the corresponding kernel image (image sub-node of a - "kernel" type). + - kernel or firmware: Unit name of the corresponding kernel or firmware + (u-boot, op-tee, etc) image. If both "kernel" and "firmware" are specified, + control is passed to the firmware image. Optional properties: - - ramdisk : Unit name of the corresponding ramdisk image (component image - node of a "ramdisk" type). - fdt : Unit name of the corresponding fdt blob (component image node of a "fdt type"). Additional fdt overlay nodes can be supplied which signify that the resulting device tree blob is generated by the first base fdt blob with all subsequent overlays applied. - - setup : Unit name of the corresponding setup binary (used for booting - an x86 kernel). This contains the setup.bin file built by the kernel. - fpga : Unit name of the corresponding fpga bitstream blob (component image node of a "fpga type"). - loadables : Unit name containing a list of additional binaries to be -- 2.26.2

2 1

[PATCH v2 0/4] mkimage usability fixes
by Joel Stanley 23 Jan '21

23 Jan '21

v2: Move -B and -E out from FIT_SIGNATURE check, and other fixes from Philippe's review. Original cover letter: I was learning about signed FIT today and was unable to convince mkimage to produce a signature node in my control device tree. It turns out that Debian's packaged mkimage doesn't enable FIT_SIGNATURE, so the options I was passing were silently ignored. There's an existing Debian bug for that[1] but in the mean time this changes mkimage's behaviour to fail loudly when FIT_SIGNATURE is disabled. The first two patches fix some issues I found when testing the third patch under sandbox_defconfig with FIT_SIGNATURE=n. [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972513 Joel Stanley (4): tools/Makefile: FIT_CIPHER requires libssl image-fit: Fix FIT_CIPHER linking mkimage: Move padding commands outside of FIT_SIGNATURE mkimge: Reject signing-related flags without FIT_SIGNATURE common/image-fit-sig.c | 14 -------------- common/image-fit.c | 15 +++++++++++++++ tools/Makefile | 2 +- tools/mkimage.c | 18 +++++++++++------- 4 files changed, 27 insertions(+), 22 deletions(-) -- 2.29.2

4 13

[PATCH] tools: env: return error if ubi_update_start() fails
by Martin Hundebøll 23 Jan '21

23 Jan '21

The UBI_IOCVOLUP ioctl can fail if exclusive access to the volume isn't obtained. If this happens, the flush operation doesn't return error, leaving the caller without knowledge of missing flush. Fix this by forwarding the error (-1) from ubi_update_start(). Fixes: 34255b92e6e ("tools: env: Add support for direct read/write UBI volumes") Signed-off-by: Martin Hundebøll <martin(a)geanix.com> --- tools/env/fw_env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 66cb9d2a25..2a61a5d6f0 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1208,7 +1208,7 @@ static int flash_write(int fd_current, int fd_target, int dev_target) if (IS_UBI(dev_target)) { if (ubi_update_start(fd_target, CUR_ENVSIZE) < 0) - return 0; + return -1; return ubi_write(fd_target, environment.image, CUR_ENVSIZE); } -- 2.28.0

2 1

[PATCH 1/2] tools: image-host: clean function fit_config_get_hash_list
by Philippe Reynes 23 Jan '21

23 Jan '21

This commit creates a function fit_config_add_hash that will be used in the next commit to support several 'sub-images'. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- tools/image-host.c | 132 ++++++++++++++++++++++++++------------------- 1 file changed, 76 insertions(+), 56 deletions(-) diff --git a/tools/image-host.c b/tools/image-host.c index e32cc64257..ce829a8ec9 100644 --- a/tools/image-host.c +++ b/tools/image-host.c @@ -700,13 +700,84 @@ static const char *fit_config_get_image_list(void *fit, int noffset, return default_list; } +static int fit_config_add_hash(void *fit, const char *conf_name, const char *sig_name, + struct strlist *node_inc, const char *iname, int image_noffset) +{ + char name[200], path[200]; + int noffset; + int hash_count; + int ret; + + ret = fdt_get_path(fit, image_noffset, path, sizeof(path)); + if (ret < 0) + goto err_path; + if (strlist_add(node_inc, path)) + goto err_mem; + + snprintf(name, sizeof(name), "%s/%s", FIT_CONFS_PATH, + conf_name); + + /* Add all this image's hashes */ + hash_count = 0; + for (noffset = fdt_first_subnode(fit, image_noffset); + noffset >= 0; + noffset = fdt_next_subnode(fit, noffset)) { + const char *name = fit_get_name(fit, noffset, NULL); + + if (strncmp(name, FIT_HASH_NODENAME, + strlen(FIT_HASH_NODENAME))) + continue; + ret = fdt_get_path(fit, noffset, path, sizeof(path)); + if (ret < 0) + goto err_path; + if (strlist_add(node_inc, path)) + goto err_mem; + hash_count++; + } + + if (!hash_count) { + printf("Failed to find any hash nodes in configuration '%s/%s' image '%s' - without these it is not possible to verify this image\n", + conf_name, sig_name, iname); + return -ENOMSG; + } + + /* Add this image's cipher node if present */ + noffset = fdt_subnode_offset(fit, image_noffset, + FIT_CIPHER_NODENAME); + if (noffset != -FDT_ERR_NOTFOUND) { + if (noffset < 0) { + printf("Failed to get cipher node in configuration '%s/%s' image '%s': %s\n", + conf_name, sig_name, iname, + fdt_strerror(noffset)); + return -EIO; + } + ret = fdt_get_path(fit, noffset, path, sizeof(path)); + if (ret < 0) + goto err_path; + if (strlist_add(node_inc, path)) + goto err_mem; + } + + return 0; + +err_mem: + printf("Out of memory processing configuration '%s/%s'\n", conf_name, + sig_name); + return -ENOMEM; + +err_path: + printf("Failed to get path for image '%s' in configuration '%s/%s': %s\n", + iname, conf_name, sig_name, fdt_strerror(ret)); + return -ENOENT; +} + static int fit_config_get_hash_list(void *fit, int conf_noffset, int sig_offset, struct strlist *node_inc) { int allow_missing; const char *prop, *iname, *end; const char *conf_name, *sig_name; - char name[200], path[200]; + char name[200]; int image_count; int ret, len; @@ -733,9 +804,7 @@ static int fit_config_get_hash_list(void *fit, int conf_noffset, end = prop + len; image_count = 0; for (iname = prop; iname < end; iname += strlen(iname) + 1) { - int noffset; int image_noffset; - int hash_count; image_noffset = fit_conf_get_prop_node(fit, conf_noffset, iname); @@ -748,55 +817,11 @@ static int fit_config_get_hash_list(void *fit, int conf_noffset, return -ENOENT; } - ret = fdt_get_path(fit, image_noffset, path, sizeof(path)); + ret = fit_config_add_hash(fit, conf_name, + sig_name, node_inc, + iname, image_noffset); if (ret < 0) - goto err_path; - if (strlist_add(node_inc, path)) - goto err_mem; - - snprintf(name, sizeof(name), "%s/%s", FIT_CONFS_PATH, - conf_name); - - /* Add all this image's hashes */ - hash_count = 0; - for (noffset = fdt_first_subnode(fit, image_noffset); - noffset >= 0; - noffset = fdt_next_subnode(fit, noffset)) { - const char *name = fit_get_name(fit, noffset, NULL); - - if (strncmp(name, FIT_HASH_NODENAME, - strlen(FIT_HASH_NODENAME))) - continue; - ret = fdt_get_path(fit, noffset, path, sizeof(path)); - if (ret < 0) - goto err_path; - if (strlist_add(node_inc, path)) - goto err_mem; - hash_count++; - } - - if (!hash_count) { - printf("Failed to find any hash nodes in configuration '%s/%s' image '%s' - without these it is not possible to verify this image\n", - conf_name, sig_name, iname); - return -ENOMSG; - } - - /* Add this image's cipher node if present */ - noffset = fdt_subnode_offset(fit, image_noffset, - FIT_CIPHER_NODENAME); - if (noffset != -FDT_ERR_NOTFOUND) { - if (noffset < 0) { - printf("Failed to get cipher node in configuration '%s/%s' image '%s': %s\n", - conf_name, sig_name, iname, - fdt_strerror(noffset)); - return -EIO; - } - ret = fdt_get_path(fit, noffset, path, sizeof(path)); - if (ret < 0) - goto err_path; - if (strlist_add(node_inc, path)) - goto err_mem; - } + return ret; image_count++; } @@ -813,11 +838,6 @@ err_mem: printf("Out of memory processing configuration '%s/%s'\n", conf_name, sig_name); return -ENOMEM; - -err_path: - printf("Failed to get path for image '%s' in configuration '%s/%s': %s\n", - iname, conf_name, sig_name, fdt_strerror(ret)); - return -ENOENT; } static int fit_config_get_data(void *fit, int conf_noffset, int noffset, -- 2.17.1

3 5

[PATCH 1/1] x86: typo segement
by Heinrich Schuchardt 23 Jan '21

23 Jan '21

%s/segement/segment/ Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/x86/cpu/i386/cpu.c | 2 +- arch/x86/cpu/start.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/cpu/i386/cpu.c b/arch/x86/cpu/i386/cpu.c index 7517b756f4..6fa0f4d32b 100644 --- a/arch/x86/cpu/i386/cpu.c +++ b/arch/x86/cpu/i386/cpu.c @@ -175,7 +175,7 @@ void arch_setup_gd(gd_t *new_gd) * Per Intel FSP external architecture specification, before calling any FSP * APIs, we need make sure the system is in flat 32-bit mode and both the code * and data selectors should have full 4GB access range. Here we reuse the one - * we used in arch/x86/cpu/start16.S, and reload the segement registers. + * we used in arch/x86/cpu/start16.S, and reload the segment registers. */ void setup_fsp_gdt(void) { diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 3b6ed37bc0..3d0d95295f 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -77,7 +77,7 @@ _start: lgdt gdt_ptr2 #endif - /* Load the segement registers to match the GDT loaded in start16.S */ + /* Load the segment registers to match the GDT loaded in start16.S */ movl $(X86_GDT_ENTRY_32BIT_DS * X86_GDT_ENTRY_SIZE), %eax movw %ax, %fs movw %ax, %ds -- 2.29.2

3 2

[PATCH 1/1] sandbox: fix sandbox_cmdline_cb_test_fdt()
by Heinrich Schuchardt 23 Jan '21

23 Jan '21

fmt does not foresee any parameter. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/sandbox/cpu/start.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index f6c98545e0..6d27f13875 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -213,7 +213,7 @@ static int sandbox_cmdline_cb_test_fdt(struct sandbox_state *state, if (!p) p = fname + strlen(fname); len -= p - fname; - snprintf(p, len, fmt, p); + snprintf(p, len, fmt); state->fdt_fname = fname; return 0; -- 2.29.2

2 2

[PATCH] doc/sandbox: improve formatting of command line options
by Heinrich Schuchardt 23 Jan '21

23 Jan '21

Show the command line options in bold. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- doc/arch/sandbox.rst | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/doc/arch/sandbox.rst b/doc/arch/sandbox.rst index ee720c5a09..60ee1e0741 100644 --- a/doc/arch/sandbox.rst +++ b/doc/arch/sandbox.rst @@ -99,37 +99,37 @@ Command-line Options Various options are available, mostly for test purposes. Use -h to see available options. Some of these are described below: -* -t, --terminal <arg> - - The terminal is normally in what is called 'raw-with-sigs' mode. This means +-t, --terminal <arg> + The terminal is normally in what is called 'raw-with-sigs' mode. This means that you can use arrow keys for command editing and history, but if you press Ctrl-C, U-Boot will exit instead of handling this as a keypress. Other options are 'raw' (so Ctrl-C is handled within U-Boot) and 'cooked' (where the terminal is in cooked mode and cursor keys will not work, Ctrl-C will exit). -* -l - - Show the LCD emulation window. +-l + Show the LCD emulation window. -* -d <device_tree> - - A device tree binary file can be provided with -d. If you edit the source +-d <device_tree> + A device tree binary file can be provided with -d. If you edit the source (it is stored at arch/sandbox/dts/sandbox.dts) you must rebuild U-Boot to recreate the binary file. -* -D - - To use the default device tree, use -D. +-D + To use the default device tree, use -D. -* -T - - To use the test device tree, use -T. +-T + To use the test device tree, use -T. -* -c [<cmd>;]<cmd> - - To execute commands directly, use the -c option. You can specify a single +-c [<cmd>;]<cmd> + To execute commands directly, use the -c option. You can specify a single command, or multiple commands separated by a semicolon, as is normal in U-Boot. Be careful with quoting as the shell will normally process and swallow quotes. When -c is used, U-Boot exits after the command is complete, but you can force it to go to interactive mode instead with -i. -* -i - - Go to interactive mode after executing the commands specified by -c. +-i + Go to interactive mode after executing the commands specified by -c. Environment Variables --------------------- -- 2.29.2

2 2

[PATCH 1/5] tpm: cr50: Check for valid locality
by Simon Glass 23 Jan '21

23 Jan '21

When the Cr50 starts up it doesn't have a valid locality. The driver sets it to -1 to indicate that. Tracking this allows cr50_i2c_cleanup() to avoid releasing a locality that was not claimed. However the helper functions that generate the flags use a u8 type which cannot support -1, so they return a locality of 0xff. Fix this by updating the type. With this, 'tpm startup TPM2_SU_CLEAR' works as expected. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- drivers/tpm/cr50_i2c.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/tpm/cr50_i2c.c b/drivers/tpm/cr50_i2c.c index ce61b72d222..f53924a8fcb 100644 --- a/drivers/tpm/cr50_i2c.c +++ b/drivers/tpm/cr50_i2c.c @@ -183,23 +183,31 @@ static int cr50_i2c_write(struct udevice *dev, u8 addr, const u8 *buffer, return cr50_i2c_wait_tpm_ready(dev); } -static inline u8 tpm_access(u8 locality) +static inline u8 tpm_access(int locality) { + if (locality == -1) + locality = 0; return 0x0 | (locality << 4); } -static inline u8 tpm_sts(u8 locality) +static inline u8 tpm_sts(int locality) { + if (locality == -1) + locality = 0; return 0x1 | (locality << 4); } -static inline u8 tpm_data_fifo(u8 locality) +static inline u8 tpm_data_fifo(int locality) { + if (locality == -1) + locality = 0; return 0x5 | (locality << 4); } -static inline u8 tpm_did_vid(u8 locality) +static inline u8 tpm_did_vid(int locality) { + if (locality == -1) + locality = 0; return 0x6 | (locality << 4); } -- 2.29.2.729.g45daf8777d-goog

1 9