November 2020 - U-Boot

[PATCH] Makefile: Do not call useless command 'true'
by Pali Rohár 29 Jan '21

29 Jan '21

Macro 'cmd_objcopy_uboot' currently does not work with passed empty command expanded from 'cmd_static_rela' and therefore dummy command 'true' is set in 'cmd_static_rela' to workaround this issue. Eliminate it now by fixing 'cmd_objcopy_uboot' macro to work also with empty 'cmd_static_rela' macro and remove useless invocation of command 'true'. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b90fe8b865..aeb2c17a9b 100644 --- a/Makefile +++ b/Makefile @@ -885,7 +885,7 @@ cmd_static_rela = \ tools/relocate-rela $(3) $(4) $$start $$end else quiet_cmd_static_rela = -cmd_static_rela = true +cmd_static_rela = endif # Always append INPUTS so that arch config.mk's can add custom ones @@ -1312,7 +1312,11 @@ endif shell_cmd = { $(call echo-cmd,$(1)) $(cmd_$(1)); } quiet_cmd_objcopy_uboot = OBJCOPY $@ +ifdef cmd_static_rela cmd_objcopy_uboot = $(cmd_objcopy) && $(call shell_cmd,static_rela,$<,$@,$(CONFIG_SYS_TEXT_BASE)) || { rm -f $@; false; } +else +cmd_objcopy_uboot = $(cmd_objcopy) +endif u-boot-nodtb.bin: u-boot FORCE $(call if_changed,objcopy_uboot) -- 2.20.1

3 5

[PATCH 1/3] net: e1000: Remove unused bus_to_phys() macro
by Stefan Roese 27 Jan '21

27 Jan '21

bus_to_phys() is defined but not referenced at all. This patch removes it completely. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Aaron Williams <awilliams(a)marvell.com> Cc: Chandrakala Chavva <cchavva(a)marvell.com> --- drivers/net/e1000.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 8e6c755f64..2c57786ec9 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -47,10 +47,8 @@ tested on both gig copper and gig fiber boards #ifdef CONFIG_DM_ETH #define virt_to_bus(devno, v) dm_pci_virt_to_mem(devno, (void *) (v)) -#define bus_to_phys(devno, a) dm_pci_mem_to_phys(devno, a) #else #define virt_to_bus(devno, v) pci_virt_to_mem(devno, (void *) (v)) -#define bus_to_phys(devno, a) pci_mem_to_phys(devno, a) #endif #define E1000_DEFAULT_PCI_PBA 0x00000030 -- 2.29.2

2 5

[RESEND 0/7] Refactor generic fastboot_set_reboot_flag implementation
by Roman Kovalivskyi 25 Jan '21

25 Jan '21

Current generic implementation of fastboot_set_reboot_flag is somewhat messy and requires some additional configuration option to be enabled besides CMD_BCB, so it reverts that implementtion in order to bring a new cleaner one. New function called bcb_set_reboot_reason should be exposed by BCB commands, so that all of the details could be put there instead of dealing with it in fastboot implementation directly. After that, fastboot_set_reboot_flag could simply pass correct reboot reason string to the BCB implementation. If CMD_BCB is disabled then the whole operation would return error code, which is no different behaviour than the current implementation. Eugeniu Rosca (5): cmd: bcb: Extract '__bcb_load' from 'do_bcb_load' for internal needs cmd: bcb: Extract '__bcb_set' from 'do_bcb_set' for internal needs cmd: bcb: Extract '__bcb_store' from 'do_bcb_store' for internal needs cmd: bcb: Expose 'bcb_write_reboot_reason' to external callers cmd: bcb: Add support for processing const string literals in bcb_set() Roman Kovalivskyi (2): Revert "fastboot: Add default fastboot_set_reboot_flag implementation" fastboot: Implement generic fastboot_set_reboot_flag cmd/bcb.c | 88 +++++++++++++++++++++++++++------- drivers/fastboot/Kconfig | 12 ----- drivers/fastboot/Makefile | 1 - drivers/fastboot/fb_bcb_impl.c | 43 ----------------- drivers/fastboot/fb_common.c | 12 ++++- include/bcb.h | 20 ++++++++ include/fastboot.h | 9 ---- 7 files changed, 101 insertions(+), 84 deletions(-) delete mode 100644 drivers/fastboot/fb_bcb_impl.c create mode 100644 include/bcb.h -- 2.17.1

5 15

[patch v3 0/9] rk3399 (Pinebook pro) EDP support
by Arnaud Patard 25 Jan '21

25 Jan '21

