February 2022 - U-Boot

[PATCH] led: led_pwm: Add a driver for LEDs connected to PWM
by Ivan Vozvakhov 01 Mar '22

01 Mar '22

From: Ivan Vozvakhov <i.vozvakhov(a)vk.team> Add a driver which allows to use of LEDs connected to PWM (Linux compatible). MAINTAINERS: add i.vozvakhov as a maintainer of leds-pwm (required during new functionality adding). Signed-off-by: Ivan Vozvakhov <i.vozvakhov(a)vk.team> Signed-off-by: Ivan Vozvakhov <i.vozvakhov(a)corp.mail.ru> --- MAINTAINERS | 6 + doc/device-tree-bindings/leds/leds-pwm.txt | 47 +++++ drivers/led/Kconfig | 6 + drivers/led/Makefile | 1 + drivers/led/led_pwm.c | 189 +++++++++++++++++++++ 5 files changed, 249 insertions(+) create mode 100644 doc/device-tree-bindings/leds/leds-pwm.txt create mode 100644 drivers/led/led_pwm.c diff --git a/MAINTAINERS b/MAINTAINERS index fb171e0c68..2e8f8cdada 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -869,6 +869,12 @@ F: doc/README.kwbimage F: doc/kwboot.1 F: tools/kwb* +LED +M: Ivan Vozvakhov <i.vozvakhov(a)vk.team> +S: Supported +F: doc/device-tree-bindings/leds/leds-pwm.txt +F: drivers/led/led_pwm.c + LOGGING M: Simon Glass <sjg(a)chromium.org> S: Maintained diff --git a/doc/device-tree-bindings/leds/leds-pwm.txt b/doc/device-tree-bindings/leds/leds-pwm.txt new file mode 100644 index 0000000000..186e8a848f --- /dev/null +++ b/doc/device-tree-bindings/leds/leds-pwm.txt @@ -0,0 +1,47 @@ +LEDs connected to PWM (Linux compatible) + +Required properties: +- compatible : should be "pwm-leds". + +Each LED is represented as a sub-node of the pwm-leds device. Each +node's name represents the name of the corresponding LED. + +LED sub-node properties: +- pwms : (required) LED pwm channel, see "pwms property" in + doc/device-tree-bindings/pwm/pwm.txt +- label : (optional) LED label, see "label property" in + doc/device-tree-bindings/led/common.txt +- max-brightness : (optional, unsigned, default 255) Maximum brightness possible + for the LED +- active-low : (optional, boolean, default false) For PWMs where the LED is + wired to supply rather than ground +- u-boot,default-brightness : (optional, unsigned, default 0) Initial state + of pwm-leds + +Example: + +leds { + compatible = "pwm-leds"; + status = "okay"; + + blue { + label = "led-blue"; + pwms = <&pwm1 0 100000 0>; + max-brightness = <255>; + u-boot,default-brightness = <127>; + }; + + green { + label = "led-green"; + pwms = <&pwm2 0 100000 0>; + max-brightness = <255>; + u-boot,default-brightness = <127>; + }; + + red { + label = "led-red"; + pwms = <&pwm3 0 100000 0>; + max-brightness = <255>; + u-boot,default-brightness = <127>; + }; +} diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig index cc87fbf395..48616e2f55 100644 --- a/drivers/led/Kconfig +++ b/drivers/led/Kconfig @@ -42,6 +42,12 @@ config LED_CORTINA This option enables support for LEDs connected to the Cortina Access CAxxxx SOCs. +config LED_PWM + bool "LED PWM" + depends on LED && DM_PWM + help + Enable support for LEDs connected to PWM. + Linux compatible ofdata. config LED_BLINK bool "Support LED blinking" diff --git a/drivers/led/Makefile b/drivers/led/Makefile index 8e3ae7f146..c31a59e1aa 100644 --- a/drivers/led/Makefile +++ b/drivers/led/Makefile @@ -7,5 +7,6 @@ obj-y += led-uclass.o obj-$(CONFIG_LED_BCM6328) += led_bcm6328.o obj-$(CONFIG_LED_BCM6358) += led_bcm6358.o obj-$(CONFIG_LED_BCM6858) += led_bcm6858.o +obj-$(CONFIG_LED_PWM) += led_pwm.o obj-$(CONFIG_$(SPL_)LED_GPIO) += led_gpio.o obj-$(CONFIG_LED_CORTINA) += led_cortina.o diff --git a/drivers/led/led_pwm.c b/drivers/led/led_pwm.c new file mode 100644 index 0000000000..d36ce4c0df --- /dev/null +++ b/drivers/led/led_pwm.c @@ -0,0 +1,189 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2022 VK + * Author: Ivan Vozvakhov <i.vozvakhov(a)vk.team> + */ + +#include <common.h> +#include <dm.h> +#include <errno.h> +#include <led.h> +#include <malloc.h> +#include <dm/lists.h> +#include <pwm.h> + +#define LEDS_PWM_DRIVER_NAME "led_pwm" + +struct led_pwm_priv { + struct udevice *pwm; + uint active_low; /* polarity */ + uint period; /* period_ns */ + uint duty; + uint channel; + bool enabled; + bool polarity; +}; + +static int led_pwm_enable(struct udevice *dev) +{ + struct led_pwm_priv *priv = dev_get_priv(dev); + int ret; + + ret = pwm_set_invert(priv->pwm, priv->channel, priv->polarity); + if (ret) + return ret; + + ret = pwm_set_config(priv->pwm, priv->channel, priv->period, priv->duty); + if (ret) + return ret; + + ret = pwm_set_enable(priv->pwm, priv->channel, true); + if (ret) + return ret; + + priv->enabled = true; + + return 0; +} + +static int led_pwm_disable(struct udevice *dev) +{ + struct led_pwm_priv *priv = dev_get_priv(dev); + int ret; + + ret = pwm_set_config(priv->pwm, priv->channel, priv->period, 0); + if (ret) + return ret; + + ret = pwm_set_enable(priv->pwm, priv->channel, false); + if (ret) + return ret; + + priv->enabled = false; + + return 0; +} + +static int led_pwm_set_state(struct udevice *dev, enum led_state_t state) +{ + struct led_pwm_priv *priv = dev_get_priv(dev); + int ret; + + switch (state) { + case LEDST_OFF: + ret = led_pwm_disable(dev); + break; + case LEDST_ON: + ret = led_pwm_enable(dev); + break; + case LEDST_TOGGLE: + ret = (priv->enabled) ? led_pwm_disable(dev) : led_pwm_enable(dev); + break; + default: + ret = -ENOSYS; + } + + return ret; +} + +static enum led_state_t led_pwm_get_state(struct udevice *dev) +{ + struct led_pwm_priv *priv = dev_get_priv(dev); + + return (priv->enabled) ? LEDST_ON : LEDST_OFF; +} + +static int led_pwm_probe(struct udevice *dev) +{ + struct led_pwm_priv *priv = dev_get_priv(dev); + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); + + /* Ignore the top-level LED node */ + if (!uc_plat->label) + return 0; + + return led_pwm_set_state(dev, (priv->enabled) ? LEDST_ON : LEDST_OFF); +} + +static int led_pwm_of_to_plat(struct udevice *dev) +{ + struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); + struct led_pwm_priv *priv = dev_get_priv(dev); + struct ofnode_phandle_args args; + uint def_brightness, max_brightness; + int ret; + + /* Ignore the top-level LED node */ + if (!uc_plat->label) + return 0; + + ret = dev_read_phandle_with_args(dev, "pwms", "#pwm-cells", 0, 0, &args); + if (ret) + return ret; + + ret = uclass_get_device_by_ofnode(UCLASS_PWM, args.node, &priv->pwm); + if (ret) + return ret; + + priv->channel = args.args[0]; + priv->period = args.args[1]; + priv->polarity = dev_read_bool(dev, "active-low"); + + def_brightness = dev_read_u32_default(dev, "u-boot,default-brightness", 0); + max_brightness = dev_read_u32_default(dev, "max-brightness", 255); + priv->enabled = !!def_brightness; + + if (def_brightness < max_brightness) + priv->duty = priv->period * def_brightness / max_brightness; + else + priv->duty = priv->period; + + return 0; +} + +static int led_pwm_bind(struct udevice *parent) +{ + struct udevice *dev; + ofnode node; + int ret; + + dev_for_each_subnode(node, parent) { + struct led_uc_plat *uc_plat; + const char *label; + + label = ofnode_read_string(node, "label"); + if (!label) + label = ofnode_get_name(node); + + ret = device_bind_driver_to_node(parent, LEDS_PWM_DRIVER_NAME, + ofnode_get_name(node), + node, &dev); + if (ret) + return ret; + + uc_plat = dev_get_uclass_plat(dev); + uc_plat->label = label; + } + return 0; +} + +static const struct led_ops led_pwm_ops = { + .set_state = led_pwm_set_state, + .get_state = led_pwm_get_state, +}; + +static const struct udevice_id led_pwm_ids[] = { + { .compatible = "pwm-leds" }, + { } +}; + +U_BOOT_DRIVER(led_pwm) = { + .name = LEDS_PWM_DRIVER_NAME, + .id = UCLASS_LED, + .of_match = led_pwm_ids, + .ops = &led_pwm_ops, + .priv_auto = sizeof(struct led_pwm_priv), + .bind = led_pwm_bind, + .probe = led_pwm_probe, + .of_to_plat = led_pwm_of_to_plat, +}; -- 2.25.1

