March 2021 - U-Boot

[PATCH 0/2] power: move power_max77696_init() to board file
by Jaehoon Chung 13 Apr '21

13 Apr '21

It's only one board which is using max_77696_init(). pmic_max77696.c didn't convert from no-DM to DM. So it's waste to maintain in driver directory. Jaehoon Chung (2): board: warp: add power_max77696_init() function power: pmic: remove pmic_max77696.c file board/warp/warp.c | 68 +++++++++++++++++++++++++++++- drivers/power/pmic/Makefile | 1 - drivers/power/pmic/pmic_max77696.c | 31 -------------- include/configs/warp.h | 1 - include/power/max77696_pmic.h | 59 -------------------------- 5 files changed, 67 insertions(+), 93 deletions(-) delete mode 100644 drivers/power/pmic/pmic_max77696.c delete mode 100644 include/power/max77696_pmic.h -- 2.29.0

4 9

[PATCH] cmd: fs: Use part_get_info_by_dev_and_name_or_num to parse partitions
by Sean Anderson 13 Apr '21

13 Apr '21

This allows using dev#partlabel syntax. Signed-off-by: Sean Anderson <sean.anderson(a)seco.com> --- fs/fs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/fs.c b/fs/fs.c index 900928c394..b7936fd4cf 100644 --- a/fs/fs.c +++ b/fs/fs.c @@ -385,8 +385,8 @@ int fs_set_blk_dev(const char *ifname, const char *dev_part_str, int fstype) } #endif - part = blk_get_device_part_str(ifname, dev_part_str, &fs_dev_desc, - &fs_partition, 1); + part = part_get_info_by_dev_and_name_or_num(ifname, dev_part_str, &fs_dev_desc, + &fs_partition, 1); if (part < 0) return -1; -- 2.25.1

3 4

[RFC PATCH] watchdog: base rate-limiting on get_ticks() rather than get_timer()
by Rasmus Villemoes 12 Apr '21

12 Apr '21

On powerpc, get_timer() is implemented using a volatile variable that gets incremented from the decrementer interrupt handler. Hence, when interrupts are disabled, time as measured by get_timer() ceases to pass. Interrupts are necessarily disabled during bootm (see the comment in bootm_disable_interrupts() for why). But after interrupts are disabled, there's still lots of work to do - e.g. decompressing the kernel image to the right load address. Unfortunately, the rate-limiting logic in wdt_uclass.c's watchdog_reset function means that WATCHDOG_RESET() becomes a no-op, since get_timer() never progresses past the next_reset. This, combined with an external gpio-triggered watchdog that must be petted at least every 800ms, means our board gets reset before booting into linux. Now, at least on powerpc, get_ticks() continues to return sensible results whether or not interrupts are enabled. So this fixes the above problem for our board - but I don't know if get_ticks() can be assumed to always work. Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- This is what I had in mind. I also considered making it a config knob (possibly just auto-selected based on $ARCH) whether to use get_timer() or get_ticks(), but that becomes quite ugly. drivers/watchdog/wdt-uclass.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/watchdog/wdt-uclass.c b/drivers/watchdog/wdt-uclass.c index 4cdb7bd64c..7be4e9b5bc 100644 --- a/drivers/watchdog/wdt-uclass.c +++ b/drivers/watchdog/wdt-uclass.c @@ -16,14 +16,15 @@ DECLARE_GLOBAL_DATA_PTR; #define WATCHDOG_TIMEOUT_SECS (CONFIG_WATCHDOG_TIMEOUT_MSECS / 1000) -/* - * Reset every 1000ms, or however often is required as indicated by a - * hw_margin_ms property. - */ -static ulong reset_period = 1000; +static u64 ratelimit_ticks; int initr_watchdog(void) { + /* + * Reset every 1000ms, or however often is required as indicated by a + * hw_margin_ms property. + */ + u32 reset_period = 1000; u32 timeout = WATCHDOG_TIMEOUT_SECS; /* @@ -48,6 +49,7 @@ int initr_watchdog(void) 4 * reset_period) / 4; } + ratelimit_ticks = usec_to_tick(reset_period * 1000); wdt_start(gd->watchdog_dev, timeout * 1000, 0); gd->flags |= GD_FLG_WDT_READY; printf("WDT: Started with%s servicing (%ds timeout)\n", @@ -117,17 +119,17 @@ int wdt_expire_now(struct udevice *dev, ulong flags) */ void watchdog_reset(void) { - static ulong next_reset; - ulong now; + static u64 last_reset; + u64 now; /* Exit if GD is not ready or watchdog is not initialized yet */ if (!gd || !(gd->flags & GD_FLG_WDT_READY)) return; /* Do not reset the watchdog too often */ - now = get_timer(0); - if (time_after(now, next_reset)) { - next_reset = now + reset_period; + now = get_ticks(); + if (now - last_reset >= ratelimit_ticks) { + last_reset = now; wdt_reset(gd->watchdog_dev); } } -- 2.23.0