This patchset add support for the rk3399 eDP. It has been tested on the pinebook pro and Google Kevin chromeos devices. The changes have been written by studying the linux code, since I didn't find any manual for theses part of the RK3399 SoC. On the linux kernel side, on recent kernels, it needs commit "pwm: rockchip: Keep enabled PWMs running while probing" otherwise the pinebook pro will freeze when probing the display. Changes since v2: - Respect alphabetical order in uboot.dtsi in patch "rk3399-pinebook-pro-u-boot.dtsi: Enable edp" - drop "configs/pinebook-pro-rk3399_defconfig: enable SYS_USB_EVENT_POLL_VIA_INT_QUEUE" (pbp_defconfig_usb_poll.patch) patch, since the same change has been merged with change https://gitlab.denx.de/u-boot/custodians/u-boot-rockchip/-/commit/b197c934b… - change patch subjects. Changes since v1: - Add reset support for the VOP and eDP. This was needed and it appears to also solve the issue with warm reset. - Fix a debug string in the vop driver - Drop the patch "drivers/video/rockchip/rk_edp.c: Change clock rate". - Address various comments

3 14

[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] 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 00/25] binman: Support compression of sections
by Simon Glass 23 Jan '21

23 Jan '21

This series includes a number of improvements and refactors to support compressing entire sections. This is sometimes useful when a section contains a number of entries which are accessed as a whole and are best compressed together. Most of the effort here is clarifying what is in a section and what is added by its parent (i.e. padding). But the opportunity is taken to tidy up and somewhat simplify some of the section-handling code. Also some new tests are added to reduce the amount of undefined behaviour. This series is available at u-boot-dm/binman-working Simon Glass (25): binman: Give a sensible error if no command is given binman: Fix return from u-boot-ucode if there is no DT binman: Remove references to 'image' in entry_Section binman: Expand the error message for breaching a section binman: Move CompressData() into Entry base class binman: Use 'files-compress' to set compression for files binman: Update testPackExtra with more checks binman: Expand docs and test for padding binman: Expand docs and test for alignment binman: Move section-building code into a function binman: Refactor _BuildSectionData() binman: Move section padding to the parent binman: Make section padding consistent with other entries binman: Store the original data before compression binman: Set section contents in GetData() binman: Avoid reporting image-pos with compression binman: Drop Entry.CheckOffset() binman: Move sort and expand to the main Pack() function binman: Drop the Entry.CheckSize() method binman: Call CheckSize() from the section's Pack() method binman: Drop CheckEntries() binman: Update CheckEntries() for compressed sections binman: Use the actual contents in CheckSize() binman: Support compression of sections binman: Avoid calculated section data repeatedly tools/binman/README | 72 ++-- tools/binman/README.entries | 15 +- tools/binman/cmdline.py | 1 + tools/binman/control.py | 4 +- tools/binman/entry.py | 65 +++- tools/binman/etype/blob.py | 7 - tools/binman/etype/cbfs.py | 6 +- tools/binman/etype/files.py | 7 +- tools/binman/etype/section.py | 167 +++++++-- tools/binman/etype/u_boot_ucode.py | 1 + tools/binman/ftest.py | 347 +++++++++++++++++- tools/binman/image.py | 2 +- tools/binman/test/009_pack_extra.dts | 2 +- tools/binman/test/085_files_compress.dts | 2 +- tools/binman/test/177_section_pad.dts | 27 ++ tools/binman/test/178_section_align.dts | 34 ++ tools/binman/test/179_compress_image.dts | 14 + tools/binman/test/180_compress_image_less.dts | 14 + .../binman/test/181_compress_section_size.dts | 17 + tools/binman/test/182_compress_section.dts | 16 + tools/binman/test/183_compress_extra.dts | 37 ++ 21 files changed, 753 insertions(+), 104 deletions(-) create mode 100644 tools/binman/test/177_section_pad.dts create mode 100644 tools/binman/test/178_section_align.dts create mode 100644 tools/binman/test/179_compress_image.dts create mode 100644 tools/binman/test/180_compress_image_less.dts create mode 100644 tools/binman/test/181_compress_section_size.dts create mode 100644 tools/binman/test/182_compress_section.dts create mode 100644 tools/binman/test/183_compress_extra.dts -- 2.29.0.rc1.297.gfa9743e501-goog

2 37

[PATCH 1/4] fastboot: mmc: Add CONFIG_FASTBOOT_MMC_USER_SUPPORT
by Patrick Delaunay 23 Jan '21

23 Jan '21

