March 2021 - U-Boot

[PATCH] dts: mt7629: enable JTAG pins by default
by Weijie Gao 21 Mar '21

21 Mar '21

The EPHY LEDs belongs to the built-in FE switch of MT7629, which is barely used. These LED pins on reference boards are used as JTAG socket. So it's a good idea to change the default state to JTAG, and this will make it convenience for debugging. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- arch/arm/dts/mt7629-rfb.dts | 10 ++++++++++ arch/arm/dts/mt7629.dtsi | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/arch/arm/dts/mt7629-rfb.dts b/arch/arm/dts/mt7629-rfb.dts index df43cc49c5..f2e4e9548b 100644 --- a/arch/arm/dts/mt7629-rfb.dts +++ b/arch/arm/dts/mt7629-rfb.dts @@ -36,6 +36,16 @@ }; &pinctrl { + state_default: pinmux_conf { + u-boot,dm-pre-reloc; + + mux { + function = "jtag"; + groups = "ephy_leds_jtag"; + u-boot,dm-pre-reloc; + }; + }; + snfi_pins: snfi-pins { mux { function = "flash"; diff --git a/arch/arm/dts/mt7629.dtsi b/arch/arm/dts/mt7629.dtsi index 05394266e0..7dea7809c7 100644 --- a/arch/arm/dts/mt7629.dtsi +++ b/arch/arm/dts/mt7629.dtsi @@ -152,6 +152,12 @@ compatible = "mediatek,mt7629-pinctrl"; reg = <0x10217000 0x8000>; + pinctrl-names = "default"; + pinctrl-0 = <&state_default>; + + state_default: pinmux_conf { + }; + gpio: gpio-controller { gpio-controller; #gpio-cells = <2>; -- 2.17.1

2 1

[PATCH] configs: mt7622: use ARMv8 Generic Timer instead of mtk_timer
by Weijie Gao 21 Mar '21

21 Mar '21

It's better to use the generic timer which is correctly initialized by the ATF. The generic timer has higher resolution than the mtk_timer. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- configs/mt7622_rfb_defconfig | 2 -- 1 file changed, 2 deletions(-) diff --git a/configs/mt7622_rfb_defconfig b/configs/mt7622_rfb_defconfig index fa427d8530..12f529158c 100644 --- a/configs/mt7622_rfb_defconfig +++ b/configs/mt7622_rfb_defconfig @@ -51,8 +51,6 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MTK_SNOR=y CONFIG_SYSRESET_WATCHDOG=y -CONFIG_TIMER=y -CONFIG_MTK_TIMER=y CONFIG_WDT_MTK=y CONFIG_LZO=y CONFIG_HEXDUMP=y -- 2.17.1

2 1

[PATCH 0/4] Minor fixes for MediaTek pinctrl driver
by Weijie Gao 21 Mar '21

21 Mar '21

This patch series provides fixes for MediaTek pinctrl driver common parts and mt7629. Sam Shih (2): pinctrl: mediatek: fix wrong assignment in mtk_get_pin_name pinctrl: mediatek: add get_pin_muxing ops for mediatek pinctrl Weijie Gao (2): pinctrl: mediatek: do not probe gpio driver if not enabled pinctrl: mt7629: add jtag function and pin group drivers/pinctrl/mediatek/pinctrl-mt7629.c | 7 +++++ drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 28 +++++++++++++++---- 2 files changed, 30 insertions(+), 5 deletions(-) -- 2.17.1

2 8

[PATCH 1/2] ARM: mediatek: Add MT8183 support
by Fabien Parent 21 Mar '21

21 Mar '21