4 12

[PATCH V2 0/3] arm: omap3: Make functions static when possible
by Adam Ford 12 Apr '21

12 Apr '21

A few functions are defined without being labeled as static to that file. In an effort to keep SPL as small as possible, one function needs to be moved into an #ifdef so it's only enabled when the calling function is available, and all of these can simply be marked as static. Before: text data bss dec hex filename 50988 1053 1888 53929 d2a9 spl/u-boot-spl After: text data bss dec hex filename 50972 1053 1888 53913 d299 spl/u-boot-spl While not significant, a few bytes can be very helpful when SPL is limited. Adam Ford (3): arm: omap3: Make try_unlock_memory() static arm: omap3: Make secureworld_exit() static arm: omap3: Make secure_unlock_mem() static arch/arm/include/asm/arch-omap3/sys_proto.h | 2 -- arch/arm/mach-omap2/omap3/board.c | 21 +++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) -- 2.25.1

2 4

[PATCH 00/57] Enforce DM_MMC migration and remove platforms
by Tom Rini 12 Apr '21

12 Apr '21

Hey all, First, the main point of this series is that after v2021.04 is release I intend to make something like this be merged, along with the series I posted earlier about other block drivers. There's some platforms that I've omitted here as people have said they will update them ASAP and I'm going to pick up those patches before this gets merged. And it's soon enough in the future that I expect the people that haven't posted them yet will be able to in time. Next, I'm going to do another series on top of this to pick another migration that's due by v2019.07, and I'm likely to do DM_PCI to see where that is with these removals taken care of. Finally, I am quite happy to have any of these platforms remain in tree, so long as someone is willing to maintain them. A few of the patches in here are re-posts, and I'll sort that out when applying the other migration. -- Tom

7 125

[PATCH 01/16] ls1012aqds_tfa_SECURE_BOOT: Remove unused CONFIG_SCSI_AHCI
by Tom Rini 12 Apr '21

12 Apr '21

Signed-off-by: Tom Rini <trini(a)konsulko.com> --- configs/ls1012aqds_tfa_SECURE_BOOT_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig index 8f6ca820a24b..214a2bb9e735 100644 --- a/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig +++ b/configs/ls1012aqds_tfa_SECURE_BOOT_defconfig @@ -41,7 +41,6 @@ CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y -CONFIG_SCSI_AHCI=y CONFIG_DM_I2C=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y -- 2.17.1

5 37

[patch v4 0/9] rk3399 (Pinebook pro) EDP support
by Arnaud Patard 11 Apr '21

11 Apr '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 v3: - Fix typos - Remove plat->base change. The plat->base modification was more to get a predictible framebuffer address. - Fix debug format patch to use 0x%ld 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

2 10

[PATCH v3 1/2] video: backlight: Support PWMs without a known period_ns
by Alper Nebi Yasak 11 Apr '21

11 Apr '21