2 1

[PATCH] spi: dw: Fix broken dw_spi_mem_ops()
by Niklas Cassel 01 Mar '22

01 Mar '22

From: Niklas Cassel <niklas.cassel(a)wdc.com> The driver is currently using sizeof(op->cmd.opcode) in the op_len calculation. Commit d15de623013c ("spi: spi-mem: allow specifying a command's extension") changed op->cmd.opcode from one byte to two. Instead, a new struct member op->cmd.nbytes is supposed to be used. For regular commands op->cmd.nbytes will be one. Commit d15de623013c ("spi: spi-mem: allow specifying a command's extension") did update some drivers that overload the generic mem_ops() implementation, but forgot to update dw_spi_mem_ops(). Calculating op_len incorrectly causes dw_spi_mem_ops() to misbehave, since op_len is used to determine how many bytes that should be read/written. On the canaan k210 board, this causes the probe of the SPI flash to fail. Fix the op_len calculation in dw_spi_mem_ops(). Doing so results in working SPI flash on the canaan k210 board. Fixes: d15de623013c ("spi: spi-mem: allow specifying a command's extension") Signed-off-by: Niklas Cassel <niklas.cassel(a)wdc.com> --- drivers/spi/designware_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/designware_spi.c b/drivers/spi/designware_spi.c index 742121140d..fc22f540fe 100644 --- a/drivers/spi/designware_spi.c +++ b/drivers/spi/designware_spi.c @@ -572,7 +572,7 @@ static int dw_spi_exec_op(struct spi_slave *slave, const struct spi_mem_op *op) int pos, i, ret = 0; struct udevice *bus = slave->dev->parent; struct dw_spi_priv *priv = dev_get_priv(bus); - u8 op_len = sizeof(op->cmd.opcode) + op->addr.nbytes + op->dummy.nbytes; + u8 op_len = op->cmd.nbytes + op->addr.nbytes + op->dummy.nbytes; u8 op_buf[op_len]; u32 cr0; -- 2.34.1

4 4

[ANN] U-Boot v2022.04-rc3 released
by Tom Rini 01 Mar '22

01 Mar '22

