April 2020 - U-Boot

[PATCH] arm: meson: imply DM_RNG
by Heinrich Schuchardt 15 Apr '20

15 Apr '20

All ARCH_MESON boards have a hardware random number generator. So we should enable building the RNG driver. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/arm/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index bbb1e2738b..eee4538c7e 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -762,6 +762,7 @@ config ARCH_OMAP2PLUS config ARCH_MESON bool "Amlogic Meson" imply DISTRO_DEFAULTS + imply DM_RNG help Support for the Meson SoC family developed by Amlogic Inc., targeted at media players and tablet computers. We currently -- 2.25.1

2 2

[PATCH 1/1] configs: correct SMBIOS information for ODROID-C2
by Heinrich Schuchardt 15 Apr '20

15 Apr '20

CONFIG_SMBIOS_MANUFACTURER="amlogic" CONFIG_SMBIOS_PRODUCT_NAME="p200" is incorrect for the ODROID-C2. Show correct board name and manufacturer in SMBIOS. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- configs/odroid-c2_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 64fbfdf064..39279b40db 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -7,6 +7,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_DEBUG_UART_BASE=0xc81004c0 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_IDENT_STRING=" odroid-c2" +CONFIG_SMBIOS_PRODUCT_NAME="ODROID-C2" CONFIG_DEBUG_UART=y CONFIG_OF_BOARD_SETUP=y CONFIG_CONSOLE_MUX=y @@ -41,3 +42,4 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_MESON_SERIAL=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SMBIOS_MANUFACTURER="Hardkernel Co., Ltd." -- 2.25.1

2 1

[PATCH v3 00/29] dm: Add programmatic generation of ACPI tables (part A)
by Simon Glass 15 Apr '20

15 Apr '20