The PWM device provided by Chrome OS EC doesn't really support anything other than setting a relative duty cycle. To support it as a backlight, this patch makes the PWM period optional in the device tree and pretends the valid brightness range is its period_ns. Also adds a sandbox test for a PWM channel that has a fixed period, checking that the resulting duty_cycle matches on a set_config() even if the requested period_ns can't be set. Signed-off-by: Alper Nebi Yasak <alpernebiyasak(a)gmail.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Add tag: "Reviewed-by: Simon Glass <sjg(a)chromium.org>" - Adjust to match recently merged duty cycle calculation fix. v2: https://patchwork.ozlabs.org/project/uboot/patch/20200926200851.4388-1-alpe… Changes in v2: - Add sandbox test to pwm.c (using sandbox_pwm's channel 2) - Add comments to pwm_set_config() and pwm_ops->set_config() v1: https://patchwork.ozlabs.org/project/uboot/patch/20200923165231.18188-1-alp… drivers/pwm/sandbox_pwm.c | 11 +++++++++-- drivers/video/pwm_backlight.c | 20 ++++++++++++++------ include/pwm.h | 8 ++++++++ test/dm/pwm.c | 11 +++++++++++ 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/drivers/pwm/sandbox_pwm.c b/drivers/pwm/sandbox_pwm.c index 28988187e039..3fd2e78c909d 100644 --- a/drivers/pwm/sandbox_pwm.c +++ b/drivers/pwm/sandbox_pwm.c @@ -59,8 +59,15 @@ static int sandbox_pwm_set_config(struct udevice *dev, uint channel, if (channel >= NUM_CHANNELS) return -ENOSPC; chan = &priv->chan[channel]; - chan->period_ns = period_ns; - chan->duty_ns = duty_ns; + + if (channel == 2) { + /* Pretend to have some fixed period */ + chan->period_ns = 4096; + chan->duty_ns = duty_ns * 4096 / period_ns; + } else { + chan->period_ns = period_ns; + chan->duty_ns = duty_ns; + } return 0; } diff --git a/drivers/video/pwm_backlight.c b/drivers/video/pwm_backlight.c index 9519180ceb39..18b7a00b033c 100644 --- a/drivers/video/pwm_backlight.c +++ b/drivers/video/pwm_backlight.c @@ -62,10 +62,17 @@ static int set_pwm(struct pwm_backlight_priv *priv) uint duty_cycle; int ret; - duty_cycle = priv->period_ns * (priv->cur_level - priv->min_level) / - (priv->max_level - priv->min_level); - ret = pwm_set_config(priv->pwm, priv->channel, priv->period_ns, - duty_cycle); + if (priv->period_ns) { + duty_cycle = priv->period_ns * (priv->cur_level - priv->min_level) / + (priv->max_level - priv->min_level); + ret = pwm_set_config(priv->pwm, priv->channel, priv->period_ns, + duty_cycle); + } else { + /* PWM driver will internally scale these like the above. */ + ret = pwm_set_config(priv->pwm, priv->channel, + priv->max_level - priv->min_level, + priv->cur_level - priv->min_level); + } if (ret) return log_ret(ret); @@ -213,10 +220,11 @@ static int pwm_backlight_ofdata_to_platdata(struct udevice *dev) log_debug("Cannot get PWM: ret=%d\n", ret); return log_ret(ret); } - if (args.args_count < 2) + if (args.args_count < 1) return log_msg_ret("Not enough arguments to pwm\n", -EINVAL); priv->channel = args.args[0]; - priv->period_ns = args.args[1]; + if (args.args_count > 1) + priv->period_ns = args.args[1]; if (args.args_count > 2) priv->polarity = args.args[2]; diff --git a/include/pwm.h b/include/pwm.h index 54ae3e64c310..97bda0856e6c 100644 --- a/include/pwm.h +++ b/include/pwm.h @@ -15,6 +15,10 @@ struct pwm_ops { /** * set_config() - Set the PWM configuration * + * Change both the PWM device's period and it's duty period if + * possible. Otherwise, set an appropriate duty period that best + * matches the given period_ns / duty_ns ratio for the device. + * * @dev: PWM device to update * @channel: PWM channel to update * @period_ns: PWM period in nanoseconds @@ -49,6 +53,10 @@ struct pwm_ops { /** * pwm_set_config() - Set the PWM configuration * + * Change both the PWM device's period and it's duty period if + * possible. Otherwise, set an appropriate duty period that best + * matches the given period_ns / duty_ns ratio for the device. + * * @dev: PWM device to update * @channel: PWM channel to update * @period_ns: PWM period in nanoseconds diff --git a/test/dm/pwm.c b/test/dm/pwm.c index 0de6dba1ba64..b624cf3d6558 100644 --- a/test/dm/pwm.c +++ b/test/dm/pwm.c @@ -6,6 +6,7 @@ #include <common.h> #include <dm.h> #include <pwm.h> +#include <asm/test.h> #include <dm/test.h> #include <test/test.h> #include <test/ut.h> @@ -14,6 +15,10 @@ static int dm_test_pwm_base(struct unit_test_state *uts) { struct udevice *dev; + uint period_ns; + uint duty_ns; + bool enable; + bool polarity; ut_assertok(uclass_get_device(UCLASS_PWM, 0, &dev)); ut_assertnonnull(dev); @@ -24,6 +29,12 @@ static int dm_test_pwm_base(struct unit_test_state *uts) ut_asserteq(-ENOSPC, pwm_set_enable(dev, 3, true)); ut_assertok(pwm_set_invert(dev, 0, true)); + ut_assertok(pwm_set_config(dev, 2, 100, 50)); + ut_assertok(sandbox_pwm_get_config(dev, 2, &period_ns, &duty_ns, + &enable, &polarity)); + ut_asserteq(period_ns, 4096); + ut_asserteq(duty_ns, 50 * 4096 / 100); + ut_assertok(uclass_get_device(UCLASS_PWM, 1, &dev)); ut_asserteq(-ENODEV, uclass_get_device(UCLASS_PWM, 2, &dev)); -- 2.28.0

