January 2022 - U-Boot

[PATCH] clk: ccf: correct the test on the parent uclass in clk_enable/clk_disable
by Patrick Delaunay 25 Feb '22

25 Feb '22

It is safe to check if the uclass id on the device is UCLASS_CLK before to call the clk_ functions, but today this comparison is not done on the device used in API: clkp->dev->parent but on the device himself: clkp->dev. This patch corrects this behavior and tests if the parent device is a clock device before to call the clock API, clk_enable or clk_disable, on this device. Fixes: 0520be0f67e3 ("clk: prograte clk enable/disable to parent") Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- drivers/clk/clk-uclass.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index d245b672fa..8b6981a307 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -652,7 +652,7 @@ int clk_enable(struct clk *clk) return 0; } if (clkp->dev->parent && - device_get_uclass_id(clkp->dev) == UCLASS_CLK) { + device_get_uclass_id(clkp->dev->parent) == UCLASS_CLK) { ret = clk_enable(dev_get_clk_ptr(clkp->dev->parent)); if (ret) { printf("Enable %s failed\n", @@ -726,7 +726,7 @@ int clk_disable(struct clk *clk) } if (clkp && clkp->dev->parent && - device_get_uclass_id(clkp->dev) == UCLASS_CLK) { + device_get_uclass_id(clkp->dev->parent) == UCLASS_CLK) { ret = clk_disable(dev_get_clk_ptr(clkp->dev->parent)); if (ret) { printf("Disable %s failed\n", -- 2.25.1

2 2

[PATCH 1/4] cmd: clk: test the number of argument in setfreq command
by Patrick Delaunay 25 Feb '22

25 Feb '22

Test the number of argument in setfreq command to avoid a crash when the command setfreq is called without argument: STM32MP> clk setfreq data abort pc : [<ddba3f18>] lr : [<ddba3f89>] reloc pc : [<c018ff18>] lr : [<c018ff89>] sp : dbaf45b8 ip : ddb1d859 fp : 00000002 r10: dbb3fd80 r9 : dbb11e90 r8 : ddbf38cc r7 : ddb39725 r6 : 00000000 r5 : 00000000 r4 : dbb3fd84 r3 : dbb3fd84 r2 : 0000000a r1 : dbaf45bc r0 : 00000011 Flags: nzCv IRQs off FIQs off Mode SVC_32 (T) Code: 4dd3 1062 85a3 ddbd (7803) 2b30 Resetting CPU ... Fixes: 7ab418fbe612 ("clk: add support for setting clk rate from cmdline") Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- cmd/clk.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/clk.c b/cmd/clk.c index dbbdc31b35..52237791cf 100644 --- a/cmd/clk.c +++ b/cmd/clk.c @@ -120,6 +120,9 @@ static int do_clk_setfreq(struct cmd_tbl *cmdtp, int flag, int argc, s32 freq; struct udevice *dev; + if (argc != 3) + return CMD_RET_USAGE; + freq = dectoul(argv[2], NULL); dev = clk_lookup(argv[1]); -- 2.25.1

2 8

RE:Re: [PATCH 1/2] fsl-layerscape: add dtb overlay feature
by Sahil Malhotra (OSS) 24 Feb '22

24 Feb '22

Hi Michael, > -----Original Message----- > From: Michael Walle <michael(a)walle.cc> > Sent: Thursday, December 23, 2021 3:05 PM > To: Sahil Malhotra (OSS) <sahil.malhotra(a)oss.nxp.com> > Cc: ZHIZHIKIN Andrey <andrey.zhizhikin(a)leica-geosystems.com>; Clément Faure > <clement.faure(a)nxp.com>; Gaurav Jain <gaurav.jain(a)nxp.com>; Pankaj Gupta > <pankaj.gupta(a)nxp.com>; Priyanka Jain <priyanka.jain(a)nxp.com>; u- > boot(a)lists.denx.de; Varun Sethi <V.Sethi(a)nxp.com>; Ye Li <ye.li(a)nxp.com> > Subject: Re: [EXT] Re: [PATCH 1/2] fsl-layerscape: add dtb overlay feature > > Hi Sahil, > > Am 2021-12-23 09:46, schrieb Sahil Malhotra (OSS): > >> -----Original Message----- > >> From: U-Boot <u-boot-bounces(a)lists.denx.de> On Behalf Of Michael > >> Walle > >> Sent: Monday, December 20, 2021 6:23 PM > >> To: Sahil Malhotra (OSS) <sahil.malhotra(a)oss.nxp.com> > >> Cc: ZHIZHIKIN Andrey <andrey.zhizhikin(a)leica-geosystems.com>; Clément > >> Faure <clement.faure(a)nxp.com>; Gaurav Jain <gaurav.jain(a)nxp.com>; > >> Pankaj Gupta <pankaj.gupta(a)nxp.com>; Priyanka Jain > >> <priyanka.jain(a)nxp.com>; u-boot(a)lists.denx.de; Varun Sethi > >> <V.Sethi(a)nxp.com>; Ye Li <ye.li(a)nxp.com> > >> Subject: [EXT] Re: [PATCH 1/2] fsl-layerscape: add dtb overlay > >> feature > >> > >> Caution: EXT Email > >> > >> Hi Sahil, > >> > >> Am 2021-12-10 07:33, schrieb Sahil Malhotra (OSS): > >> >> DT nodes can be statically disabled if we know that they are held > >> >> by HAB and are not released to NS World. > >> >> > >> >> OP-TEE does set the status itself via dt_enable_secure_status(), > >> >> which should present the properly configured FDT when U-Boot takes > >> over. > >> > Yes, OP-TEE set the status by dt_enable_secure_status() in DTB > >> > overlay which gets merged with DTB provided for Linux bootup and > >> > then Linux boots with merged DTB. > >> > But u-boot uses the DTB embedded in its image. How can we modify > >> > that DTB or merge DTB overlay passed by OP-TEE with uboot DTB ? > >> > >> But then u-boot has the "wrong" dtb. What is the reason, there is an > >> overlay instead of a whole dtb? what if the overlay doesn't match the > >> dtb? > > "wrong" dtb means that uboot will not be aware of CAAM job ring which > > is taken by OP-TEE and uboot on LS platforms currently use JR0, which > > is not being used by any other entity in LS bootflow. > > I don't know I follow. u-boot and linux should have the same device tree; > regardless if that device is used or not. So applying the overlay just for linux isn't > enough here. Ok, I don't think that as of now, in all platforms uboot and linux have same devie tree. But I will try to address your concern, but I don’t know how to apply overlay to dtb which is embedded in u-boot binary, Can you please point me to one reference which is doing this thing, I will take reference from there. > > We don't use DTB in OP-TEE, but when we use CAAM in OP-TEE, OP-TEE > > reserves One Job Ring for its use and that is communicated to Kernel > > using DTB overlay. > > > >> what if the overlay doesn't match the dtb? > > I didn't get this point, can you please elaborate a little. > > You are merging a dtb fragment with an unknown dtb, right? Who says they > match? you might have an old dtb where the supplied dtb fragment doesn't > make any sense. > > I might be missing something here. Eg. where is the linux dtb supposed to come > from? This patchset is really missing an example and a description how things > should work. If supplied DTB does not match with DTB overlay fragment. then overlay will not get applied. We don't have any control on where user picks the DTB, but we can only make sure DTB overlay feature must work with DTBs which are upstreamed If user makes its own customized DTB, we cannot make sure that things will work. Regards, Sahil Malhotra

3 6

[PATCH] gpio: rgpio2p: Enhance reading of GPIO pin value
by Christoph Fritz 24 Feb '22

24 Feb '22

Add support for reading GPIO pin value when function is output. With this patch applied, gpio toggle command is working. Signed-off-by: Christoph Fritz <chf.fritz(a)googlemail.com> --- drivers/gpio/imx_rgpio2p.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/gpio/imx_rgpio2p.c b/drivers/gpio/imx_rgpio2p.c index 0e2874ca95c..175e460aff5 100644 --- a/drivers/gpio/imx_rgpio2p.c +++ b/drivers/gpio/imx_rgpio2p.c @@ -39,6 +39,14 @@ static int imx_rgpio2p_is_output(struct gpio_regs *regs, int offset) return val & (1 << offset) ? 1 : 0; } +static int imx_rgpio2p_bank_get_direction(struct gpio_regs *regs, int offset) +{ + if ((readl(&regs->gpio_pddr) >> offset) & 0x01) + return IMX_RGPIO2P_DIRECTION_OUT; + + return IMX_RGPIO2P_DIRECTION_IN; +} + static void imx_rgpio2p_bank_direction(struct gpio_regs *regs, int offset, enum imx_rgpio2p_direction direction) { @@ -67,7 +75,11 @@ static void imx_rgpio2p_bank_set_value(struct gpio_regs *regs, int offset, static int imx_rgpio2p_bank_get_value(struct gpio_regs *regs, int offset) { - return (readl(&regs->gpio_pdir) >> offset) & 0x01; + if (imx_rgpio2p_bank_get_direction(regs, offset) == + IMX_RGPIO2P_DIRECTION_IN) + return (readl(&regs->gpio_pdir) >> offset) & 0x01; + + return (readl(&regs->gpio_pdor) >> offset) & 0x01; } static int imx_rgpio2p_direction_input(struct udevice *dev, unsigned offset) -- 2.30.2

3 5

[PATCH] freescale: imx8mm_evk: Use IS_ENABLED instead of #ifdef
by Tommaso Merciai 24 Feb '22

24 Feb '22

Use IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG) to make the code more readable and fix checkpatch.pl warning Signed-off-by: Tommaso Merciai <tomm.merciai(a)gmail.com> --- board/freescale/imx8mm_evk/imx8mm_evk.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/board/freescale/imx8mm_evk/imx8mm_evk.c b/board/freescale/imx8mm_evk/imx8mm_evk.c index ab55135a97..e0975fcda7 100644 --- a/board/freescale/imx8mm_evk/imx8mm_evk.c +++ b/board/freescale/imx8mm_evk/imx8mm_evk.c @@ -60,9 +60,10 @@ int board_mmc_get_env_dev(int devno) int board_late_init(void) { -#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - env_set("board_name", "EVK"); - env_set("board_rev", "iMX8MM"); -#endif + if (IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) { + env_set("board_name", "EVK"); + env_set("board_rev", "iMX8MM"); + } + return 0; } -- 2.25.1

3 2

[PATCH 0/2] mmc: fsl_esdhc_imx: Auto-detect higher speeds
by Adam Ford 19 Feb '22

19 Feb '22

The driver in the Linux kernel can automatically detect high speed options like UHS, HS200, HS400 and HS400-ES without needing to add special flags to the device tree. UHS appears to have been broken in this driver, so fix UHS support, and add auto-detection. Adam Ford (2): mmc: fsl_esdhc_imx: Fix fsl_esdhc_wait_dat0 mmc: fsl_esdhc_imx: Use esdhc_soc_data flags to set host caps drivers/mmc/fsl_esdhc_imx.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) -- 2.32.0

5 7

[PATCH V2] imx8mm_beacon/imx8mn_beacon: Update build instructions
by Adam Ford 19 Feb '22

19 Feb '22

With binman generating flash.bin, it's not longer necessary to specify either the location of ATF nor is it necessary to specify building flash.bin, so let's update the build instructions to remove those. While in here, update the revision of ATF and DDR firmware so both Mini and Nano reference the same revision. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: Use tag lf-5.10.72-2.2.0 for ATF instead of branch. Fix small typo in Nano readme diff --git a/board/beacon/imx8mm/README b/board/beacon/imx8mm/README index 03d9412f0d..c65acef22d 100644 --- a/board/beacon/imx8mm/README +++ b/board/beacon/imx8mm/README @@ -12,21 +12,21 @@ Get and Build the ARM Trusted firmware Note: $(srctree) is U-Boot source directory $ git clone https://source.codeaurora.org/external/imx/imx-atf -$ git checkout imx_5.4.70_2.3.0 +$ git lf-5.10.72-2.2.0 $ make PLAT=imx8mm bl31 CROSS_COMPILE=aarch64-linux-gnu- $ cp build/imx8mm/release/bl31.bin $(srctree) Get the DDR firmware ==================== -$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.5.bin -$ chmod +x firmware-imx-8.5.bin -$ ./firmware-imx-8.5 -$ cp firmware-imx-8.5/firmware/ddr/synopsys/lpddr4*.bin $(srctree) +$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-8.9.bin +$ chmod +x firmware-imx-8.9.bin +$ ./firmware-imx-8.9 +$ cp firmware-imx-8.9/firmware/ddr/synopsys/lpddr4*.bin $(srctree) Build U-Boot ============ $ make imx8mm_beacon_defconfig -$ make flash.bin CROSS_COMPILE=aarch64-linux-gnu- +$ make CROSS_COMPILE=aarch64-linux-gnu- Burn U-Boot to microSD Card =========================== diff --git a/board/beacon/imx8mn/README b/board/beacon/imx8mn/README index a9eddd4e64..788ab1093b 100644 --- a/board/beacon/imx8mn/README +++ b/board/beacon/imx8mn/README @@ -12,9 +12,9 @@ Get and Build the ARM Trusted firmware Note: $(srctree) is U-Boot source directory $ git clone https://source.codeaurora.org/external/imx/imx-atf -$ git checkout imx_5.4.47_2.2.0 +$ git lf-5.10.72-2.2.0 $ make PLAT=imx8mn bl31 CROSS_COMPILE=aarch64-linux-gnu- -$ cp build/imx8mm/release/bl31.bin $(srctree) +$ cp build/imx8mn/release/bl31.bin $(srctree) Get the DDR firmware ==================== @@ -26,7 +26,7 @@ $ cp firmware-imx-8.9/firmware/ddr/synopsys/lpddr4*.bin $(srctree) Build U-Boot ============ $ make imx8mn_beacon_defconfig -$ make flash.bin CROSS_COMPILE=aarch64-linux-gnu- ATF_LOAD_ADDR=0x960000 +$ make CROSS_COMPILE=aarch64-linux-gnu- Burn U-Boot to microSD Card =========================== -- 2.32.0

3 2

[PATCH 1/2] cmd: fuse: add a fuse comparison function
by Angus Ainslie 19 Feb '22

19 Feb '22

Compare a hexval to the fuse value and return pass or fail. Signed-off-by: Angus Ainslie <angus(a)akkea.ca> --- cmd/fuse.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/cmd/fuse.c b/cmd/fuse.c index e001619d172..78b1065d99e 100644 --- a/cmd/fuse.c +++ b/cmd/fuse.c @@ -45,7 +45,7 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, { const char *op = argc >= 2 ? argv[1] : NULL; int confirmed = argc >= 3 && !strcmp(argv[2], "-y"); - u32 bank, word, cnt, val; + u32 bank, word, cnt, val, cmp; int ret, i; argc -= 2 + confirmed; @@ -73,6 +73,24 @@ static int do_fuse(struct cmd_tbl *cmdtp, int flag, int argc, printf(" %.8x", val); } putc('\n'); + } else if (!strcmp(op, "cmp")) { + if (argc != 3 || strtou32(argv[2], 0, &cmp)) + return CMD_RET_USAGE; + + printf("Comparing bank %u:\n", bank); + printf("\nWord 0x%.8x:", word); + printf("\nValue 0x%.8x:", cmp); + + ret = fuse_read(bank, word, &val); + if (ret) + goto err; + + printf("0x%.8x\n", val); + if (val != cmp) { + printf("failed\n"); + return CMD_RET_FAILURE; + } + printf("passed\n"); } else if (!strcmp(op, "sense")) { if (argc == 2) cnt = 1; @@ -137,6 +155,8 @@ U_BOOT_CMD( "Fuse sub-system", "read <bank> <word> [<cnt>] - read 1 or 'cnt' fuse words,\n" " starting at 'word'\n" + "fuse cmp <bank> <word> <hexval> - compare 'hexval' to fuse\n" + " at 'word'\n" "fuse sense <bank> <word> [<cnt>] - sense 1 or 'cnt' fuse words,\n" " starting at 'word'\n" "fuse prog [-y] <bank> <word> <hexval> [<hexval>...] - program 1 or\n" -- 2.25.1

2 5

[PATCH 1/2] clk: imx: select [SPL_]CLK_COMPOSITE_CCF for imx8mn
by Heiko Thiery 19 Feb '22

19 Feb '22

The clock composite is required when using the clock framework. So select it automatically. Signed-off-by: Heiko Thiery <heiko.thiery(a)gmail.com> --- drivers/clk/imx/Kconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/imx/Kconfig b/drivers/clk/imx/Kconfig index 96721bcbf3..a2cd0347c3 100644 --- a/drivers/clk/imx/Kconfig +++ b/drivers/clk/imx/Kconfig @@ -42,6 +42,7 @@ config SPL_CLK_IMX8MN depends on ARCH_IMX8M && SPL select SPL_CLK select SPL_CLK_CCF + select SPL_CLK_COMPOSITE_CCF help This enables SPL DM/DTS support for clock driver in i.MX8MN @@ -50,6 +51,7 @@ config CLK_IMX8MN depends on ARCH_IMX8M select CLK select CLK_CCF + select CLK_COMPOSITE_CCF help This enables support clock driver for i.MX8MN platforms. -- 2.30.2

2 3

[PATCH v2] Enable Fastboot(UUU) for O4-iMX6ULL-NANO boards
by Oleh Kravchenko 19 Feb '22

19 Feb '22

Make O4-iMX6ULL-NANO-based board compatible with Yocto layer meta-out4 and fix device flashing by UUU (aka MFG Tools). Signed-off-by: Oleh Kravchenko <oleg(a)kaa.org.ua> --- configs/ev-imx280-nano-x-mb_defconfig | 5 +++++ configs/o4-imx6ull-nano_defconfig | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/configs/ev-imx280-nano-x-mb_defconfig b/configs/ev-imx280-nano-x-mb_defconfig index 10f2ec9333..4188286825 100644 --- a/configs/ev-imx280-nano-x-mb_defconfig +++ b/configs/ev-imx280-nano-x-mb_defconfig @@ -49,3 +49,8 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y +CONFIG_FASTBOOT_MMC_USER_SUPPORT=y +CONFIG_FASTBOOT_UUU_SUPPORT=y +CONFIG_USB_GADGET_PRODUCT_NUM=0x0001 +CONFIG_USB_GADGET_VENDOR_NUM=0x3016 diff --git a/configs/o4-imx6ull-nano_defconfig b/configs/o4-imx6ull-nano_defconfig index 384e6826a7..e8071cb791 100644 --- a/configs/o4-imx6ull-nano_defconfig +++ b/configs/o4-imx6ull-nano_defconfig @@ -57,3 +57,8 @@ CONFIG_USB=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_FASTBOOT_MMC_BOOT_SUPPORT=y +CONFIG_FASTBOOT_MMC_USER_SUPPORT=y +CONFIG_FASTBOOT_UUU_SUPPORT=y +CONFIG_USB_GADGET_PRODUCT_NUM=0x0001 +CONFIG_USB_GADGET_VENDOR_NUM=0x3016 -- 2.32.0

2 1