This is split from the original series in an attempt to get things applied in chunks. This section includes patches up to and including the 'acpi' command. Changes in v3: - Add a pointer to information about acpi,compatible - Add forward declarations for the functions - Add missing error check in acpi_create_dmar() - Add new patch to add hexdump.h to the unit test header - Add new patch to move acpi_s3.h to include/acpi/ - Beef up the comment explaining how the unaligned address is used - Change the example to ELAN - Compute ACPI_NAME_MAX from ACPI_NAME_LEN - Correct description of acpi,probed - Drop 'Intel' from 'Intel ACPI' - Drop acpi,name in example - Drop duplicate assert - Drop hid-descr-addr - Drop mention of PRIC - Fix 'RSDP' typo - Fix 'XDST' typo - Fix DMA_ typo - Fix a few typos - Fix file comment for acpi_table.c - Fix indenting error mentioned by Andy Shevchenko - Fix stray #endif - Just add the device.txt binding file in this patch - Make use of BIT() - Move acpi_align_large() out of dm_test_acpi_setup_base_tables() - Move acpi_table.h to include/acpi - Rename acpi,desc to acpi,ddn - Rename acpi_align_large() to acpi_align64() - Rename acpi_return_name() to acpi_copy_name() - Reword commit message to drop the bit about ACPI being complicated - Split out hid-over-i2c into its own patch - Update commit message to say that we move most of its contents - Use strncpy() instead of strcpy() in acpi_copy_name() Changes in v2: - Add in the acpi_table.h header file to this patch - Add the hid-over-i2c binding document - Add trailing commas to enum - Don't bracket the definitions with DM_SPI - Drop definition of ACPI_TABLE_CREATOR - Drop the Chrome OS pieces - Drop the other comment change since it is already applied - Drop two unnecessary __packed - Fix definition of HID - Generalise the ACPI function recursion with acpi_recurse_method() - Infer hid-over-i2c CID value - Make _acpi_write_dev_tables() static and switch argument order - Move LOGC_ACPI definition to this patch - Move __packed to after struct - Move the sandbox acpi_table.h header file to an earlier patch - Rename the 'coreboot' console to 'U-Boot' - Use #defines for MADT and MCFG version numbers Simon Glass (29): cpu: Support querying the address width spi: Add SPI mode enums tpm: cr50: Release locality on exit tpm: cr50: Add a comment for cr50_priv tpm: cr50: Use the correct GPIO binding tpm: Don't cleanup unless an error happens dm: pci: Allow disabling auto-config for a device x86: Correct wording of coreboot source code x86: apl: Move p2sb ofdata reading to the correct method pci: Adjust dm_pci_read_bar32() to return errors correctly x86: apl: Add Global NVS table header dm: core: Add basic ACPI support dts: Add a binding for hid-over-i2c acpi: Add a binding for ACPI settings in the device tree acpi: Add a simple sandbox test x86: Move acpi_s3.h to include/acpi/ x86: Move acpi_table header to main include/ directory acpi: Add an __ACPI__ preprocessor symbol acpi: Add a central location for table version numbers acpi: Add support for DMAR test: Add hexdump.h to the unit test header acpi: Add a method to write tables for a device acpi: Convert part of acpi_table to use acpi_ctx x86: Allow devices to write ACPI tables acpi: Drop code for missing XSDT from acpi_write_rsdp() acpi: Move acpi_add_table() to generic code acpi: Put table-setup code in its own function acpi: Move the xsdt pointer to acpi_ctx acpi: Add an acpi command arch/sandbox/dts/test.dts | 8 + arch/sandbox/include/asm/acpi_table.h | 9 + arch/sandbox/include/asm/global_data.h | 1 + arch/x86/cpu/apollolake/cpu_spl.c | 2 +- arch/x86/cpu/apollolake/fsp_s.c | 2 +- arch/x86/cpu/apollolake/pmc.c | 2 +- arch/x86/cpu/baytrail/acpi.c | 6 +- arch/x86/cpu/coreboot/timestamp.c | 4 +- arch/x86/cpu/cpu.c | 4 +- arch/x86/cpu/intel_common/p2sb.c | 33 +- arch/x86/cpu/quark/acpi.c | 2 +- arch/x86/cpu/tangier/acpi.c | 4 +- arch/x86/cpu/wakeup.S | 2 +- arch/x86/dts/chromebook_coral.dts | 2 +- arch/x86/include/asm/acpi_table.h | 381 +----------- .../include/asm/arch-apollolake/global_nvs.h | 36 ++ .../x86/include/asm/arch-coreboot/timestamp.h | 4 +- arch/x86/include/asm/global_data.h | 1 + arch/x86/include/asm/intel_pinctrl_defs.h | 2 - arch/x86/lib/acpi.c | 2 +- arch/x86/lib/acpi_s3.c | 4 +- arch/x86/lib/acpi_table.c | 240 ++------ arch/x86/lib/coreboot_table.c | 2 +- arch/x86/lib/fsp/fsp_common.c | 2 +- arch/x86/lib/fsp1/fsp_common.c | 2 +- arch/x86/lib/fsp2/fsp_dram.c | 2 +- arch/x86/lib/tables.c | 2 +- arch/x86/lib/zimage.c | 2 +- cmd/Kconfig | 14 + cmd/Makefile | 1 + cmd/acpi.c | 179 ++++++ doc/device-tree-bindings/device.txt | 37 ++ .../gpio/intel,apl-gpio.txt | 2 +- .../input/hid-over-i2c.txt | 44 ++ .../interrupt-controller/intel,acpi-gpe.txt | 2 +- doc/device-tree-bindings/pci/x86-pci.txt | 23 + drivers/core/Kconfig | 9 + drivers/core/Makefile | 1 + drivers/core/acpi.c | 94 +++ drivers/cpu/cpu_sandbox.c | 1 + drivers/pci/pci-uclass.c | 11 +- drivers/pci/pci_rom.c | 4 +- drivers/power/acpi_pmc/acpi-pmc-uclass.c | 2 +- drivers/sysreset/sysreset_x86.c | 2 +- drivers/tpm/cr50_i2c.c | 24 +- drivers/tpm/tpm-uclass.c | 13 +- include/{ => acpi}/acpi_s3.h | 0 include/acpi/acpi_table.h | 581 ++++++++++++++++++ include/cpu.h | 2 + include/dm/acpi.h | 114 ++++ include/dm/device.h | 5 + include/dm/uclass-id.h | 1 + include/log.h | 2 + include/spi.h | 33 + include/test/ut.h | 1 + lib/Makefile | 1 + lib/acpi/Makefile | 4 + lib/acpi/acpi_table.c | 257 ++++++++ lib/efi_loader/efi_acpi.c | 2 +- scripts/Makefile.lib | 4 +- test/dm/Makefile | 1 + test/dm/acpi.c | 317 ++++++++++ test/dm/cpu.c | 1 + 63 files changed, 1915 insertions(+), 637 deletions(-) create mode 100644 arch/sandbox/include/asm/acpi_table.h create mode 100644 arch/x86/include/asm/arch-apollolake/global_nvs.h create mode 100644 cmd/acpi.c create mode 100644 doc/device-tree-bindings/device.txt create mode 100644 doc/device-tree-bindings/input/hid-over-i2c.txt create mode 100644 drivers/core/acpi.c rename include/{ => acpi}/acpi_s3.h (100%) create mode 100644 include/acpi/acpi_table.h create mode 100644 include/dm/acpi.h create mode 100644 lib/acpi/Makefile create mode 100644 lib/acpi/acpi_table.c create mode 100644 test/dm/acpi.c -- 2.26.0.rc2.310.g2932bb562d-goog