Add the MT8183 SoC support. Signed-off-by: Fabien Parent <fparent(a)baylibre.com> --- arch/arm/dts/mt8183.dtsi | 274 +++++++++++++++++++++++++ arch/arm/mach-mediatek/Kconfig | 9 + arch/arm/mach-mediatek/Makefile | 1 + arch/arm/mach-mediatek/mt8183/Makefile | 3 + arch/arm/mach-mediatek/mt8183/init.c | 80 ++++++++ 5 files changed, 367 insertions(+) create mode 100644 arch/arm/dts/mt8183.dtsi create mode 100644 arch/arm/mach-mediatek/mt8183/Makefile create mode 100644 arch/arm/mach-mediatek/mt8183/init.c diff --git a/arch/arm/dts/mt8183.dtsi b/arch/arm/dts/mt8183.dtsi new file mode 100644 index 000000000000..294aa2b89796 --- /dev/null +++ b/arch/arm/dts/mt8183.dtsi @@ -0,0 +1,274 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* + * Copyright (C) 2021 MediaTek Inc. + * Copyright (C) 2021 BayLibre, SAS + * Author: Ben Ho <ben.ho(a)mediatek.com> + * Erin Lo <erin.lo(a)mediatek.com> + * Fabien Parent <fparent(a)baylibre.com> + */ + +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/clock/mt8183-clk.h> +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/phy/phy.h> + +/ { + compatible = "mediatek,mt8183"; + interrupt-parent = <&sysirq>; + #address-cells = <2>; + #size-cells = <2>; + + cpus { + #address-cells = <1>; + #size-cells = <0>; + + cpu-map { + cluster0 { + core0 { + cpu = <&cpu0>; + }; + core1 { + cpu = <&cpu1>; + }; + core2 { + cpu = <&cpu2>; + }; + core3 { + cpu = <&cpu3>; + }; + }; + + cluster1 { + core0 { + cpu = <&cpu4>; + }; + core1 { + cpu = <&cpu5>; + }; + core2 { + cpu = <&cpu6>; + }; + core3 { + cpu = <&cpu7>; + }; + }; + }; + + cpu0: cpu@0 { + device_type = "cpu"; + compatible = "arm,cortex-a53"; + reg = <0x000>; + enable-method = "psci"; + capacity-dmips-mhz = <741>; + }; + + cpu1: cpu@1 { + device_type = "cpu"; + compatible = "arm,cortex-a53"; + reg = <0x001>; + enable-method = "psci"; + capacity-dmips-mhz = <741>; + }; + + cpu2: cpu@2 { + device_type = "cpu"; + compatible = "arm,cortex-a53"; + reg = <0x002>; + enable-method = "psci"; + capacity-dmips-mhz = <741>; + }; + + cpu3: cpu@3 { + device_type = "cpu"; + compatible = "arm,cortex-a53"; + reg = <0x003>; + enable-method = "psci"; + capacity-dmips-mhz = <741>; + }; + + cpu4: cpu@100 { + device_type = "cpu"; + compatible = "arm,cortex-a73"; + reg = <0x100>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + }; + + cpu5: cpu@101 { + device_type = "cpu"; + compatible = "arm,cortex-a73"; + reg = <0x101>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + }; + + cpu6: cpu@102 { + device_type = "cpu"; + compatible = "arm,cortex-a73"; + reg = <0x102>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + }; + + cpu7: cpu@103 { + device_type = "cpu"; + compatible = "arm,cortex-a73"; + reg = <0x103>; + enable-method = "psci"; + capacity-dmips-mhz = <1024>; + }; + }; + + clk26m: oscillator { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <26000000>; + clock-output-names = "clk26m"; + }; + + soc { + #address-cells = <2>; + #size-cells = <2>; + compatible = "simple-bus"; + ranges; + + watchdog: watchdog@10007000 { + compatible = "mediatek,mt8183-wdt", + "mediatek,wdt"; + reg = <0 0x10007000 0 0x100>; + status = "disabled"; + }; + + gic: interrupt-controller@c000000 { + compatible = "arm,gic-v3"; + #interrupt-cells = <4>; + interrupt-parent = <&gic>; + interrupt-controller; + reg = <0 0x0c000000 0 0x40000>, /* GICD */ + <0 0x0c100000 0 0x200000>, /* GICR */ + <0 0x0c400000 0 0x2000>, /* GICC */ + <0 0x0c410000 0 0x1000>, /* GICH */ + <0 0x0c420000 0 0x2000>; /* GICV */ + + interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH 0>; + ppi-partitions { + ppi_cluster0: interrupt-partition-0 { + affinity = <&cpu0 &cpu1 &cpu2 &cpu3>; + }; + ppi_cluster1: interrupt-partition-1 { + affinity = <&cpu4 &cpu5 &cpu6 &cpu7>; + }; + }; + }; + + sysirq: interrupt-controller@c530a80 { + compatible = "mediatek,mt8183-sysirq", + "mediatek,mt6577-sysirq"; + interrupt-controller; + #interrupt-cells = <3>; + interrupt-parent = <&gic>; + reg = <0 0x0c530a80 0 0x50>; + }; + + topckgen: syscon@10000000 { + compatible = "mediatek,mt8183-topckgen", "syscon"; + reg = <0 0x10000000 0 0x1000>; + #clock-cells = <1>; + }; + + infracfg: syscon@10001000 { + compatible = "mediatek,mt8183-infracfg", "syscon"; + reg = <0 0x10001000 0 0x1000>; + #clock-cells = <1>; + }; + + apmixedsys: syscon@1000c000 { + compatible = "mediatek,mt8183-apmixedsys", "syscon"; + reg = <0 0x1000c000 0 0x1000>; + #clock-cells = <1>; + }; + + uart0: serial@11002000 { + compatible = "mediatek,mt8183-uart", + "mediatek,hsuart"; + reg = <0 0x11002000 0 0x1000>; + interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_LOW>; + clock-frequency = <26000000>; + clocks = <&clk26m>, <&infracfg CLK_INFRA_UART0>; + clock-names = "baud", "bus"; + status = "disabled"; + }; + + mmc0: mmc@11230000 { + compatible = "mediatek,mt8183-mmc"; + reg = <0 0x11230000 0 0x1000>, + <0 0x11f50000 0 0x1000>; + interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_LOW>; + clocks = <&topckgen CLK_TOP_MUX_MSDC50_0>, + <&infracfg CLK_INFRA_MSDC0>, + <&infracfg CLK_INFRA_MSDC0_SCK>; + clock-names = "source", "hclk", "source_cg"; + status = "disabled"; + }; + + u3phy: usb-phy@11f40000 { + compatible = "mediatek,generic-tphy-v2"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + status = "okay"; + + u2port0: usb-phy2@11f40000 { + reg = <0 0x11f40000 0 0x700>; + clocks = <&clk26m>; + clock-names = "ref"; + #phy-cells = <1>; + status = "okay"; + }; + + u3port0: usb-phy3@11f40700 { + reg = <0 0x11f40700 0 0x900>; + clocks = <&clk26m>; + clock-names = "ref"; + #phy-cells = <1>; + status = "okay"; + }; + }; + + usb: usb@11200000 { + compatible ="mediatek,mt8183-mtu3", "mediatek,mtu3"; + reg = <0 0x11200000 0 0x3e00>, + <0 0x11203e00 0 0x0100>; + reg-names = "mac", "ippc"; + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>; + phys = <&u2port0 PHY_TYPE_USB2>; + clocks = <&infracfg CLK_INFRA_UNIPRO_SCK>, + <&infracfg CLK_INFRA_USB>; + clock-names = "sys_ck", "ref_ck"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + status = "disabled"; + + ssusb: ssusb@11200000 { + compatible = "mediatek,ssusb"; + reg = <0 0x11200000 0 0x3e00>; + reg-names = "mac"; + interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>; + status = "disabled"; + }; + + usb_host: xhci@11200000 { + compatible = "mediatek,mtk-xhci"; + reg = <0 0x11200000 0 0x1000>; + reg-names = "mac"; + interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_LOW>; + clocks = <&infracfg CLK_INFRA_UNIPRO_SCK>, + <&infracfg CLK_INFRA_USB>; + clock-names = "sys_ck", "ref_ck"; + status = "disabled"; + }; + }; + }; +}; diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index 2791b3dbda2b..a035471374b6 100644 --- a/arch/arm/mach-mediatek/Kconfig +++ b/arch/arm/mach-mediatek/Kconfig @@ -42,6 +42,15 @@ config TARGET_MT7629 including DDR3, crypto engine, 3x3 11n/ac Wi-Fi, Gigabit Ethernet, switch, USB3.0, PCIe, UART, SPI, I2C and PWM. +config TARGET_MT8183 + bool "MediaTek MT8183 SoC" + select ARM64 + help + The MediaTek MT8183 is a ARM64-based SoC with a quad-core Cortex-A73 and + a quad-core Cortex-A53. It is including UART, SPI, USB3.0 dual role, + SD and MMC cards, UFS, PWM, I2C, I2S, S/PDIF, and several LPDDR3 + and LPDDR4 options. + config TARGET_MT8512 bool "MediaTek MT8512 M1 Board" select ARM64 diff --git a/arch/arm/mach-mediatek/Makefile b/arch/arm/mach-mediatek/Makefile index 290d2c709fa3..0f5b0c16d2cb 100644 --- a/arch/arm/mach-mediatek/Makefile +++ b/arch/arm/mach-mediatek/Makefile @@ -7,5 +7,6 @@ obj-$(CONFIG_MT8512) += mt8512/ obj-$(CONFIG_TARGET_MT7622) += mt7622/ obj-$(CONFIG_TARGET_MT7623) += mt7623/ obj-$(CONFIG_TARGET_MT7629) += mt7629/ +obj-$(CONFIG_TARGET_MT8183) += mt8183/ obj-$(CONFIG_TARGET_MT8516) += mt8516/ obj-$(CONFIG_TARGET_MT8518) += mt8518/ diff --git a/arch/arm/mach-mediatek/mt8183/Makefile b/arch/arm/mach-mediatek/mt8183/Makefile new file mode 100644 index 000000000000..886ab7e4eb9f --- /dev/null +++ b/arch/arm/mach-mediatek/mt8183/Makefile @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-y += init.o diff --git a/arch/arm/mach-mediatek/mt8183/init.c b/arch/arm/mach-mediatek/mt8183/init.c new file mode 100644 index 000000000000..877f387102d5 --- /dev/null +++ b/arch/arm/mach-mediatek/mt8183/init.c @@ -0,0 +1,80 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2021 MediaTek Inc. + * Copyright (C) 2021 BayLibre, SAS + * Author: Fabien Parent <fparent(a)baylibre.com> + */ + +#include <clk.h> +#include <common.h> +#include <dm.h> +#include <fdtdec.h> +#include <ram.h> +#include <asm/arch/misc.h> +#include <asm/armv8/mmu.h> +#include <asm/sections.h> +#include <asm/system.h> +#include <dm/uclass.h> +#include <dt-bindings/clock/mt8516-clk.h> + +DECLARE_GLOBAL_DATA_PTR; + +int dram_init(void) +{ + int ret; + + ret = fdtdec_setup_memory_banksize(); + if (ret) + return ret; + + return fdtdec_setup_mem_size_base(); +} + +int dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = gd->ram_base; + gd->bd->bi_dram[0].size = gd->ram_size; + + return 0; +} + +int mtk_pll_early_init(void) +{ + return 0; +} + +int mtk_soc_early_init(void) +{ + return 0; +} + +void reset_cpu(ulong addr) +{ + psci_system_reset(); +} + +int print_cpuinfo(void) +{ + printf("CPU: MediaTek MT8183\n"); + return 0; +} + +static struct mm_region mt8183_mem_map[] = { + { + /* DDR */ + .virt = 0x40000000UL, + .phys = 0x40000000UL, + .size = 0x80000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_OUTER_SHARE, + }, { + .virt = 0x00000000UL, + .phys = 0x00000000UL, + .size = 0x20000000UL, + .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | + PTE_BLOCK_NON_SHARE | + PTE_BLOCK_PXN | PTE_BLOCK_UXN + }, { + 0, + } +}; +struct mm_region *mem_map = mt8183_mem_map; -- 2.30.0

2 3

[PATCH 1/3] board: mediatek: rename pumpkin board into mt8516
by Fabien Parent 21 Mar '21

21 Mar '21

More than one pumpkin board has been made with different MediaTek SoCs. Rename the pumpkin board to follow the naming convention of all other MediaTek boards and also to not be confusing when other pumpkin boards will be added in follow-up commits. Signed-off-by: Fabien Parent <fparent(a)baylibre.com> --- arch/arm/mach-mediatek/Kconfig | 2 +- board/mediatek/{pumpkin => mt8516}/Kconfig | 4 ++-- board/mediatek/mt8516/MAINTAINERS | 6 ++++++ board/mediatek/{pumpkin => mt8516}/Makefile | 2 +- .../mediatek/{pumpkin/pumpkin.c => mt8516/mt8516_pumpkin.c} | 0 board/mediatek/pumpkin/MAINTAINERS | 6 ------ configs/{pumpkin_defconfig => mt8516_pumpkin_defconfig} | 0 include/configs/{pumpkin.h => mt8516.h} | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename board/mediatek/{pumpkin => mt8516}/Kconfig (76%) create mode 100644 board/mediatek/mt8516/MAINTAINERS rename board/mediatek/{pumpkin => mt8516}/Makefile (58%) rename board/mediatek/{pumpkin/pumpkin.c => mt8516/mt8516_pumpkin.c} (100%) delete mode 100644 board/mediatek/pumpkin/MAINTAINERS rename configs/{pumpkin_defconfig => mt8516_pumpkin_defconfig} (100%) rename include/configs/{pumpkin.h => mt8516.h} (97%) diff --git a/arch/arm/mach-mediatek/Kconfig b/arch/arm/mach-mediatek/Kconfig index 7f40ba93190b..2791b3dbda2b 100644 --- a/arch/arm/mach-mediatek/Kconfig +++ b/arch/arm/mach-mediatek/Kconfig @@ -76,7 +76,7 @@ source "board/mediatek/mt7622/Kconfig" source "board/mediatek/mt7623/Kconfig" source "board/mediatek/mt7629/Kconfig" source "board/mediatek/mt8512/Kconfig" +source "board/mediatek/mt8516/Kconfig" source "board/mediatek/mt8518/Kconfig" -source "board/mediatek/pumpkin/Kconfig" endif diff --git a/board/mediatek/pumpkin/Kconfig b/board/mediatek/mt8516/Kconfig similarity index 76% rename from board/mediatek/pumpkin/Kconfig rename to board/mediatek/mt8516/Kconfig index 34b1c0b09d47..a87d3872fe6e 100644 --- a/board/mediatek/pumpkin/Kconfig +++ b/board/mediatek/mt8516/Kconfig @@ -1,10 +1,10 @@ if TARGET_MT8516 config SYS_BOARD - default "pumpkin" + default "mt8516" config SYS_CONFIG_NAME - default "pumpkin" + default "mt8516" config MTK_BROM_HEADER_INFO string diff --git a/board/mediatek/mt8516/MAINTAINERS b/board/mediatek/mt8516/MAINTAINERS new file mode 100644 index 000000000000..2f0d8f646498 --- /dev/null +++ b/board/mediatek/mt8516/MAINTAINERS @@ -0,0 +1,6 @@ +MT8516 Pumpkin +M: Fabien Parent <fparent(a)baylibre.com> +S: Maintained +F: board/mediatek/mt8516 +F: include/configs/mt8516.h +F: configs/mt8516_pumpkin_defconfig diff --git a/board/mediatek/pumpkin/Makefile b/board/mediatek/mt8516/Makefile similarity index 58% rename from board/mediatek/pumpkin/Makefile rename to board/mediatek/mt8516/Makefile index 75fce4a393ab..1d4815d1370f 100644 --- a/board/mediatek/pumpkin/Makefile +++ b/board/mediatek/mt8516/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0 -obj-y += pumpkin.o +obj-y += mt8516_pumpkin.o diff --git a/board/mediatek/pumpkin/pumpkin.c b/board/mediatek/mt8516/mt8516_pumpkin.c similarity index 100% rename from board/mediatek/pumpkin/pumpkin.c rename to board/mediatek/mt8516/mt8516_pumpkin.c diff --git a/board/mediatek/pumpkin/MAINTAINERS b/board/mediatek/pumpkin/MAINTAINERS deleted file mode 100644 index 16beadc027a1..000000000000 --- a/board/mediatek/pumpkin/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -Pumpkin -M: Fabien Parent <fparent(a)baylibre.com> -S: Maintained -F: board/mediatek/pumpkin -F: include/configs/pumpkin.h -F: configs/pumpkin_defconfig diff --git a/configs/pumpkin_defconfig b/configs/mt8516_pumpkin_defconfig similarity index 100% rename from configs/pumpkin_defconfig rename to configs/mt8516_pumpkin_defconfig diff --git a/include/configs/pumpkin.h b/include/configs/mt8516.h similarity index 97% rename from include/configs/pumpkin.h rename to include/configs/mt8516.h index 9c52cae41d71..e809a9c7e304 100644 --- a/include/configs/pumpkin.h +++ b/include/configs/mt8516.h @@ -6,8 +6,8 @@ * Author: Fabien Parent <fparent(a)baylibre.com */ -#ifndef __PUMPKIN_H -#define __PUMPKIN_H +#ifndef __MT8516_H +#define __MT8516_H #include <linux/sizes.h> -- 2.30.0

2 5

Pull request efi-2021-04-rc5-2
by Heinrich Schuchardt 20 Mar '21

20 Mar '21

Dear Tom, The following changes since commit e3310c21a43c1e3c004c6b53ee9179420a1be375: Merge tag 'video-for-v2021.04' of https://source.denx.de/u-boot/custodians/u-boot-video (2021-03-19 08:20:19 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2021-04-rc5-2 for you to fetch changes up to 76b0a19022e22a5bbb84cd76d516bdb625a70417: cmd/load: support uploading EFI binary via UART (2021-03-19 20:54:55 +0100) Gitlab CI showed no problems: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/6836 ---------------------------------------------------------------- Pull request efi-2021-04-rc5-2 Bug fixes: * re-enable loading UEFI binaries via UART * fix a NULL dereference in EFI console ---------------------------------------------------------------- Heinrich Schuchardt (3): efi_loader: NULL dereference in EFI console efi_loader: Uart device path cmd/load: support uploading EFI binary via UART cmd/load.c | 10 +++++-- include/efi_api.h | 10 +++++++ lib/efi_loader/efi_console.c | 51 ++++++++++++++++++++++++-------- lib/efi_loader/efi_device_path.c | 41 +++++++++++++++++++------ lib/efi_loader/efi_device_path_to_text.c | 13 ++++++++ 5 files changed, 101 insertions(+), 24 deletions(-)

2 1

[PATCH v2] bus: ti-sysc: change in a normal driver
by Dario Binacchi 20 Mar '21

20 Mar '21

The module defines a duplicate uclass driver for UCLASS_SIMPLE_BUS, but it is not allowed. This breaks of-platdata and makes the result non-deterministic. The driver does not need to be an uclass driver, so lets remove it. I had turned it into an uclass driver because I thought wrongly it had to call the dm_scan_fdt_dev routine to work properly, but some tests on the board have shown otherwise. Signed-off-by: Dario Binacchi <dariobin(a)libero.it> --- Changes in v2: - Remove UCLASS_SYSC id. - Change ti-sysc in a normal driver instead of an uclass driver. Previous tests, where I had removed the uclass driver, failed because I added the dm_scan_fdt_dev routine to the driver bind routine (I moved it from the uclass driver post_bind routine to the normal driver bind one). drivers/bus/ti-sysc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c index 4e3d610300..778c0654f6 100644 --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -148,12 +148,6 @@ clocks_err: return err; } -UCLASS_DRIVER(ti_sysc) = { - .id = UCLASS_SIMPLE_BUS, - .name = "ti_sysc", - .post_bind = dm_scan_fdt_dev -}; - U_BOOT_DRIVER(ti_sysc) = { .name = "ti_sysc", .id = UCLASS_SIMPLE_BUS, -- 2.17.1

3 6

verified boot (vboot) with secure U-Boot env for SWUpdate
by Tim Harvey 20 Mar '21

20 Mar '21

Greetings, I'm looking at using SWUpdate to facilitate an A/B ping-pong method of firmware updates where a state is stored in U-Boot env by the SWUpdate postinst script. I'm needing to use secure boot with U-Boot's verified boot support and am not clear how, if at all, the U-Boot env can be authenticated. Is there any authentication support within a flash stored U-boot environment that is supported by fw_setenv and if not what is the recommendation for removing environment and are there any other suggestions for an SWUpdate postinstall script to select the OS image to boot after an update? Best regards, Tim

2 3

[PATCH v3 00/27] binman: Support devicetree update in all entries
by Simon Glass 20 Mar '21

20 Mar '21

U-Boot's various phase binaries actually comprise two or three pieces. For example, u-boot.bin has the executable followed by a devicetree. With binman we want to be able to update that devicetree with full image information so that it is accessible to the executable. This is tricky if it is not clear where the devicetree starts. At present this is handled manually, by creating two separate nodes in the binman definition, u-boot-nodtb and u-boot-dtb, so that binman sees them separately and can easily update the devicetree. But this is not very convenient. Of course we could try to detect the devicetree in the binary, which is easy enough for binman to do. But this approach rapidly gets out of hand. When listing an existing image, should we show the devicetree separately? If we don't then binman cannot extract it by itself, only the whole binary. With SPL and TPL we may have BSS padding and this is harder to detect reliably. Also, a design goal of binman is to provide full information about what is in the image. The detection approach goes against that. So instead it seems best to convert these multi-part binaries into a section with the component parts inside. We can do this automatically without affecting the operation of binman very much. One implementation option for this feature would be to update the entries to behave in two different ways, i.e. either to act as a section containing sub-entries, or as a simple blob. However this is tricky because each entry has to use a particular base class. It is not reasonably possible for an entry to choose between using one base class (e.g. blob) or another (e.g. section), depending on a flag. Instead, the approach taken in this series is to replace an entry type with an expanded version, so 'u-boot' becomes 'u-boot-expanded', for example. The new entry is a section containing two or three sub-entries. A similar approach could be take to reduce the complexity of the x86 binman definition. The microcode is either in TPL, SPL or U-Boot proper, so an entryarg could control which of those is expanded to include microcode. That possibility is left for future consideration. Changes in v3: - Add new patch to support symbols in u-boot-spl-nodtb - Add new patch to drop unnecessary 'type' property in tests - Add new patch to use the fake SPL/TPL only if requested - Add new patch to drop an unnecessary field in output_fdt_info - Add new patch to move the comment for GetFdts() to the base class - Add new patch to use standard filenames for SPL/TPL devicetree - Update sizes for new behaviour - Fix x86 docs which refer to this - Update entry docs - Make a symlink to the entry docs Changes in v2: - Move UEFI under develop/ instead - Add new patch to move driver model docs under develop/ - Put binman docs in doc/develop and FIT in doc/usage - Rename README.rst to binman.rst and use a symlink Simon Glass (27): binman: Allow extracting to current directory binman: Document ExpandEntries() in the base class binman: Update entry help for files-align binman: Tidy up underscores in entry documentation binman: Correct the documentation for u-boot-spl-bss-pad binman: Support symbols in u-boot-spl-nodtb binman: Add support for u-boot-tpl-nodtb binman: Add support for u-boot-tpl-bss-bad binman: Drop unnecessary 'type' property in tests binman: Use the fake SPL/TPL only if requested binman: Drop unnecessary field in output_fdt_info binman: Move the comment for GetFdts() to the base class binman: Use standard filenames for SPL/TPL devicetree binman: Allow using an an 'expanded' entry type binman: Allow a way to select expanded entries binman: Plumb expanded entries through fully binman: Automatically expand phase binaries into sections Makefile: Pass new entry args to binman x86: Make use of binman expanded entries x86: dts: Drop unused CONFIG_SPL doc: Move UEFI under develop/ doc: Move driver model docs under develop/ binman: doc: Add documentation to htmldocs binman: Rearrange documentation into headings binman: Incorporate entry documentation binman: Drop repetitive heading for each entry binman: Update various pieces of the documentation Makefile | 8 + arch/x86/dts/u-boot.dtsi | 17 +- doc/arch/x86.rst | 4 +- doc/{ => develop}/driver-model/bind.rst | 0 doc/{ => develop}/driver-model/debugging.rst | 0 doc/{ => develop}/driver-model/design.rst | 0 doc/{ => develop}/driver-model/ethernet.rst | 0 doc/{ => develop}/driver-model/fdt-fixup.rst | 0 .../driver-model/fs_firmware_loader.rst | 0 doc/{ => develop}/driver-model/i2c-howto.rst | 0 doc/{ => develop}/driver-model/index.rst | 4 + doc/{ => develop}/driver-model/livetree.rst | 0 doc/{ => develop}/driver-model/migration.rst | 0 doc/{ => develop}/driver-model/of-plat.rst | 0 doc/{ => develop}/driver-model/pci-info.rst | 0 .../driver-model/pmic-framework.rst | 0 .../driver-model/remoteproc-framework.rst | 0 .../driver-model/serial-howto.rst | 0 .../driver-model/soc-framework.rst | 0 doc/{ => develop}/driver-model/spi-howto.rst | 0 doc/{ => develop}/driver-model/usb-info.rst | 0 doc/develop/index.rst | 10 + doc/develop/package/binman.rst | 1 + doc/develop/package/entries.rst | 1 + doc/develop/package/index.rst | 19 + doc/{ => develop}/uefi/index.rst | 4 + doc/{ => develop}/uefi/iscsi.rst | 0 doc/{ => develop}/uefi/u-boot_on_efi.rst | 0 doc/{ => develop}/uefi/uefi.rst | 0 doc/index.rst | 23 - doc/usage/fit.rst | 8 + doc/usage/index.rst | 1 + tools/binman/README.rst | 1 + tools/binman/{README => binman.rst} | 959 ++++++++++-------- tools/binman/cmdline.py | 5 +- tools/binman/control.py | 28 +- tools/binman/{README.entries => entries.rst} | 336 ++++-- tools/binman/entry.py | 73 +- tools/binman/entry_test.py | 12 + tools/binman/etype/atf_bl31.py | 2 +- tools/binman/etype/blob.py | 4 +- tools/binman/etype/blob_dtb.py | 9 - tools/binman/etype/blob_ext.py | 2 +- tools/binman/etype/blob_phase.py | 51 + tools/binman/etype/cbfs.py | 12 +- tools/binman/etype/fdtmap.py | 30 +- tools/binman/etype/files.py | 2 +- tools/binman/etype/fit.py | 21 +- tools/binman/etype/intel_cmc.py | 2 +- tools/binman/etype/intel_fsp.py | 2 +- tools/binman/etype/intel_fsp_m.py | 2 +- tools/binman/etype/intel_fsp_s.py | 2 +- tools/binman/etype/intel_fsp_t.py | 2 +- tools/binman/etype/intel_ifwi.py | 10 +- tools/binman/etype/intel_me.py | 2 +- tools/binman/etype/intel_mrc.py | 2 +- tools/binman/etype/intel_refcode.py | 2 +- tools/binman/etype/intel_vbt.py | 2 +- tools/binman/etype/intel_vga.py | 2 +- tools/binman/etype/mkimage.py | 4 +- tools/binman/etype/scp.py | 2 +- tools/binman/etype/section.py | 15 +- tools/binman/etype/text.py | 6 +- tools/binman/etype/u_boot.py | 8 +- tools/binman/etype/u_boot_dtb_with_ucode.py | 4 +- tools/binman/etype/u_boot_expanded.py | 24 + tools/binman/etype/u_boot_nodtb.py | 8 +- tools/binman/etype/u_boot_spl.py | 3 + tools/binman/etype/u_boot_spl_bss_pad.py | 17 +- tools/binman/etype/u_boot_spl_expanded.py | 45 + tools/binman/etype/u_boot_spl_nodtb.py | 24 +- tools/binman/etype/u_boot_tpl.py | 3 + tools/binman/etype/u_boot_tpl_bss_pad.py | 44 + tools/binman/etype/u_boot_tpl_expanded.py | 45 + tools/binman/etype/u_boot_tpl_nodtb.py | 42 + tools/binman/etype/u_boot_with_ucode_ptr.py | 2 +- tools/binman/ftest.py | 268 ++++- tools/binman/image.py | 17 +- tools/binman/index.rst | 9 + tools/binman/setup.py | 2 +- tools/binman/state.py | 71 +- tools/binman/test/053_symbols.dts | 2 +- tools/binman/test/149_symbols_tpl.dts | 1 - tools/binman/test/155_symbols_tpl_x86.dts | 1 - tools/binman/test/192_symbols_nodtb.dts | 26 + tools/binman/test/192_u_boot_tpl_nodtb.dts | 13 + tools/binman/test/193_tpl_bss_pad.dts | 19 + tools/binman/test/194_fdt_incl.dts | 17 + tools/binman/test/195_fdt_incl_tpl.dts | 13 + tools/binman/test/u_boot_binman_syms.c | 2 +- tools/patman/tools.py | 8 +- 91 files changed, 1697 insertions(+), 745 deletions(-) rename doc/{ => develop}/driver-model/bind.rst (100%) rename doc/{ => develop}/driver-model/debugging.rst (100%) rename doc/{ => develop}/driver-model/design.rst (100%) rename doc/{ => develop}/driver-model/ethernet.rst (100%) rename doc/{ => develop}/driver-model/fdt-fixup.rst (100%) rename doc/{ => develop}/driver-model/fs_firmware_loader.rst (100%) rename doc/{ => develop}/driver-model/i2c-howto.rst (100%) rename doc/{ => develop}/driver-model/index.rst (68%) rename doc/{ => develop}/driver-model/livetree.rst (100%) rename doc/{ => develop}/driver-model/migration.rst (100%) rename doc/{ => develop}/driver-model/of-plat.rst (100%) rename doc/{ => develop}/driver-model/pci-info.rst (100%) rename doc/{ => develop}/driver-model/pmic-framework.rst (100%) rename doc/{ => develop}/driver-model/remoteproc-framework.rst (100%) rename doc/{ => develop}/driver-model/serial-howto.rst (100%) rename doc/{ => develop}/driver-model/soc-framework.rst (100%) rename doc/{ => develop}/driver-model/spi-howto.rst (100%) rename doc/{ => develop}/driver-model/usb-info.rst (100%) create mode 120000 doc/develop/package/binman.rst create mode 120000 doc/develop/package/entries.rst create mode 100644 doc/develop/package/index.rst rename doc/{ => develop}/uefi/index.rst (51%) rename doc/{ => develop}/uefi/iscsi.rst (100%) rename doc/{ => develop}/uefi/u-boot_on_efi.rst (100%) rename doc/{ => develop}/uefi/uefi.rst (100%) create mode 100644 doc/usage/fit.rst create mode 120000 tools/binman/README.rst rename tools/binman/{README => binman.rst} (64%) rename tools/binman/{README.entries => entries.rst} (82%) create mode 100644 tools/binman/etype/blob_phase.py create mode 100644 tools/binman/etype/u_boot_expanded.py create mode 100644 tools/binman/etype/u_boot_spl_expanded.py create mode 100644 tools/binman/etype/u_boot_tpl_bss_pad.py create mode 100644 tools/binman/etype/u_boot_tpl_expanded.py create mode 100644 tools/binman/etype/u_boot_tpl_nodtb.py create mode 100644 tools/binman/index.rst create mode 100644 tools/binman/test/192_symbols_nodtb.dts create mode 100644 tools/binman/test/192_u_boot_tpl_nodtb.dts create mode 100644 tools/binman/test/193_tpl_bss_pad.dts create mode 100644 tools/binman/test/194_fdt_incl.dts create mode 100644 tools/binman/test/195_fdt_incl_tpl.dts -- 2.31.0.rc2.261.g7f71774620-goog

2 55

[RFC] dev_phys_to_bus() and PCI
by Mark Kettenis 20 Mar '21

20 Mar '21

I'm working on support for Apple's M1 systems in U-Boot. The idea is that this can be used as a "payload" for the m1n1 bootloader that is being developed by Hector Martin for Asahi Linux in order to provide an UEFI implementation that can boot a standard arm64 OS. My current code, which can be found on the "apple-m1-m1n1" branch at: https://github.com/kettenis/u-boot/tree/apple-m1-m1n1 can already do this. I'm booting OpenBSD/arm64 this way and I've also booted into grub using a standard arm64 Debian installer. One of the big challenges I'm facing is that the integrated PCIe devices on the system sit behind an IOMMU that (as far as we can tell) doesn't support any kind of bypass mode. I don't think we want full IOMMU support in U-Boot, so the approach I'm currently taking is that I set up the IOMMU to map a chunk of memory at the "top of RAM" where U-Boot resides after relocation. But in order to use this mapping I need to do DMA address translation. Fortunately Nicolas Saenz Julienne recently introduced dev_phys_to_bus() and dev_bus_to_phys() interfaces to do this. Those interfaces make use of a dma-ranges property in the device tree which doesn't work so well for PCI devices though. However, the PCI code in U-Boot already has a way to describe DMA address translation through its regions support. Hooking this up to dev_phys_to_bus() and dev_bus_to_phys() is fairly easy as illustrated by the diff below. Would this be viable approach? This could also help adding support for PCIe devices on the Raspberry Pi CM4. commit 4f0e989c7a765291a38b7d10da562f23c5f31239 Author: Mark Kettenis <kettenis(a)openbsd.org> Date: Fri Mar 12 20:23:11 2021 +0100 dm: Add PCI support to dev_phys_to_bus()/dev_bus_to_phys() For PCI devices, call dm_pci_phys_to_bus()/dm_pci_bus_to_phys() to do the address translation. This uses the regions set up by the PCI host controller driver to do the translation as a single translation offset may not be sufficient in this case. Signed-off-by: Mark Kettenis <kettenis(a)openbsd.org> diff --git a/include/phys2bus.h b/include/phys2bus.h index 866b8b51a8..13d23ef4bb 100644 --- a/include/phys2bus.h +++ b/include/phys2bus.h @@ -23,14 +23,21 @@ static inline unsigned long bus_to_phys(unsigned long bus) #if CONFIG_IS_ENABLED(DM) #include <dm/device.h> +#include <pci.h> static inline dma_addr_t dev_phys_to_bus(struct udevice *dev, phys_addr_t phys) { + if (device_is_on_pci_bus(dev)) + return dm_pci_phys_to_bus(dev, phys, PCI_REGION_SYS_MEMORY); + return phys - dev_get_dma_offset(dev); } static inline phys_addr_t dev_bus_to_phys(struct udevice *dev, dma_addr_t bus) { + if (device_is_on_pci_bus(dev)) + return dm_pci_bus_to_phys(dev, bus, PCI_REGION_SYS_MEMORY); + return bus + dev_get_dma_offset(dev); } #else

3 4