Hey all, It's release day and so here's v2022.04-rc3. With the release itself nearing a month away, I'm opening the -next branch as well with this release. At this point, if there's platform specific changes, or other bug fixes / changes you had submitted and hoped would be in this release, but are not there yet, please feel free to follow up to those patches so they don't get lost. In terms of a changelog, git log --merges v2022.04-rc2..v2022.04-rc3 contains what I've pulled but as always, better PR messages and tags will provide better results here. So we're now looking at regular releases every other Monday, and with final release on April 4th, 2022. Thanks all! -- Tom

1 0

[PATCH] image: Control FIT signature verification at runtime
by Andrew Jeffery 28 Feb '22

28 Feb '22

Some platform designs include support for disabling secure-boot via a jumper on the board. Sometimes this control can be separate from the mechanism enabling the root-of-trust for the platform. Add support for this latter scenario by allowing boards to implement board_fit_image_require_verfied(), which is then invoked in the usual FIT verification paths. Signed-off-by: Andrew Jeffery <andrew(a)aj.id.au> --- Hi, This patch is extracted from and motivated by a series adding run-time control of FIT signature verification to u-boot in OpenBMC: https://lore.kernel.org/openbmc/20220131012538.73021-1-andrew@aj.id.au/ Unfortunately the OpenBMC u-boot tree is quite a way behind on tracking upstream and contains a bunch of out-of-tree work as well. As such I'm looking to upstream the couple of changes that make sense against master. Please take a look! Andrew boot/Kconfig | 8 ++++++++ boot/image-fit.c | 21 +++++++++++++++++---- include/image.h | 9 +++++++++ 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/boot/Kconfig b/boot/Kconfig index c8d5906cd304..ec413151fd5a 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -78,6 +78,14 @@ config FIT_SIGNATURE format support in this case, enable it using CONFIG_LEGACY_IMAGE_FORMAT. +if FIT_SIGNATURE +config FIT_RUNTIME_SIGNATURE + bool "Control verification of FIT uImages at runtime" + help + This option allows board support to disable verification of + signatures at runtime, for example through the state of a GPIO. +endif # FIT_SIGNATURE + config FIT_SIGNATURE_MAX_SIZE hex "Max size of signed FIT structures" depends on FIT_SIGNATURE diff --git a/boot/image-fit.c b/boot/image-fit.c index f01cafe4e277..919dbfa4ee1d 100644 --- a/boot/image-fit.c +++ b/boot/image-fit.c @@ -1308,6 +1308,14 @@ static int fit_image_check_hash(const void *fit, int noffset, const void *data, return 0; } +#ifndef __weak +#define __weak +#endif +__weak int board_fit_image_require_verified(void) +{ + return 1; +} + int fit_image_verify_with_data(const void *fit, int image_noffset, const void *key_blob, const void *data, size_t size) @@ -1319,6 +1327,7 @@ int fit_image_verify_with_data(const void *fit, int image_noffset, /* Verify all required signatures */ if (FIT_IMAGE_ENABLE_VERIFY && + fit_image_require_verified() && fit_image_verify_required_sigs(fit, image_noffset, data, size, key_blob, &verify_all)) { err_msg = "Unable to verify required signature"; @@ -1340,9 +1349,11 @@ int fit_image_verify_with_data(const void *fit, int image_noffset, &err_msg)) goto error; puts("+ "); - } else if (FIT_IMAGE_ENABLE_VERIFY && verify_all && - !strncmp(name, FIT_SIG_NODENAME, - strlen(FIT_SIG_NODENAME))) { + } else if (FIT_IMAGE_ENABLE_VERIFY && + fit_image_require_verified() && + verify_all && + !strncmp(name, FIT_SIG_NODENAME, + strlen(FIT_SIG_NODENAME))) { ret = fit_image_check_sig(fit, noffset, data, size, gd_fdt_blob(), -1, &err_msg); @@ -2061,7 +2072,9 @@ int fit_image_load(bootm_headers_t *images, ulong addr, if (image_type == IH_TYPE_KERNEL) images->fit_uname_cfg = fit_base_uname_config; - if (FIT_IMAGE_ENABLE_VERIFY && images->verify) { + if (FIT_IMAGE_ENABLE_VERIFY && + fit_image_require_verified() && + images->verify) { puts(" Verifying Hash Integrity ... "); if (fit_config_verify(fit, cfg_noffset)) { puts("Bad Data Hash\n"); diff --git a/include/image.h b/include/image.h index 97e5f2eb24d6..98900c2e839b 100644 --- a/include/image.h +++ b/include/image.h @@ -1173,6 +1173,15 @@ int calculate_hash(const void *data, int data_len, const char *algo, # define FIT_IMAGE_ENABLE_VERIFY CONFIG_IS_ENABLED(FIT_SIGNATURE) #endif +/* + * Further, allow run-time control of verification, e.g. via a jumper + */ +#if defined(CONFIG_FIT_RUNTIME_SIGNATURE) +# define fit_image_require_verified() board_fit_image_require_verified() +#else +# define fit_image_require_verified() FIT_IMAGE_ENABLE_VERIFY +#endif + #ifdef USE_HOSTCC void *image_get_host_blob(void); void image_set_host_blob(void *host_blob); -- 2.32.0

5 13

[PATCH 0/5] sandbox: Minor Fixes in various areas
by Simon Glass 28 Feb '22

28 Feb '22

This series contains some minor tweaks and fixes to sandbox-related code. Simon Glass (5): sandbox: Show a message when writing out the ram buffer sandbox: Add the handoff header for spl sandbox: Open host file for read-only access if needed sandbox: Slow down the LCD sync rate sandbox: test: Tidy up spl_test_load() calls arch/sandbox/cpu/spl.c | 1 + arch/sandbox/cpu/state.c | 3 ++- drivers/block/sandbox.c | 11 ++++++++--- drivers/video/video-uclass.c | 2 +- test/image/spl_load.c | 6 +----- 5 files changed, 13 insertions(+), 10 deletions(-) -- 2.35.1.574.g5d30c73bfb-goog