6 85

[PATCH v1 1/3] dm: serial: Add clock member to struct serial_device_info
by Andy Shevchenko 15 Apr '20

15 Apr '20

Some callers of serial_getinfo() would like to know the UART base clock speed in order to make decision what to pass to OS in some cases. In particular, ACPI SPCR table expects only certain base clock speed and thus we have to act accordingly. Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- drivers/serial/sandbox.c | 1 + include/serial.h | 3 +++ test/dm/serial.c | 1 + 3 files changed, 5 insertions(+) diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 1af5cc12f3..545ff3f747 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -198,6 +198,7 @@ static int sandbox_serial_getinfo(struct udevice *dev, .reg_width = 1, .reg_offset = 0, .reg_shift = 0, + .clock = SERIAL_DEFAULT_CLOCK, }; if (!serial_info) diff --git a/include/serial.h b/include/serial.h index 104f34ff91..54b21a0470 100644 --- a/include/serial.h +++ b/include/serial.h @@ -139,6 +139,7 @@ enum adr_space_type { * @reg_width: size (in bytes) of the IO accesses to the registers * @reg_offset: offset to apply to the @addr from the start of the registers * @reg_shift: quantity to shift the register offsets by + * @clock: UART base clock speed in Hz * @baudrate: baud rate */ struct serial_device_info { @@ -148,10 +149,12 @@ struct serial_device_info { u8 reg_width; u8 reg_offset; u8 reg_shift; + unsigned int clock; unsigned int baudrate; }; #define SERIAL_DEFAULT_ADDRESS 0xBADACCE5 +#define SERIAL_DEFAULT_CLOCK (16 * 115200) /** * struct struct dm_serial_ops - Driver model serial operations diff --git a/test/dm/serial.c b/test/dm/serial.c index 3d741a8c36..c6be6ab7ab 100644 --- a/test/dm/serial.c +++ b/test/dm/serial.c @@ -29,6 +29,7 @@ static int dm_test_serial(struct unit_test_state *uts) ut_assertok(serial_getinfo(dev_serial, &info_serial)); ut_assert(info_serial.type == SERIAL_CHIP_UNKNOWN); ut_assert(info_serial.addr == SERIAL_DEFAULT_ADDRESS); + ut_assert(info_serial.clock == SERIAL_DEFAULT_CLOCK); /* * test with a parameter which is NULL pointer */ -- 2.25.0

3 10

[PATCH V2] mmc: zynq: parse dt when probing
by Benedikt Grassl 15 Apr '20

15 Apr '20

Currently, the entry "bus-width = <8>" in the ZynqMP's sdhci nodes is not evaluated. This results in the bus width staying at its default value (4 bit in HS200 mode). Fix this by calling mmc_of_parse. This function also checks for the "no-1-8-v" and "max-frequency" entries. Remove the handling of those nodes from this driver. Signed-off-by: Benedikt Grassl <Benedikt.Grassl(a)rohde-schwarz.com> --- drivers/mmc/sdhci.c | 3 +-- drivers/mmc/zynq_sdhci.c | 15 ++++++--------- include/sdhci.h | 1 - 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 520c9f9feb..372dc0a820 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -839,8 +839,7 @@ int sdhci_setup_cfg(struct mmc_config *cfg, struct sdhci_host *host, cfg->host_caps &= ~MMC_MODE_HS_52MHz; } - if (!(cfg->voltages & MMC_VDD_165_195) || - (host->quirks & SDHCI_QUIRK_NO_1_8_V)) + if (!(cfg->voltages & MMC_VDD_165_195)) caps_1 &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 | SDHCI_SUPPORT_DDR50); diff --git a/drivers/mmc/zynq_sdhci.c b/drivers/mmc/zynq_sdhci.c index da3ff53da1..cfa61af265 100644 --- a/drivers/mmc/zynq_sdhci.c +++ b/drivers/mmc/zynq_sdhci.c @@ -22,14 +22,12 @@ DECLARE_GLOBAL_DATA_PTR; struct arasan_sdhci_plat { struct mmc_config cfg; struct mmc mmc; - unsigned int f_max; }; struct arasan_sdhci_priv { struct sdhci_host *host; u8 deviceid; u8 bank; - u8 no_1p8; }; #if defined(CONFIG_ARCH_ZYNQMP) @@ -238,8 +236,9 @@ static int arasan_sdhci_probe(struct udevice *dev) host->quirks |= SDHCI_QUIRK_BROKEN_HISPD_MODE; #endif - if (priv->no_1p8) - host->quirks |= SDHCI_QUIRK_NO_1_8_V; + ret = mmc_of_parse(dev, &plat->cfg); + if (ret) + return ret; host->max_clk = clock; @@ -247,10 +246,12 @@ static int arasan_sdhci_probe(struct udevice *dev) host->mmc->dev = dev; host->mmc->priv = host; - ret = sdhci_setup_cfg(&plat->cfg, host, plat->f_max, + ret = sdhci_setup_cfg(&plat->cfg, host, + CONFIG_ZYNQ_SDHCI_MAX_FREQ, CONFIG_ZYNQ_SDHCI_MIN_FREQ); if (ret) return ret; + upriv->mmc = host->mmc; return sdhci_probe(dev); @@ -258,7 +259,6 @@ static int arasan_sdhci_probe(struct udevice *dev) static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev) { - struct arasan_sdhci_plat *plat = dev_get_platdata(dev); struct arasan_sdhci_priv *priv = dev_get_priv(dev); priv->host = calloc(1, sizeof(struct sdhci_host)); @@ -277,10 +277,7 @@ static int arasan_sdhci_ofdata_to_platdata(struct udevice *dev) priv->deviceid = dev_read_u32_default(dev, "xlnx,device_id", -1); priv->bank = dev_read_u32_default(dev, "xlnx,mio_bank", -1); - priv->no_1p8 = dev_read_bool(dev, "no-1-8-v"); - plat->f_max = dev_read_u32_default(dev, "max-frequency", - CONFIG_ZYNQ_SDHCI_MAX_FREQ); return 0; } diff --git a/include/sdhci.h b/include/sdhci.h index aa4378fd57..0ef8c2ed62 100644 --- a/include/sdhci.h +++ b/include/sdhci.h @@ -243,7 +243,6 @@ #define SDHCI_QUIRK_BROKEN_HISPD_MODE BIT(5) #define SDHCI_QUIRK_WAIT_SEND_CMD (1 << 6) #define SDHCI_QUIRK_USE_WIDE8 (1 << 8) -#define SDHCI_QUIRK_NO_1_8_V (1 << 9) /* to make gcc happy */ struct sdhci_host; -- 2.17.1

3 11

Dummy device tree for verified boot
by Gamble, Bradley 15 Apr '20

15 Apr '20

Hello, I am currently attempting to utilize Verified Boot to verify FIT images on my T104x-based device. I am building U-Boot with the standard options for Verified Boot (CONFIG_FIT, CONFIG_FIT_SIGNATURE, CONFIG_RSA, CONFIG_OF_CONTROL and CONFIG_OF_SEPARATE). When building U-Boot I need to supply a DTB image at build time. However, the device I am targetting may have a number of different configurations. This has been manged previously by using a single version of U-Boot and loading different FIT images containing different DTBs based on how the device will be used. Does the DTB supplied to U-Boot at build time have to be "fully-featured"? Can it be a dummy DTB containing minimal nodes just for the purpose of storing the key contents for Verified Boot? Kind regards, BDG ________________________________ [cid:image28dcb9.JPG@434a8dea.4eb6ff24] <http://www.ncipher.com> Bradley Gamble Software Engineer Tel: +44 1293 580000 nCipher Security Manor Royal Crawley RH10 9HA United Kingdom www.ncipher.com<http://www.ncipher.com> [cid:imagec22e21.JPG@371fb8cf.429ceea3]<https://www.ncipher.com/2020/global-encryption-trends-study?utm_source=emai…>

1 0

[PATCH v3 00/23] gitlab: Simplify the test script
by Simon Glass 15 Apr '20

15 Apr '20

At present there are several things in the gitlab, travis and azure scripts which work around limitations in buildman. With a few small feature additions these can be removed. This series adds some new features to buildman and simplifies the script: - Option to run a single build in a specified output directory - Allow ignoring warnings - Removes a restriction on the build output directory It also - adds a way for test.py to use buildman for the --build option - makes one change to azure since the same approach should be possible there - fixes a few minor problems noticed in main and sandbox docs - removes the -a buildman flag which serves no purpose Note: I tested that this works OK on travis, gitlab and azure. There is something funny about azure - the test called "Run binman, buildman, dtoc and patman testsuites" fails the 'buildman -t' test but azure reports success. Changes in v3: - Add more documentation on -W and the interaction with -E - Bring back the -E flag and add -W - Drop mention of -a in the README also - Expand the commit message - Rewrite the commit message Changes in v2: - Add Fixes tag - Add a comment about the obscure bash feature - Add a new patch to avoid copying files into .bm-work/ - Add a new patch to drop the -a option - Add a new patch to split travis building into two parts - Add new patch to drop the repeated buildman call - Convert this into an option, leaving the default as is - Just drop the -E flag - Leave in the repeated call to buildman - Reword the commit message for clarity - Update azure also - Update travis, azure also Simon Glass (23): sandbox: Add documentation about required/useful packages main: Drop show_boot_progress() prototype buildman: Document the members of BuilderJob bulidman: Add support for a simple build buildman: Update help for -d buildman: Allow ignoring warnings in the return code buildman: Be more selective about which directories to remove buildman: Allow building within a subdir of the current dir buildman: Drop the -a option travis: Don't copy files into .bm-work/ travis: Split the building into two parts gitlab/azure: Use the -w option for sandbox_spl travis/gitlab/azure: Use --board buildman flag with test.py travis/gitlab/azure: Drop BUILDMAN variable with test.py travis/gitlab/azure: Drop the buildman -d flag gitlab/azure: Drop unnecessary if..fi when using test.py gitlab/azure: Use -w flag for all test.py builds travis/gitlab/azure: Use bash to avoid a_test_which_does_not_exist travis/gitlab/azure: Use -W to avoid warnings check travis/gitlab/azure: Enable test_handoff travis/gitlab/azure: Simplify the exit code for test.py travis/gitlab/azure: Drop repeated buildman call with test.py test/py: Allow using buildman to build U-Boot .azure-pipelines.yml | 57 +++++----------------- .gitlab-ci.yml | 85 ++++++++++----------------------- .travis.yml | 63 ++++++++---------------- common/main.c | 5 -- doc/arch/sandbox.rst | 10 ++++ test/py/README.md | 13 ++++- test/py/conftest.py | 30 ++++++++---- tools/buildman/README | 35 ++++++++++++-- tools/buildman/builder.py | 51 +++++++++++++++----- tools/buildman/builderthread.py | 34 +++++++++---- tools/buildman/cmdline.py | 8 ++-- tools/buildman/control.py | 52 +++++++------------- tools/buildman/func_test.py | 46 +++++++++++++----- tools/buildman/test.py | 20 ++++++++ 14 files changed, 269 insertions(+), 240 deletions(-) -- 2.25.1.481.gfbce0eb801-goog

3 66

[PATCH v5 00/14] Add support for MediaTek xHCI host controller
by Chunfeng Yun 15 Apr '20

15 Apr '20

The series of patches are used to support xHCI host controller on MediaTek SoCs which has a glue layer IPPC (IP Port Control), and add USB function on T-PHY including T-PHY V1 and V2; Finally add USB related nodes for MT7629 platform. The files of xhci-mtk.* and phy-mtk-tphy.* are ported from Linux Kenrel 5.6-rc1 v5 changes: 1. print error number suggested by Marek 2. support interrupt transfer 3. update MAINTAINER about MediaTek v4 changes: 1. add phy_bulk API 2. use phy_bulk in xhci-mtk driver, also include dwc3/dwc2 drivers v3 changes: 1. provide non/inline edev_get_child_count() suggested by Simon 2. squash [PATCH v2 02/10] into [PATCH v2 03/10] suggested by Simon 3. use macros to access IPPC registers suggested by Marek v2 changes: 1. move ofnode_get_child_count() into ofnode.c suggested by Simon 2. add a test item for ofnode_get_child_count() suggested by Simon 3. use clk_bulk to get clocks suggested by Marek 4. use clrsetbits_le32() etc suggeseted by Marek 5. get the count of phys by dev_get_child_count() 6. drop reference to fixed clock clk20m Chunfeng Yun (14): dm: core: Add function to get child count of ofnode or device test: dm: add test item for ofnode_get_child_count() phy: Add get/enable/disable for a bulk of phys test: dm: phy: add a test item for the phy_bulk API usb: dwc3: use the phy bulk API to get phys usb: dwc2_udc_otg: use the phy bulk API to get phys phy: phy-mtk-tphy: add support USB phys phy: phy-mtk-tphy: add support new version phy: phy-mtk-tphy: add a new reference clock xhci: mediatek: Add support for MTK xHCI host controller arm: dts: mt7629: add usb related nodes dt-bindings: phy-mtk-tphy: add properties of address mapping and clocks dt-bindings: usb: mtk-xhci: Add binding for MediaTek xHCI host controller MAINTAINERS: MediaTek: add USB related files MAINTAINERS | 3 + arch/arm/dts/mt7629-rfb.dts | 8 + arch/arm/dts/mt7629.dtsi | 41 +++ arch/sandbox/dts/test.dts | 29 ++ doc/device-tree-bindings/phy/phy-mtk-tphy.txt | 78 ++++- .../usb/mediatek,mtk-xhci.txt | 40 +++ drivers/core/ofnode.c | 11 + drivers/core/read.c | 5 + drivers/phy/phy-mtk-tphy.c | 316 +++++++++++++++++- drivers/phy/phy-uclass.c | 80 +++++ drivers/usb/dwc3/core.c | 83 +---- drivers/usb/dwc3/dwc3-generic.c | 7 +- drivers/usb/gadget/dwc2_udc_otg.c | 90 +---- drivers/usb/host/Kconfig | 6 + drivers/usb/host/Makefile | 1 + drivers/usb/host/xhci-mtk.c | 296 ++++++++++++++++ drivers/usb/host/xhci.c | 10 + include/dm/ofnode.h | 8 + include/dm/read.h | 13 + include/dwc3-uboot.h | 11 +- include/generic-phy.h | 66 ++++ include/usb/xhci.h | 3 + test/dm/ofnode.c | 21 ++ test/dm/phy.c | 29 ++ 24 files changed, 1066 insertions(+), 189 deletions(-) create mode 100644 doc/device-tree-bindings/usb/mediatek,mtk-xhci.txt create mode 100644 drivers/usb/host/xhci-mtk.c -- 2.25.1

3 30

Please pull u-boot/next
by Simon Glass 15 Apr '20

15 Apr '20

Hi Tom, The following changes since commit 587e4a4296982f85b2a40fc8a704db65079e0aac: kconfig / kbuild: Re-sync with Linux 4.19 (2020-04-10 11:18:32 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-next-pull-10apr20 for you to fetch changes up to f7553b0e808f38d6303445661db062b74e865de9: dm: core: Read parent ofdata before children (2020-04-10 13:11:10 -0600) ---------------------------------------------------------------- Functions for reading indexed values from device tree Enhancements to 'dm' command Log test enhancements and syslog driver DM change to read parent ofdata before children Minor fixes ---------------------------------------------------------------- Dario Binacchi (3): dm: test: add test case for dev_read_u64 function dm: core: support reading a single indexed u32 value dm: core: refactor functions reading an u32 from dt Heinrich Schuchardt (12): dm: core: remove redundant if statement dm: core: remove redundant assignment log: correct CONFIG_LOG_TEST prerequisites log: syslog driver log: output for CONFIG_LOG=n test: log functions with CONFIG_LOG=n test: log: test syslog logging driver configs: sandbox: enable LOG_SYSLOG doc: driver-model: there is no UCLASS_ETHERNET sandbox: add reserved-memory node in device tree sandbox: implement ft_board_setup() sandbox: enable CMD_BOOTEFI_HELLO and CMD_EFIDEBUG Laurentiu Tudor (2): fdtdec: support multiple phandles in memory carveout test: fdtdec: test fdtdec_set_carveout() Michael Walle (1): dm: uclass: don't assign aliased seq numbers Ovidiu Panait (2): dm: dump.c: Fix segfault when entry->of_match is NULL dm: dump.c: Refactor dm_dump_drivers prints Patrick Delaunay (2): dm: core: Move "/chosen" and "/firmware" node scan dm: core: remove the duplicated function dm_ofnode_pre_reloc Rasmus Villemoes (1): sandbox: also restore terminal settings when killed by SIGINT Sean Anderson (1): serial: Set baudrate on boot Simon Glass (5): sandbox: p2sb: Silence compiler warning patman: Apply the cc limit to the cover letter also dm: core: Add logging on unbind failure dm: core: Add a way to skip powering down power domains dm: core: Read parent ofdata before children Tom Rini (1): sandbox: Update PCI nodes in dts files Tom Warren (1): fdt: Fix 'system' command MAINTAINERS | 4 +- arch/Kconfig | 1 + arch/sandbox/cpu/os.c | 9 ++ arch/sandbox/dts/sandbox.dts | 24 +++- arch/sandbox/dts/sandbox.dtsi | 2 +- arch/sandbox/dts/sandbox64.dts | 25 ++++- arch/sandbox/dts/test.dts | 15 ++- board/sandbox/sandbox.c | 6 + cmd/fdt.c | 2 +- common/Kconfig | 9 +- common/Makefile | 1 + common/log_syslog.c | 117 ++++++++++++++++++++ configs/sandbox64_defconfig | 3 + configs/sandbox_defconfig | 2 + configs/sandbox_flattree_defconfig | 3 + configs/sandbox_spl_defconfig | 2 + doc/README.log | 3 + doc/driver-model/design.rst | 96 +++++++++++----- doc/driver-model/pci-info.rst | 10 +- drivers/clk/altera/clk-arria10.c | 2 +- drivers/clk/at91/pmc.c | 2 +- drivers/core/device-remove.c | 23 ++-- drivers/core/device.c | 22 +++- drivers/core/dump.c | 17 ++- drivers/core/lists.c | 2 +- drivers/core/of_access.c | 40 ++++--- drivers/core/ofnode.c | 49 ++++++--- drivers/core/read.c | 13 +++ drivers/core/root.c | 52 +++------ drivers/core/uclass.c | 28 +++-- drivers/core/util.c | 28 ----- drivers/misc/p2sb_emul.c | 2 +- drivers/serial/serial-uclass.c | 1 + include/configs/sandbox.h | 6 +- include/dm/device.h | 11 +- include/dm/of_access.h | 19 ++++ include/dm/ofnode.h | 25 +++++ include/dm/read.h | 40 +++++++ include/dm/util.h | 27 ----- include/log.h | 10 +- include/test/log.h | 16 +++ include/test/suites.h | 1 + include/test/ut.h | 16 +++ lib/fdtdec.c | 36 ++++-- test/Kconfig | 9 ++ test/Makefile | 2 +- test/cmd_ut.c | 6 + test/dm/Makefile | 1 + test/dm/eth.c | 14 +-- test/dm/fdtdec.c | 59 ++++++++++ test/dm/test-fdt.c | 88 ++++++++++++++- test/log/Makefile | 14 +++ test/log/nolog_test.c | 135 +++++++++++++++++++++++ test/log/syslog_test.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++ test/log/test-main.c | 20 ++++ tools/patman/series.py | 6 +- 56 files changed, 1222 insertions(+), 234 deletions(-) create mode 100644 common/log_syslog.c create mode 100644 include/test/log.h create mode 100644 test/dm/fdtdec.c create mode 100644 test/log/nolog_test.c create mode 100644 test/log/syslog_test.c create mode 100644 test/log/test-main.c Regards, SImon

2 2

[RFC PATCH 1/3] spl: spl_nor: Move legacy image loading into spl_legacy.c
by Stefan Roese 15 Apr '20

15 Apr '20

Move the legacy image loading into spl_legacy.c. This makes it easier to extend the legacy image handling with new features that other SPL loaders might use (e.g. spl_spi.c etc). No functional change intended. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Weijie Gao <weijie.gao(a)mediatek.com> Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Cc: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- RFC comment: I'm sendig these 3 patches as RFC and once we've come to an agreement on these (Acked etc), I'll integrate them into the mtmips SPL patchset from Weijie and will send v7. Thanks, Stefan common/spl/spl_legacy.c | 20 ++++++++++++++++++++ common/spl/spl_nor.c | 27 +++++++++++++-------------- include/spl.h | 13 +++++++++++++ 3 files changed, 46 insertions(+), 14 deletions(-) diff --git a/common/spl/spl_legacy.c b/common/spl/spl_legacy.c index 772135193e..7f00fc8885 100644 --- a/common/spl/spl_legacy.c +++ b/common/spl/spl_legacy.c @@ -51,3 +51,23 @@ int spl_parse_legacy_header(struct spl_image_info *spl_image, return 0; } + +int spl_load_legacy_img(struct spl_image_info *spl_image, + struct spl_load_info *load, ulong header) +{ + struct image_header hdr; + int ret; + + /* Read header into local struct */ + load->read(load, header, sizeof(hdr), &hdr); + + ret = spl_parse_image_header(spl_image, &hdr); + if (ret) + return ret; + + /* Read image */ + load->read(load, header + sizeof(hdr), spl_image->size, + (void *)(unsigned long)spl_image->load_addr); + + return 0; +} diff --git a/common/spl/spl_nor.c b/common/spl/spl_nor.c index b1e79b9ded..3f03ffe6a3 100644 --- a/common/spl/spl_nor.c +++ b/common/spl/spl_nor.c @@ -24,7 +24,6 @@ unsigned long __weak spl_nor_get_uboot_base(void) static int spl_nor_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { - int ret; __maybe_unused const struct image_header *header; __maybe_unused struct spl_load_info load; @@ -43,6 +42,8 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, header = (const struct image_header *)CONFIG_SYS_OS_BASE; #ifdef CONFIG_SPL_LOAD_FIT if (image_get_magic(header) == FDT_MAGIC) { + int ret; + debug("Found FIT\n"); load.bl_len = 1; load.read = spl_nor_load_read; @@ -61,6 +62,7 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, #endif if (image_get_os(header) == IH_OS_LINUX) { /* happy - was a Linux */ + int ret; ret = spl_parse_image_header(spl_image, header); if (ret) @@ -93,11 +95,9 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, debug("Found FIT format U-Boot\n"); load.bl_len = 1; load.read = spl_nor_load_read; - ret = spl_load_simple_fit(spl_image, &load, - spl_nor_get_uboot_base(), - (void *)header); - - return ret; + return spl_load_simple_fit(spl_image, &load, + spl_nor_get_uboot_base(), + (void *)header); } #endif if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { @@ -107,14 +107,13 @@ static int spl_nor_load_image(struct spl_image_info *spl_image, spl_nor_get_uboot_base()); } - ret = spl_parse_image_header(spl_image, - (const struct image_header *)spl_nor_get_uboot_base()); - if (ret) - return ret; - - memcpy((void *)(unsigned long)spl_image->load_addr, - (void *)(spl_nor_get_uboot_base() + sizeof(struct image_header)), - spl_image->size); + /* Legacy image handling */ + if (IS_ENABLED(CONFIG_SPL_LEGACY_IMAGE_SUPPORT)) { + load.bl_len = 1; + load.read = spl_nor_load_read; + return spl_load_legacy_img(spl_image, &load, + spl_nor_get_uboot_base()); + } return 0; } diff --git a/include/spl.h b/include/spl.h index 6087cd793c..c6c64b6a72 100644 --- a/include/spl.h +++ b/include/spl.h @@ -219,6 +219,19 @@ int spl_load_simple_fit(struct spl_image_info *spl_image, #define SPL_COPY_PAYLOAD_ONLY 1 #define SPL_FIT_FOUND 2 +/** + * spl_load_legacy_img() - Loads a legacy image from a device. + * @spl_image: Image description to set up + * @load: Structure containing the information required to load data. + * @header: Pointer to image header (including appended image) + * + * Reads an legacy image from the device. Loads u-boot image to + * specified load address. + * Returns 0 on success. + */ +int spl_load_legacy_img(struct spl_image_info *spl_image, + struct spl_load_info *load, ulong header); + /** * spl_load_imx_container() - Loads a imx container image from a device. * @spl_image: Image description to set up -- 2.26.0

2 8