Split userdata and boot partition support for eMMC update and correct the description (update is supported). The new configuration CONFIG_FASTBOOT_MMC_USER_SUPPORT allows to activate support of userdata partition update, based on target name=CONFIG_FASTBOOT_MMC_USER_NAME This patch also removes the unnecessary dependency with ARCH_MEDIATEK and EFI_PARTITION. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- configs/mt8518_ap1_emmc_defconfig | 1 + drivers/fastboot/Kconfig | 22 +++++++++++++++++----- drivers/fastboot/fb_mmc.c | 9 ++++++--- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/configs/mt8518_ap1_emmc_defconfig b/configs/mt8518_ap1_emmc_defconfig index b95d2c683a..d5fb0ccd48 100644 --- a/configs/mt8518_ap1_emmc_defconfig +++ b/configs/mt8518_ap1_emmc_defconfig @@ -25,6 +25,7 @@ CONFIG_FASTBOOT_BUF_SIZE=0x1E00000 CONFIG_FASTBOOT_FLASH=y CONFIG_FASTBOOT_FLASH_MMC_DEV=0 CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT=y +CONFIG_FASTBOOT_MMC_USER_SUPPORT=y CONFIG_DM_MMC=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig index d4436dfc91..45e07d05e0 100644 --- a/drivers/fastboot/Kconfig +++ b/drivers/fastboot/Kconfig @@ -124,14 +124,26 @@ config FASTBOOT_MMC_BOOT1_NAME defined here. The default target name for updating EMMC_BOOT1 is "mmc0boot0". +config FASTBOOT_MMC_USER_SUPPORT + bool "Enable eMMC userdata partition flash/erase" + depends on FASTBOOT_FLASH_MMC + help + Define this to enable the support "flash" and "erase" command on + eMMC userdata. The "flash" command only update the MBR and GPT + header when CONFIG_EFI_PARTITION is supported. + The "erase" command erase all the userdata. + This occurs when the specified "partition name" on the + fastboot command line matches the value CONFIG_FASTBOOT_MMC_USER_NAME. + config FASTBOOT_MMC_USER_NAME - string "Target name for erasing EMMC_USER" - depends on FASTBOOT_FLASH_MMC && EFI_PARTITION && ARCH_MEDIATEK + string "Target name for updating EMMC_USER" + depends on FASTBOOT_MMC_USER_SUPPORT default "mmc0" help - The fastboot "erase" command supports erasing EMMC_USER. This occurs - when the specified "EMMC_USER name" on the "fastboot erase" commands - match the value defined here. + The fastboot "flash" and "erase" command supports EMMC_USER. + This occurs when the specified "EMMC_USER name" on the + "fastboot flash" and the "fastboot erase" commands match the value + defined here. The default target name for erasing EMMC_USER is "mmc0". config FASTBOOT_GPT_NAME diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index b2f8932e1c..ab6674cac2 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -132,7 +132,8 @@ static void write_raw_image(struct blk_desc *dev_desc, fastboot_okay(NULL, response); } -#ifdef CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT +#if defined(CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT) || \ + defined(CONFIG_FASTBOOT_MMC_USER_SUPPORT) static int fb_mmc_erase_mmc_hwpart(struct blk_desc *dev_desc) { lbaint_t blks; @@ -151,7 +152,9 @@ static int fb_mmc_erase_mmc_hwpart(struct blk_desc *dev_desc) return 0; } +#endif +#ifdef CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT static void fb_mmc_boot1_ops(struct blk_desc *dev_desc, void *buffer, u32 buff_sz, char *response) { @@ -427,7 +430,7 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, #endif #if CONFIG_IS_ENABLED(EFI_PARTITION) -#ifndef CONFIG_FASTBOOT_MMC_USER_NAME +#ifndef CONFIG_FASTBOOT_MMC_USER_SUPPORT if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0) { #else if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0 || @@ -551,7 +554,7 @@ void fastboot_mmc_erase(const char *cmd, char *response) } #endif -#ifdef CONFIG_FASTBOOT_MMC_USER_NAME +#ifdef CONFIG_FASTBOOT_MMC_USER_SUPPORT if (strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) { /* erase EMMC userdata */ if (fb_mmc_erase_mmc_hwpart(dev_desc)) -- 2.17.1

3 5

[PATCH 00/16] usb: gadget: update
by peng.fan＠nxp.com 23 Jan '21

23 Jan '21

From: Peng Fan <peng.fan(a)nxp.com> This patchset is to upstream NXP downstream gadget driver patches for feature update. Jun Li (2): usb: gadget: set correct usb_configuration for os_desc_config usb: gadget: update os_desc_config when add config Li Jun (13): usb: gadget: don't change ep name for dwc3 while ep autoconfig usb: gadget: OS String support usb: gadget: move utf8_to_utf16le to header file usb: gadget: OS Feature Descriptors support usb: gadget: add WCID support for mfgtool usb: gadget: fastboot: add ext properties for WCID usb: gadget: add super speed support usb: fastboot: add super speed support usb: gadget: dnl: set dnl to be super speed usb: composite: force gadget to be USB2 for HS only function usb: udc: ci: update speed handling usb: gadget: fastboot: use correct max packet size usb: gaget: ci: set ep's desc when enable ep Ye Li (1): usb: gadget: Add ep_config call back to usb_gadget_ops drivers/usb/gadget/ci_udc.c | 5 +- drivers/usb/gadget/composite.c | 392 +++++++++++++++++++++++++++++--- drivers/usb/gadget/epautoconf.c | 6 + drivers/usb/gadget/f_fastboot.c | 83 ++++++- drivers/usb/gadget/g_dnl.c | 1 + drivers/usb/gadget/u_os_desc.h | 123 ++++++++++ drivers/usb/gadget/usbstring.c | 74 +----- include/linux/usb/composite.h | 71 ++++++ include/linux/usb/gadget.h | 9 + include/linux/utf.h | 75 ++++++ 10 files changed, 734 insertions(+), 105 deletions(-) create mode 100644 drivers/usb/gadget/u_os_desc.h create mode 100644 include/linux/utf.h -- 2.28.0

3 19