1 5

[PATCH] arm: pdu001: Setup pinmux for console UART as early as possible
by Felix Brack 28 Feb '22

28 Feb '22

To make sure we get a working console as soon as possible in the SPL the UART pins require to be configured earlier. This is especially true for the pins of UART3, since the PDU001 board uses this UART for the console by default. Signed-off-by: Felix Brack <fb(a)ltec.ch> --- board/eets/pdu001/board.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c index 9f3cfd4f84..4aeb84071b 100644 --- a/board/eets/pdu001/board.c +++ b/board/eets/pdu001/board.c @@ -216,6 +216,36 @@ const struct dpll_params *get_dpll_ddr_params(void) return &dpll_ddr; } +void set_uart_mux_conf(void) +{ + switch (CONFIG_CONS_INDEX) { + case 1: { + enable_uart0_pin_mux(); + break; + } + case 2: { + enable_uart1_pin_mux(); + break; + } + case 3: { + enable_uart2_pin_mux(); + break; + } + case 4: { + enable_uart3_pin_mux(); + break; + } + case 5: { + enable_uart4_pin_mux(); + break; + } + case 6: { + enable_uart5_pin_mux(); + break; + } + } +} + void set_mux_conf_regs(void) { /* done first by the ROM and afterwards by the pin controller driver */ -- 2.25.1

2 4

[PATCH v2] board: stemmy: Detect board variants and patch DTB
by Linus Walleij 28 Feb '22

28 Feb '22

This patch scans the cmdline from the Samsung SBL (second stage bootloader) and stores the parameters board_id=N and lcdtype=N in order to augment the DTB for different board and LCD types. We then add a custom ft_board_setup() callback that will inspect the DTB and patch it using the stored LCD type. At this point we know which product we are dealing with, so using the passed board_id we can also print the board variant for diagnostics. We patch the Codina, Skomer and Kyle DTBs to use the right LCD type as passed in lcdtype from the SBL. This also creates an infrastructure for handling any other Samsung U8500 board variants that may need a slightly augmented DTB. Cc: Markuss Broks <markuss.broks(a)gmail.com> Cc: Stephan Gerhold <stephan(a)gerhold.net> Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- ChangeLog v1->v2: - Use ft_board_setup() like everyone else. The patch refers to samsung,codina-tmo which is a device tree which is not yet in the upstream Linux kernel but it is on its way there. --- board/ste/stemmy/stemmy.c | 315 ++++++++++++++++++++++++++++++++++++++ configs/stemmy_defconfig | 2 + 2 files changed, 317 insertions(+) diff --git a/board/ste/stemmy/stemmy.c b/board/ste/stemmy/stemmy.c index a16be6143dc3..60f27374c3c5 100644 --- a/board/ste/stemmy/stemmy.c +++ b/board/ste/stemmy/stemmy.c @@ -4,6 +4,7 @@ */ #include <common.h> #include <env.h> +#include <fdt_support.h> #include <init.h> #include <log.h> #include <stdlib.h> @@ -157,6 +158,33 @@ static void parse_serial(const struct tag_serialnr *serialnr) env_set("serial#", serial); } +#define SBL_BOARD "board_id=" +#define SBL_LCDTYPE "lcdtype=" +static ulong board_id = 0; +static ulong lcdtype = 0; + +static void parse_cmdline(const struct tag_cmdline *cmdline) +{ + char *buf; + + /* Export this to sbl_cmdline (secondary boot loader command line) */ + env_set("sbl_cmdline", cmdline->cmdline); + + buf = strstr(cmdline->cmdline, SBL_BOARD); + if (!buf) + return; + buf += strlen(SBL_BOARD); + + board_id = simple_strtoul(buf, NULL, 10); + + buf = strstr(cmdline->cmdline, SBL_LCDTYPE); + if (!buf) + return; + buf += strlen(SBL_LCDTYPE); + + lcdtype = simple_strtoul(buf, NULL, 10); +} + /* * The downstream/vendor kernel (provided by Samsung) uses ATAGS for booting. * It also requires an extremely long cmdline provided by the primary bootloader @@ -188,6 +216,9 @@ static void copy_atags(const struct tag *tags) if (t->hdr.tag == ATAG_SERIAL) parse_serial(&t->u.serialnr); + if (t->hdr.tag == ATAG_CMDLINE) + parse_cmdline(&t->u.cmdline); + fw_atags_size += t->hdr.size * sizeof(u32); } @@ -228,3 +259,287 @@ void setup_board_tags(struct tag **in_params) memcpy(*in_params, fw_atags_copy, fw_atags_size); *(u8 **)in_params += fw_atags_size; } + +/* These numbers are unique per product but not across all products */ +#define SAMSUNG_CODINA_LCD_LMS380KF01 4 +#define SAMSUNG_CODINA_LCD_S6D27A1 13 +#define SAMSUNG_SKOMER_LCD_HVA40WV1 10 +#define SAMSUNG_SKOMER_LCD_NT35512 12 + +static void codina_patch_display(void *fdt) +{ + int node; + int ret; + + node = fdt_path_offset(fdt, "/spi-gpio-0/panel"); + if (node < 0) { + printf("cannot find Codina panel node\n"); + return; + } + if (lcdtype == SAMSUNG_CODINA_LCD_LMS380KF01) { + ret = fdt_setprop_string(fdt, node, "compatible", "samsung,lms380kf01"); + if (ret < 0) + printf("could not set LCD compatible\n"); + else + printf("updated LCD compatible to LMS380KF01\n"); + } else if (lcdtype == SAMSUNG_CODINA_LCD_S6D27A1) { + ret = fdt_setprop_string(fdt, node, "compatible", "samsung,s6d27a1"); + if (ret < 0) + printf("could not set LCD compatible\n"); + else + printf("updated LCD compatible to S6D27A1\n"); + } else { + printf("unknown LCD type\n"); + } +} + +static void skomer_kyle_patch_display(void *fdt) +{ + int node; + int ret; + + node = fdt_path_offset(fdt, "/soc/mcde/dsi/panel"); + if (node < 0) { + printf("cannot find Skomer/Kyle panel node\n"); + return; + } + if (lcdtype == SAMSUNG_SKOMER_LCD_HVA40WV1) { + ret = fdt_setprop_string(fdt, node, "compatible", "hydis,hva40wv1"); + if (ret < 0) + printf("could not set LCD compatible\n"); + else + printf("updated LCD compatible to Hydis HVA40WV1\n"); + } else if (lcdtype == SAMSUNG_SKOMER_LCD_NT35512) { + /* + * FIXME: This panel is actually a BOE product, but we don't know + * the exact product name, so the compatible for the NT35512 + * is used for the time being. The vendor drivers also call it NT35512. + */ + ret = fdt_setprop_string(fdt, node, "compatible", "novatek,nt35512"); + if (ret < 0) + printf("could not set LCD compatible\n"); + else + printf("updated LCD compatible to Novatek NT35512\n"); + } else { + printf("unknown LCD type\n"); + } +} + +int ft_board_setup(void *fdt, struct bd_info *bd) +{ + const char *str; + int node; + int ret; + + printf("stemmy patch: DTB at 0x%08lx\n", (ulong)fdt); + + /* Inspect FDT to see what we've got here */ + ret = fdt_check_header(fdt); + if (ret < 0) { + printf("invalid DTB\n"); + return ret; + } + node = fdt_path_offset(fdt, "/"); + if (node < 0) { + printf("cannot find root node\n"); + return node; + } + str = fdt_stringlist_get(fdt, node, "compatible", 0, NULL); + if (!str) { + printf("could not find board compatible\n"); + return -1; + } + + if (!strcmp(str, "samsung,janice")) { + switch(board_id) { + case 7: + printf("Janice GT-I9070 Board Rev 0.0\n"); + break; + case 8: + printf("Janice GT-I9070 Board Rev 0.1\n"); + break; + case 9: + printf("Janice GT-I9070 Board Rev 0.2\n"); + break; + case 10: + printf("Janice GT-I9070 Board Rev 0.3\n"); + break; + case 11: + printf("Janice GT-I9070 Board Rev 0.4\n"); + break; + case 12: + printf("Janice GT-I9070 Board Rev 0.5\n"); + break; + case 13: + printf("Janice GT-I9070 Board Rev 0.6\n"); + break; + default: + break; + } + } else if (!strcmp(str, "samsung,gavini")) { + switch(board_id) { + case 7: + printf("Gavini GT-I8530 Board Rev 0.0\n"); + break; + case 8: + printf("Gavini GT-I8530 Board Rev 0.0A\n"); + break; + case 9: + printf("Gavini GT-I8530 Board Rev 0.0B\n"); + break; + case 10: + printf("Gavini GT-I8530 Board Rev 0.0A_EMUL\n"); + break; + case 11: + printf("Gavini GT-I8530 Board Rev 0.0C\n"); + break; + case 12: + printf("Gavini GT-I8530 Board Rev 0.0D\n"); + break; + case 13: + printf("Gavini GT-I8530 Board Rev 0.1\n"); + break; + case 14: + printf("Gavini GT-I8530 Board Rev 0.3\n"); + break; + default: + break; + } + } else if (!strcmp(str, "samsung,codina")) { + switch(board_id) { + case 7: + printf("Codina GT-I8160 Board Rev 0.0\n"); + break; + case 8: + printf("Codina GT-I8160 Board Rev 0.1\n"); + break; + case 9: + printf("Codina GT-I8160 Board Rev 0.2\n"); + break; + case 10: + printf("Codina GT-I8160 Board Rev 0.3\n"); + break; + case 11: + printf("Codina GT-I8160 Board Rev 0.4\n"); + break; + case 12: + printf("Codina GT-I8160 Board Rev 0.5\n"); + break; + default: + break; + } + codina_patch_display(fdt); + } else if (!strcmp(str, "samsung,codina-tmo")) { + switch(board_id) { + case 0x101: + printf("Codina SGH-T599 Board pre-Rev 0.0\n"); + break; + case 0x102: + printf("Codina SGH-T599 Board Rev 0.0\n"); + break; + case 0x103: + printf("Codina SGH-T599 Board Rev 0.1\n"); + break; + case 0x104: + printf("Codina SGH-T599 Board Rev 0.2\n"); + break; + case 0x105: + printf("Codina SGH-T599 Board Rev 0.4\n"); + break; + case 0x106: + printf("Codina SGH-T599 Board Rev 0.6\n"); + break; + case 0x107: + printf("Codina SGH-T599 Board Rev 0.7\n"); + break; + default: + break; + } + codina_patch_display(fdt); + } else if (!strcmp(str, "samsung,golden")) { + switch(board_id) { + case 0x102: + printf("Golden GT-I8190 Board SW bringup\n"); + break; + case 0x103: + printf("Golden GT-I8190 Board Rev 0.2\n"); + break; + case 0x104: + printf("Golden GT-I8190 Board Rev 0.3\n"); + break; + case 0x105: + printf("Golden GT-I8190 Board Rev 0.4\n"); + break; + case 0x106: + printf("Golden GT-I8190 Board Rev 0.5\n"); + break; + case 0x107: + printf("Golden GT-I8190 Board Rev 0.6\n"); + break; + default: + break; + } + } else if (!strcmp(str, "samsung,skomer")) { + switch(board_id) { + case 0x101: + printf("Skomer GT-S7710 Board Rev 0.0\n"); + break; + case 0x102: + printf("Skomer GT-S7710 Board Rev 0.1\n"); + break; + case 0x103: + printf("Skomer GT-S7710 Board Rev 0.2\n"); + break; + case 0x104: + printf("Skomer GT-S7710 Board Rev 0.3\n"); + break; + case 0x105: + printf("Skomer GT-S7710 Board Rev 0.4\n"); + break; + case 0x106: + printf("Skomer GT-S7710 Board Rev 0.5\n"); + break; + case 0x107: + printf("Skomer GT-S7710 Board Rev 0.6\n"); + break; + case 0x108: + printf("Skomer GT-S7710 Board Rev 0.7\n"); + break; + case 0x109: + printf("Skomer GT-S7710 Board Rev 0.8\n"); + break; + default: + break; + } + skomer_kyle_patch_display(fdt); + } else if (!strcmp(str, "samsung,kyle")) { + switch(board_id) { + case 0x101: + printf("Kyle SGH-I407 Board Rev 0.0\n"); + break; + case 0x102: + printf("Kyle SGH-I407 Board Rev 0.1\n"); + break; + case 0x103: + printf("Kyle SGH-I407 Board Rev 0.2\n"); + break; + case 0x104: + printf("Kyle SGH-I407 Board Rev 0.3\n"); + break; + case 0x105: + printf("Kyle SGH-I407 Board Rev 0.4\n"); + break; + case 0x106: + printf("Kyle SGH-I407 Board Rev 0.5\n"); + break; + case 0x107: + printf("Kyle SGH-I407 Board Rev 0.6\n"); + break; + default: + break; + } + skomer_kyle_patch_display(fdt); + } + + return 0; +} diff --git a/configs/stemmy_defconfig b/configs/stemmy_defconfig index 8e1ff704cf95..d6cce7436cad 100644 --- a/configs/stemmy_defconfig +++ b/configs/stemmy_defconfig @@ -37,3 +37,5 @@ CONFIG_DM_VIDEO=y CONFIG_SYS_WHITE_ON_BLACK=y CONFIG_VIDEO_MCDE_SIMPLE=y # CONFIG_EFI_LOADER is not set +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_LIBFDT=y -- 2.34.1

2 1

[PATCH v3 1/1] arm: apple: Switch to fully dynamic mem layout
by Janne Grunau 28 Feb '22

28 Feb '22

Support for Apple M1 Pro and Max will allow using a single binary for all M1 SoCs. The M1 Pro/Max have a different memory layout. The RAM start address is 0x100_0000_0000 instead of 0x8_0000_0000. Replace the hardcoded memory layout with dynamic initialized environment variables in board_late_init(). Tested on Mac Mini (2020) and Macbook Pro 14-inch (2021). Signed-off-by: Janne Grunau <j(a)jannau.net> Reviewed-by: Mark Kettenis <kettenis(a)openbsd.org> --- Changes compared to v2: - rebased to master + Mark's "arm: apple: Add M1 Pro/Max support" 20220208210009.46165-1-kettenis(a)openbsd.org Resolves conflicts merged Apple NVME patch and follows the order proposed by Mark - added kernel_comp_{addr_r,size} for compressed kernel support arch/arm/mach-apple/board.c | 33 +++++++++++++++++++++++++++++++++ configs/apple_m1_defconfig | 3 ++- include/configs/apple.h | 5 ----- 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-apple/board.c b/arch/arm/mach-apple/board.c index f9f8a2f278..54005f3adf 100644 --- a/arch/arm/mach-apple/board.c +++ b/arch/arm/mach-apple/board.c @@ -265,3 +265,36 @@ u64 get_page_table_size(void) { return SZ_256K; } + +int board_late_init(void) +{ + unsigned long base; + unsigned long top; + u32 status = 0; + + /* Reserve 4M each for scriptaddr and pxefile_addr_r at the top of RAM + * at least 1M below the stack. + */ + top = gd->start_addr_sp - CONFIG_STACK_SIZE - SZ_8M - SZ_1M; + top = ALIGN_DOWN(top, SZ_8M); + + status |= env_set_hex("scriptaddr", top + SZ_4M); + status |= env_set_hex("pxefile_addr_r", top); + + /* somewhat based on the Linux Kernel boot requirements: + * align by 2M and maximal FDT size 2M + */ + base = ALIGN(gd->ram_base, SZ_2M); + + status |= env_set_hex("fdt_addr_r", base); + status |= env_set_hex("kernel_addr_r", base + SZ_2M); + status |= env_set_hex("ramdisk_addr_r", base + SZ_128M); + status |= env_set_hex("loadaddr", base + SZ_2G); + status |= env_set_hex("kernel_comp_addr_r", base + SZ_2G - SZ_128M); + status |= env_set_hex("kernel_comp_size", SZ_128M); + + if (status) + log_warning("late_init: Failed to set run time variables\n"); + + return 0; +} diff --git a/configs/apple_m1_defconfig b/configs/apple_m1_defconfig index 8583e4ad8c..ef5b7ffd1a 100644 --- a/configs/apple_m1_defconfig +++ b/configs/apple_m1_defconfig @@ -4,10 +4,11 @@ CONFIG_DEFAULT_DEVICE_TREE="t8103-j274" CONFIG_DEBUG_UART_BASE=0x235200000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y -CONFIG_SYS_LOAD_ADDR=0x880000000 +CONFIG_SYS_LOAD_ADDR=0x0 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_BOARD_LATE_INIT=y # CONFIG_NET is not set # CONFIG_MMC is not set CONFIG_DEBUG_UART_ANNOUNCE=y diff --git a/include/configs/apple.h b/include/configs/apple.h index f12e9bdef5..b06660add4 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -9,10 +9,6 @@ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" -#define ENV_MEM_LAYOUT_SETTINGS \ - "fdt_addr_r=0x960100000\0" \ - "kernel_addr_r=0x960200000\0" - #if CONFIG_IS_ENABLED(CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else @@ -33,7 +29,6 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ ENV_DEVICE_SETTINGS \ - ENV_MEM_LAYOUT_SETTINGS \ BOOTENV #endif -- 2.35.1

2 1

[PATCH] arm: pdu001: Fix early debugging UART
by Felix Brack 28 Feb '22

28 Feb '22

The changes from commit 0dba45864b2a ("arm: Init the debug UART") prevent the early debug UART from being initialized correctly. To fix this we not just configure the pin multiplexer but add setting up early clocks. Signed-off-by: Felix Brack <fb(a)ltec.ch> --- board/eets/pdu001/Makefile | 6 +----- board/eets/pdu001/board.c | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/board/eets/pdu001/Makefile b/board/eets/pdu001/Makefile index a5990ce3ad..35ea3978fe 100644 --- a/board/eets/pdu001/Makefile +++ b/board/eets/pdu001/Makefile @@ -6,8 +6,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifeq ($(CONFIG_$(SPL_)SKIP_LOWLEVEL_INIT),) -obj-y := mux.o -endif - -obj-y += board.o +obj-y := board.o mux.o diff --git a/board/eets/pdu001/board.c b/board/eets/pdu001/board.c index 9f3cfd4f84..8612c09d40 100644 --- a/board/eets/pdu001/board.c +++ b/board/eets/pdu001/board.c @@ -240,6 +240,8 @@ void sdram_init(void) #ifdef CONFIG_DEBUG_UART void board_debug_uart_init(void) { + setup_early_clocks(); + /* done by pin controller driver if not debugging */ enable_uart_pin_mux(CONFIG_DEBUG_UART_BASE); } -- 2.25.1

3 3

[PATCH] tools: mkimage/dumpimage: Allow to use -l with -T
by Pali Rohár 28 Feb '22

28 Feb '22

Currently -l option for mkimage and dumpimage ignores option -T and always tries to autodetect image type. With this change it is possible to tell mkimage and dumpimage to parse image file as specific type (and not random autodetected type). This allows to use mkimage -l or dumpimage -l as tool for validating image. params.type for -l option is now by default initialized to zero (IH_TYPE_INVALID) instead of IH_TYPE_KERNEL. imagetool_get_type() for IH_TYPE_INVALID returns NULL, which is assigned to tparams. mkimage and dumpimage code is extended to handle tparams with NULL for -l option. And imagetool_verify_print_header() is extended to do validation via tparams if is not NULL. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- doc/mkimage.1 | 10 ++++++++-- tools/dumpimage.c | 17 ++++++++--------- tools/imagetool.c | 11 ++++++++++- tools/imagetool.h | 22 ++++------------------ tools/mkimage.c | 36 ++++++++++++++---------------------- 5 files changed, 44 insertions(+), 52 deletions(-) diff --git a/doc/mkimage.1 b/doc/mkimage.1 index fc84cca066b0..287006279f71 100644 --- a/doc/mkimage.1 +++ b/doc/mkimage.1 @@ -1,10 +1,10 @@ -.TH MKIMAGE 1 "2010-05-16" +.TH MKIMAGE 1 "2022-02-07" .SH NAME mkimage \- Generate image for U-Boot .SH SYNOPSIS .B mkimage -.RB "\-l [" "uimage file name" "]" +.RB [ \-T " \fItype\fP] " \-l " [\fIuimage file name\fP]" .B mkimage .RB [\fIoptions\fP] " \-f [" "image tree source file" "]" " [" "uimage file name" "]" @@ -47,6 +47,12 @@ supports verified boot. .BI "\-l [" "uimage file name" "]" mkimage lists the information contained in the header of an existing U-Boot image. +.TP +.BI "\-T [" "image type" "]" +Parse image file as type. +Pass \-h as the image to see the list of supported image type. +Without this option image type is autodetected. + .P .B Create old legacy image: diff --git a/tools/dumpimage.c b/tools/dumpimage.c index e5481435a764..4791dd0dfe18 100644 --- a/tools/dumpimage.c +++ b/tools/dumpimage.c @@ -12,9 +12,7 @@ static void usage(void); /* parameters initialized by core will be used by the image type code */ -static struct image_tool_params params = { - .type = IH_TYPE_KERNEL, -}; +static struct image_tool_params params; /* * dumpimage_extract_subimage - @@ -110,7 +108,7 @@ int main(int argc, char **argv) } } - if (argc < 2) + if (argc < 2 || (params.iflag && params.lflag)) usage(); if (optind >= argc) { @@ -122,7 +120,7 @@ int main(int argc, char **argv) /* set tparams as per input type_id */ tparams = imagetool_get_type(params.type); - if (tparams == NULL) { + if (!params.lflag && tparams == NULL) { fprintf(stderr, "%s: unsupported type: %s\n", params.cmdname, genimg_get_type_name(params.type)); exit(EXIT_FAILURE); @@ -132,7 +130,7 @@ int main(int argc, char **argv) * check the passed arguments parameters meets the requirements * as per image type to be generated/listed */ - if (tparams->check_params) { + if (tparams && tparams->check_params) { if (tparams->check_params(&params)) { fprintf(stderr, "%s: Parameter check failed\n", params.cmdname); @@ -159,7 +157,7 @@ int main(int argc, char **argv) exit(EXIT_FAILURE); } - if ((uint32_t)sbuf.st_size < tparams->header_size) { + if (tparams && (uint32_t)sbuf.st_size < tparams->header_size) { fprintf(stderr, "%s: Bad size: \"%s\" is not valid image\n", params.cmdname, params.imagefile); exit(EXIT_FAILURE); @@ -203,8 +201,9 @@ int main(int argc, char **argv) static void usage(void) { - fprintf(stderr, "Usage: %s -l image\n" - " -l ==> list image header information\n", + fprintf(stderr, "Usage: %s [-T type] -l image\n" + " -l ==> list image header information\n" + " -T ==> parse image file as 'type'\n", params.cmdname); fprintf(stderr, " %s [-T type] [-p position] [-o outfile] image\n" diff --git a/tools/imagetool.c b/tools/imagetool.c index ba1f64aa377a..5ad6d7413fec 100644 --- a/tools/imagetool.c +++ b/tools/imagetool.c @@ -26,6 +26,12 @@ struct image_type_params *imagetool_get_type(int type) return NULL; } +static int imagetool_verify_print_header_by_type( + void *ptr, + struct stat *sbuf, + struct image_type_params *tparams, + struct image_tool_params *params); + int imagetool_verify_print_header( void *ptr, struct stat *sbuf, @@ -39,6 +45,9 @@ int imagetool_verify_print_header( struct image_type_params **start = __start_image_type; struct image_type_params **end = __stop_image_type; + if (tparams) + return imagetool_verify_print_header_by_type(ptr, sbuf, tparams, params); + for (curr = start; curr != end; curr++) { if ((*curr)->verify_header) { retval = (*curr)->verify_header((unsigned char *)ptr, @@ -65,7 +74,7 @@ int imagetool_verify_print_header( return retval; } -int imagetool_verify_print_header_by_type( +static int imagetool_verify_print_header_by_type( void *ptr, struct stat *sbuf, struct image_type_params *tparams, diff --git a/tools/imagetool.h b/tools/imagetool.h index c3f80fc64e84..5169b0245dad 100644 --- a/tools/imagetool.h +++ b/tools/imagetool.h @@ -178,33 +178,19 @@ struct image_type_params *imagetool_get_type(int type); /* * imagetool_verify_print_header() - verifies the image header * - * Scan registered image types and verify the image_header for each - * supported image type. If verification is successful, this prints - * the respective header. - * - * Return: 0 on success, negative if input image format does not match with - * any of supported image types - */ -int imagetool_verify_print_header( - void *ptr, - struct stat *sbuf, - struct image_type_params *tparams, - struct image_tool_params *params); - -/* - * imagetool_verify_print_header_by_type() - verifies the image header - * * Verify the image_header for the image type given by tparams. + * If tparams is NULL then scan registered image types and verify the + * image_header for each supported image type. * If verification is successful, this prints the respective header. * @ptr: pointer the the image header * @sbuf: stat information about the file pointed to by ptr - * @tparams: image type parameters + * @tparams: image type parameters or NULL * @params: mkimage parameters * * Return: 0 on success, negative if input image format does not match with * the given image type */ -int imagetool_verify_print_header_by_type( +int imagetool_verify_print_header( void *ptr, struct stat *sbuf, struct image_type_params *tparams, diff --git a/tools/mkimage.c b/tools/mkimage.c index f8a9899a51f6..d24b3bc002bf 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -82,8 +82,9 @@ static int show_valid_options(enum ih_category category) static void usage(const char *msg) { fprintf(stderr, "Error: %s\n", msg); - fprintf(stderr, "Usage: %s -l image\n" - " -l ==> list image header information\n", + fprintf(stderr, "Usage: %s [-T type] -l image\n" + " -l ==> list image header information\n" + " -T ==> parse image file as 'type'\n", params.cmdname); fprintf(stderr, " %s [-x] -A arch -O os -T type -C comp -a addr -e ep -n name -d data_file[:data_file...] image\n" @@ -329,7 +330,7 @@ static void process_args(int argc, char **argv) params.datafile = datafile; else if (!params.datafile) usage("Missing data file for auto-FIT (use -d)"); - } else if (type != IH_TYPE_INVALID) { + } else if (params.lflag || type != IH_TYPE_INVALID) { if (type == IH_TYPE_SCRIPT && !params.datafile) usage("Missing data file for script (use -d)"); params.type = type; @@ -396,7 +397,7 @@ int main(int argc, char **argv) /* set tparams as per input type_id */ tparams = imagetool_get_type(params.type); - if (tparams == NULL) { + if (tparams == NULL && !params.lflag) { fprintf (stderr, "%s: unsupported type %s\n", params.cmdname, genimg_get_type_name(params.type)); exit (EXIT_FAILURE); @@ -406,14 +407,14 @@ int main(int argc, char **argv) * check the passed arguments parameters meets the requirements * as per image type to be generated/listed */ - if (tparams->check_params) + if (tparams && tparams->check_params) if (tparams->check_params (&params)) usage("Bad parameters for image type"); if (!params.eflag) { params.ep = params.addr; /* If XIP, entry point must be after the U-Boot header */ - if (params.xflag) + if (params.xflag && tparams) params.ep += tparams->header_size; } @@ -474,7 +475,7 @@ int main(int argc, char **argv) params.cmdname, params.imagefile); exit (EXIT_FAILURE); #endif - } else if (sbuf.st_size < (off_t)tparams->header_size) { + } else if (tparams && sbuf.st_size < (off_t)tparams->header_size) { fprintf (stderr, "%s: Bad size: \"%s\" is not valid image: size %llu < %u\n", params.cmdname, params.imagefile, @@ -493,21 +494,12 @@ int main(int argc, char **argv) exit (EXIT_FAILURE); } - if (params.fflag) { - /* - * Verifies the header format based on the expected header for image - * type in tparams - */ - retval = imagetool_verify_print_header_by_type(ptr, &sbuf, - tparams, &params); - } else { - /** - * When listing the image, we are not given the image type. Simply check all - * image types to find one that matches our header - */ - retval = imagetool_verify_print_header(ptr, &sbuf, - tparams, &params); - } + /* + * Verifies the header format based on the expected header for image + * type in tparams. If tparams is NULL simply check all image types + * to find one that matches our header. + */ + retval = imagetool_verify_print_header(ptr, &sbuf, tparams, &params); (void) munmap((void *)ptr, sbuf.st_size); (void) close (ifd); -- 2.20.1

3 2