2 3

[PATCH] video: SIMPLE_PANEL depends on DM_GPIO
by Asherah Connor 11 Apr '21

11 Apr '21

SIMPLE_PANEL currently only depends on PANEL && BACKLIGHT, but the code makes references to dm_gpio_set_value and gpio_request_by_name. These are defined in drivers/gpio/gpio-uclass.c, so a dependency on DM_GPIO corrects these link errors: aarch64-linux-gnu-ld.bfd: drivers/built-in.o: in function `simple_panel_set_backlight': /home/kameliya/u-boot/drivers/video/simple_panel.c:42: undefined reference to `dm_gpio_set_value' aarch64-linux-gnu-ld.bfd: drivers/built-in.o: in function `simple_panel_enable_backlight': /home/kameliya/u-boot/drivers/video/simple_panel.c:27: undefined reference to `dm_gpio_set_value' aarch64-linux-gnu-ld.bfd: drivers/built-in.o: in function `simple_panel_of_to_plat': /home/kameliya/u-boot/drivers/video/simple_panel.c:72: undefined reference to `gpio_request_by_name' This issue is only exposed if you have a board which enables CONFIG_DM_VIDEO without CONFIG_DM_GPIO; so far, none do, but soon a QEMU board may. Signed-off-by: Asherah Connor <ashe(a)kivikakk.ee> --- drivers/video/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 667157c2e9..220c008f8a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -209,7 +209,7 @@ config PANEL config SIMPLE_PANEL bool "Enable simple panel support" - depends on PANEL && BACKLIGHT + depends on PANEL && BACKLIGHT && DM_GPIO default y help This turns on a simple panel driver that enables a compatible -- 2.20.1

2 1

[PATCH] finish removing mb862xx video driver
by Trevor Woerner 11 Apr '21

11 Apr '21

drivers/video/mb862xx.c was removed in commit 9c1e098fb92de38f0017585658dd50c3009c84ab from December 2020, however, this last little remnant in drivers/video/cfb_console.c remained. Signed-off-by: Trevor Woerner <twoerner(a)gmail.com> --- drivers/video/cfb_console.c | 14 -------------- scripts/config_whitelist.txt | 1 - 2 files changed, 15 deletions(-) diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index 27ff7163f3..1f491a48d6 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -81,20 +81,6 @@ #define VIDEO_FB_16BPP_WORD_SWAP #endif -/* - * Defines for the MB862xx driver - */ -#ifdef CONFIG_VIDEO_MB862xx - -#ifdef CONFIG_VIDEO_CORALP -#define VIDEO_FB_LITTLE_ENDIAN -#endif -#ifdef CONFIG_VIDEO_MB862xx_ACCEL -#define VIDEO_HW_RECTFILL -#define VIDEO_HW_BITBLT -#endif -#endif - /* * Defines for the i.MX31 driver (mx3fb.c) */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 43295eec7d..be47961c31 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3943,7 +3943,6 @@ CONFIG_VEXPRESS_EXTENDED_MEMORY_MAP CONFIG_VEXPRESS_ORIGINAL_MEMORY_MAP CONFIG_VIDEO_BCM2835 CONFIG_VIDEO_BMP_LOGO -CONFIG_VIDEO_CORALP CONFIG_VIDEO_DA8XX CONFIG_VIDEO_FONT_4X6 CONFIG_VIDEO_LCD_I2C_BUS -- 2.30.0.rc0

2 1