March 2022 - U-Boot

[PATCH v2 1/1] doc: describe generation of SMBIOS table
by Heinrich Schuchardt 02 Mar '22

02 Mar '22

SMBIOS is not x86 specific. So we should have an architecture independent page describing it. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- v2: Add missing file doc/develop/smbios.rst --- doc/arch/x86.rst | 2 +- doc/develop/index.rst | 1 + doc/develop/smbios.rst | 22 ++++++++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 doc/develop/smbios.rst diff --git a/doc/arch/x86.rst b/doc/arch/x86.rst index 5494155a51..634387ac09 100644 --- a/doc/arch/x86.rst +++ b/doc/arch/x86.rst @@ -732,7 +732,7 @@ SMBIOS tables To generate SMBIOS tables in U-Boot, for use by the OS, enable the CONFIG_GENERATE_SMBIOS_TABLE option. The easiest way to provide the values to use is via the device tree. For details see -device-tree-bindings/sysinfo/smbios.txt +:download:`smbios.txt <../device-tree-bindings/sysinfo/smbios.txt>`. TODO List --------- diff --git a/doc/develop/index.rst b/doc/develop/index.rst index 97148875ef..93ebfa485f 100644 --- a/doc/develop/index.rst +++ b/doc/develop/index.rst @@ -22,6 +22,7 @@ Implementation makefiles menus printf + smbios uefi/index version diff --git a/doc/develop/smbios.rst b/doc/develop/smbios.rst new file mode 100644 index 0000000000..a4efb0a0a3 --- /dev/null +++ b/doc/develop/smbios.rst @@ -0,0 +1,22 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +SMBIOS tables +============= + +The System Management BIOS (SMBIOS) table is used to deliver management +information from the firmware to the operating system. The content is +standardized in [1]_. + +In Linux you can use the dmidecode command to view the contents of the SMBIOS +table. + +When booting via UEFI the SMBIOS table is transferred as an UEFI configuration +table to the operating system. + +To generate SMBIOS tables in U-Boot, the CONFIG_GENERATE_SMBIOS_TABLE option +must be enabled. The easiest way to provide the values to use is via the device +tree. For details see +:download:`smbios.txt <../device-tree-bindings/sysinfo/smbios.txt>`. + +.. [1] `System Management BIOS (SMBIOS) Reference, version 3.5 + <https://www.dmtf.org/content/dmtf-releases-smbios-35>`_ -- 2.34.1

2 1

gpio_request_by_name for GPIOD_IS_OUT drives GPIO before specifically instructed to
by Tim Harvey 01 Mar '22

01 Mar '22

Greetings, I'm seeing an issue in U-Boot caused by gpio_request_by_name driving a GPIO output before it has been given an output level with {dm_}gpio_set_value. In my particular instance I have a network PHY that can encounter errata if it gets reset more than once (fun time with this one!) declared liks this: &ethphy0 { reset-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>; reset-assert-us = <1000>; reset-deassert-us = <300000>; }; Through testing it has been found that this PHY must be held in reset on power-up and released from reset only once. This is probably the third time I've run into such an issue in the 20 years I've worked with hardware - it's rare and certainly a result of poor reset handling in IC's but not a unique situation (especially at a time where we can't be too choosy about what parts go on boards). When eth-phy-uclass.c calls gpio_request_by_name(dev, "reset-gpios", 0, &uc_priv->reset_gpio, GPIOD_IS_OUT) direction_output is called which sets the GPIO to a high effectively taking the PHY out of reset before eth_phy_reset is called to do so. Setting the gpio as GPIO_ACTIVE_LOW will drive it low keeping it in reset until ready to de-assert it but then the polarity is inverted which results in the PHY being left in reset permanently. This affects a wide variety of gpio based things including gpio-hogs. I'm looking for some input on how to best address this issue. I haven't finished walking through all the kernel code but I believe when a gpio is requested it does so without configuring that gpio. Any ideas? Best regards, Tim

2 4

[PATCH] phy: nop-phy: Fix phy reset if no reset-gpio defined
by Tim Harvey 01 Mar '22

01 Mar '22

Ensure there is a valid reset-gpio defined before using it. Fixes: f9852acdce02 ("phy: nop-phy: Fix enabling reset") Cc: Adam Ford <aford173(a)gmail.com> Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- drivers/phy/nop-phy.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/phy/nop-phy.c b/drivers/phy/nop-phy.c index e2ee6e92068e..d0904f4f075b 100644 --- a/drivers/phy/nop-phy.c +++ b/drivers/phy/nop-phy.c @@ -45,11 +45,13 @@ static int nop_phy_init(struct phy *phy) #if CONFIG_IS_ENABLED(DM_GPIO) /* Take phy out of reset */ - ret = dm_gpio_set_value(&priv->reset_gpio, false); - if (ret) { - if (CONFIG_IS_ENABLED(CLK)) - clk_disable_bulk(&priv->bulk); - return ret; + if (dm_gpio_is_valid(&priv->reset_gpio)) { + ret = dm_gpio_set_value(&priv->reset_gpio, false); + if (ret) { + if (CONFIG_IS_ENABLED(CLK)) + clk_disable_bulk(&priv->bulk); + return ret; + } } #endif return 0; -- 2.17.1

2 2

[PATCH] spi: Add spi_get_bus_and_cs() new use_dt param
by Patrice Chotard 01 Mar '22

01 Mar '22

Add spi_flash_probe_bus_cs() and spi_get_bus_and_cs() new "use_dt" param which allows to select SPI speed and mode from DT or from default value passed in parameters. Since commit e2e95e5e2542 ("spi: Update speed/mode on change") when calling "sf probe" or "env save" on SPI flash, spi_set_speed_mode() is called twice. spi_get_bus_and_cs() |--> spi_claim_bus() | |--> spi_set_speed_mode(speed and mode from DT) ... |--> spi_set_speed_mode(default speed and mode value) The first spi_set_speed_mode() call is done with speed and mode values from DT, whereas the second call is done with speed and mode set to default value (speed is set to CONFIG_SF_DEFAULT_SPEED) This is an issue because SPI flash performance are impacted by using default speed which can be lower than the one defined in DT. One solution is to set CONFIG_SF_DEFAULT_SPEED to the speed defined in DT, but we loose flexibility offered by DT. Another issue can be encountered with 2 SPI flashes using 2 different speeds. In this specific case usage of CONFIG_SF_DEFAULT_SPEED is not flexible compared to get the 2 different speeds from DT. By adding new parameter "use_dt" to spi_flash_probe_bus_cs() and to spi_get_bus_and_cs(), this allows to force usage of either speed and mode from DT (use_dt = true) or to use speed and mode parameter value. Signed-off-by: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Marek Behun <marek.behun(a)nic.cz> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Vignesh R <vigneshr(a)ti.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> Cc: Lukasz Majewski <lukma(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefan Roese <sr(a)denx.de> Cc: "Pali Rohár" <pali(a)kernel.org> Cc: Konstantin Porotchkin <kostap(a)marvell.com> Cc: Igal Liberman <igall(a)marvell.com> Cc: Bin Meng <bmeng.cn(a)gmail.com> Cc: Pratyush Yadav <p.yadav(a)ti.com> Cc: Sean Anderson <seanga2(a)gmail.com> Cc: Anji J <anji.jagarlmudi(a)nxp.com> Cc: Biwen Li <biwen.li(a)nxp.com> Cc: Priyanka Jain <priyanka.jain(a)nxp.com> Cc: Chaitanya Sakinam <chaitanya.sakinam(a)nxp.com> --- board/CZ.NIC/turris_mox/turris_mox.c | 2 +- cmd/sf.c | 5 ++++- cmd/spi.c | 2 +- drivers/mtd/spi/sf-uclass.c | 8 ++++---- drivers/net/fm/fm.c | 5 +++-- drivers/net/pfe_eth/pfe_firmware.c | 2 +- drivers/net/sni_netsec.c | 3 ++- drivers/spi/spi-uclass.c | 8 ++++---- drivers/usb/gadget/max3420_udc.c | 2 +- env/sf.c | 2 +- include/spi.h | 9 +++++---- include/spi_flash.h | 2 +- test/dm/spi.c | 15 ++++++++------- 13 files changed, 36 insertions(+), 29 deletions(-) diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c index 2202eb8cfb..363edc115f 100644 --- a/board/CZ.NIC/turris_mox/turris_mox.c +++ b/board/CZ.NIC/turris_mox/turris_mox.c @@ -135,7 +135,7 @@ static int mox_do_spi(u8 *in, u8 *out, size_t size) struct udevice *dev; int ret; - ret = spi_get_bus_and_cs(0, 1, 1000000, SPI_CPHA | SPI_CPOL, + ret = spi_get_bus_and_cs(0, 1, 1000000, SPI_CPHA | SPI_CPOL, false, "spi_generic_drv", "moxtet@1", &dev, &slave); if (ret) diff --git a/cmd/sf.c b/cmd/sf.c index eac27ed2d7..0c1ddbbab7 100644 --- a/cmd/sf.c +++ b/cmd/sf.c @@ -91,6 +91,7 @@ static int do_spi_flash_probe(int argc, char *const argv[]) unsigned int speed = CONFIG_SF_DEFAULT_SPEED; unsigned int mode = CONFIG_SF_DEFAULT_MODE; char *endp; + bool use_dt = true; #if CONFIG_IS_ENABLED(DM_SPI_FLASH) struct udevice *new, *bus_dev; int ret; @@ -117,11 +118,13 @@ static int do_spi_flash_probe(int argc, char *const argv[]) speed = simple_strtoul(argv[2], &endp, 0); if (*argv[2] == 0 || *endp != 0) return -1; + use_dt = false; } if (argc >= 4) { mode = hextoul(argv[3], &endp); if (*argv[3] == 0 || *endp != 0) return -1; + use_dt = false; } #if CONFIG_IS_ENABLED(DM_SPI_FLASH) @@ -131,7 +134,7 @@ static int do_spi_flash_probe(int argc, char *const argv[]) device_remove(new, DM_REMOVE_NORMAL); } flash = NULL; - ret = spi_flash_probe_bus_cs(bus, cs, speed, mode, &new); + ret = spi_flash_probe_bus_cs(bus, cs, speed, mode, use_dt, &new); if (ret) { printf("Failed to initialize SPI flash at %u:%u (error %d)\n", bus, cs, ret); diff --git a/cmd/spi.c b/cmd/spi.c index 6dc32678da..46bd817e60 100644 --- a/cmd/spi.c +++ b/cmd/spi.c @@ -46,7 +46,7 @@ static int do_spi_xfer(int bus, int cs) str = strdup(name); if (!str) return -ENOMEM; - ret = spi_get_bus_and_cs(bus, cs, freq, mode, "spi_generic_drv", + ret = spi_get_bus_and_cs(bus, cs, freq, mode, false, "spi_generic_drv", str, &dev, &slave); if (ret) return ret; diff --git a/drivers/mtd/spi/sf-uclass.c b/drivers/mtd/spi/sf-uclass.c index 63d16291ff..ef3e3bb9de 100644 --- a/drivers/mtd/spi/sf-uclass.c +++ b/drivers/mtd/spi/sf-uclass.c @@ -51,7 +51,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, { struct udevice *dev; - if (spi_flash_probe_bus_cs(bus, cs, max_hz, spi_mode, &dev)) + if (spi_flash_probe_bus_cs(bus, cs, max_hz, spi_mode, false, &dev)) return NULL; return dev_get_uclass_priv(dev); @@ -59,7 +59,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, - struct udevice **devp) + bool use_dt, struct udevice **devp) { struct spi_slave *slave; struct udevice *bus; @@ -74,8 +74,8 @@ int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, snprintf(name, sizeof(name), "spi_flash@%d:%d", busnum, cs); str = strdup(name); #endif - ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode, - "jedec_spi_nor", str, &bus, &slave); + ret = spi_get_bus_and_cs(busnum, cs, max_hz, spi_mode, use_dt, + "jedec_spi_nor", str, &bus, &slave); if (ret) return ret; diff --git a/drivers/net/fm/fm.c b/drivers/net/fm/fm.c index 7d51be1f72..c56afc6a47 100644 --- a/drivers/net/fm/fm.c +++ b/drivers/net/fm/fm.c @@ -388,7 +388,8 @@ int fm_init_common(int index, struct ccsr_fman *reg) /* speed and mode will be read from DT */ ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, - CONFIG_ENV_SPI_CS, 0, 0, &new); + CONFIG_ENV_SPI_CS, 0, 0, true, + &new); ucode_flash = dev_get_uclass_priv(new); #else @@ -475,7 +476,7 @@ int fm_init_common(int index, struct ccsr_fman *reg) /* speed and mode will be read from DT */ ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, - 0, 0, &new); + 0, 0, true, &new); ucode_flash = dev_get_uclass_priv(new); #else diff --git a/drivers/net/pfe_eth/pfe_firmware.c b/drivers/net/pfe_eth/pfe_firmware.c index ad5bc3c862..d30991571c 100644 --- a/drivers/net/pfe_eth/pfe_firmware.c +++ b/drivers/net/pfe_eth/pfe_firmware.c @@ -183,7 +183,7 @@ int pfe_spi_flash_init(void) CONFIG_ENV_SPI_CS, CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE, - &new); + true, &new); if (ret) { printf("SF: failed to probe spi\n"); free(addr); diff --git a/drivers/net/sni_netsec.c b/drivers/net/sni_netsec.c index 4901321d0c..6d00a3fd3a 100644 --- a/drivers/net/sni_netsec.c +++ b/drivers/net/sni_netsec.c @@ -625,7 +625,8 @@ static void netsec_spi_read(char *buf, loff_t len, loff_t offset) struct spi_flash *flash; spi_flash_probe_bus_cs(CONFIG_SF_DEFAULT_BUS, CONFIG_SF_DEFAULT_CS, - CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE, &new); + CONFIG_SF_DEFAULT_SPEED, CONFIG_SF_DEFAULT_MODE, + true, &new); flash = dev_get_uclass_priv(new); spi_flash_read(flash, offset, len, buf); diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index f8ec312d71..4366124e3c 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -340,7 +340,7 @@ int spi_find_bus_and_cs(int busnum, int cs, struct udevice **busp, return ret; } -int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, +int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, bool use_dt, const char *drv_name, const char *dev_name, struct udevice **busp, struct spi_slave **devp) { @@ -419,8 +419,8 @@ int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, } /* In case bus frequency or mode changed, update it. */ - if ((speed && bus_data->speed && bus_data->speed != speed) || - (plat && plat->mode != mode)) { + if (((speed && bus_data->speed && bus_data->speed != speed) || + (plat && plat->mode != mode)) && !use_dt) { ret = spi_set_speed_mode(bus, speed, mode); if (ret) goto err_speed_mode; @@ -453,7 +453,7 @@ struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs, struct udevice *dev; int ret; - ret = spi_get_bus_and_cs(busnum, cs, speed, mode, NULL, 0, &dev, + ret = spi_get_bus_and_cs(busnum, cs, speed, mode, false, NULL, 0, &dev, &slave); if (ret) return NULL; diff --git a/drivers/usb/gadget/max3420_udc.c b/drivers/usb/gadget/max3420_udc.c index a16095f892..ccec337f99 100644 --- a/drivers/usb/gadget/max3420_udc.c +++ b/drivers/usb/gadget/max3420_udc.c @@ -830,7 +830,7 @@ static int max3420_udc_probe(struct udevice *dev) cs = slave_pdata->cs; speed = slave_pdata->max_hz; mode = slave_pdata->mode; - spi_get_bus_and_cs(busnum, cs, speed, mode, "spi_generic_drv", + spi_get_bus_and_cs(busnum, cs, speed, mode, false, "spi_generic_drv", NULL, &spid, &udc->slave); udc->dev = dev; diff --git a/env/sf.c b/env/sf.c index 6a4bb756f0..ed6bfb2115 100644 --- a/env/sf.c +++ b/env/sf.c @@ -53,7 +53,7 @@ static int setup_flash_device(struct spi_flash **env_flash) /* speed and mode will be read from DT */ ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE, - &new); + true, &new); if (ret) { env_set_default("spi_flash_probe_bus_cs() failed", 0); return ret; diff --git a/include/spi.h b/include/spi.h index dc3b21132a..5d12f27b19 100644 --- a/include/spi.h +++ b/include/spi.h @@ -582,15 +582,16 @@ int spi_find_bus_and_cs(int busnum, int cs, struct udevice **busp, * @cs: Chip select to look for * @speed: SPI speed to use for this slave when not available in plat * @mode: SPI mode to use for this slave when not available in plat + * @use_dt: Force usage of SPI speed and SPI mode from DT * @drv_name: Name of driver to attach to this chip select * @dev_name: Name of the new device thus created * @busp: Returns bus device * @devp: Return slave device - * @return 0 if found, -ve on error + * @return 0 if found, -ve on error */ -int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, - const char *drv_name, const char *dev_name, - struct udevice **busp, struct spi_slave **devp); +int spi_get_bus_and_cs(int busnum, int cs, int speed, int mode, bool use_dt, + const char *drv_name, const char *dev_name, + struct udevice **busp, struct spi_slave **devp); /** * spi_chip_select() - Get the chip select for a slave diff --git a/include/spi_flash.h b/include/spi_flash.h index 4d4ae89c19..07bca1ee3b 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -117,7 +117,7 @@ int spi_flash_std_probe(struct udevice *dev); int spi_flash_probe_bus_cs(unsigned int busnum, unsigned int cs, unsigned int max_hz, unsigned int spi_mode, - struct udevice **devp); + bool use_dt, struct udevice **devp); /* Compatibility function - this is the old U-Boot API */ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs, diff --git a/test/dm/spi.c b/test/dm/spi.c index ee4ad3abaa..2b1f5535c6 100644 --- a/test/dm/spi.c +++ b/test/dm/spi.c @@ -47,7 +47,7 @@ static int dm_test_spi_find(struct unit_test_state *uts) /* This finds nothing because we removed the device */ ut_asserteq(-ENODEV, spi_find_bus_and_cs(busnum, cs, &bus, &dev)); ut_asserteq(-ENODEV, spi_get_bus_and_cs(busnum, cs, speed, mode, - NULL, 0, &bus, &slave)); + false, NULL, 0, &bus, &slave)); /* * This forces the device to be re-added, but there is no emulation @@ -56,7 +56,7 @@ static int dm_test_spi_find(struct unit_test_state *uts) * a 'partially-inited' device. */ ut_asserteq(-ENODEV, spi_find_bus_and_cs(busnum, cs, &bus, &dev)); - ut_asserteq(-ENOENT, spi_get_bus_and_cs(busnum, cs, speed, mode, + ut_asserteq(-ENOENT, spi_get_bus_and_cs(busnum, cs, speed, mode, false, "jedec_spi_nor", "name", &bus, &slave)); sandbox_sf_unbind_emul(state_get_current(), busnum, cs); @@ -67,7 +67,7 @@ static int dm_test_spi_find(struct unit_test_state *uts) ut_assertok(sandbox_sf_bind_emul(state, busnum, cs, bus, node, "name")); ut_assertok(spi_find_bus_and_cs(busnum, cs, &bus, &dev)); - ut_assertok(spi_get_bus_and_cs(busnum, cs, speed, mode, + ut_assertok(spi_get_bus_and_cs(busnum, cs, speed, mode, false, "jedec_spi_nor", "name", &bus, &slave)); ut_assertok(spi_cs_info(bus, cs, &info)); @@ -77,7 +77,8 @@ static int dm_test_spi_find(struct unit_test_state *uts) ut_assertok(sandbox_sf_bind_emul(state, busnum, cs_b, bus, node, "name")); ut_asserteq(-EINVAL, spi_get_bus_and_cs(busnum, cs_b, speed, mode, - "jedec_spi_nor", "name", &bus, &slave)); + false, "jedec_spi_nor", "name", + &bus, &slave)); ut_asserteq(-EINVAL, spi_cs_info(bus, cs_b, &info)); ut_asserteq_ptr(NULL, info.dev); @@ -145,10 +146,10 @@ static int dm_test_spi_claim_bus(struct unit_test_state *uts) const int busnum = 0, cs_a = 0, cs_b = 1, mode = 0; /* Get spi slave on CS0 */ - ut_assertok(spi_get_bus_and_cs(busnum, cs_a, 1000000, mode, NULL, 0, + ut_assertok(spi_get_bus_and_cs(busnum, cs_a, 1000000, mode, false, NULL, 0, &bus, &slave_a)); /* Get spi slave on CS1 */ - ut_assertok(spi_get_bus_and_cs(busnum, cs_b, 1000000, mode, NULL, 0, + ut_assertok(spi_get_bus_and_cs(busnum, cs_b, 1000000, mode, false, NULL, 0, &bus, &slave_b)); /* Different max_hz, different mode. */ @@ -182,7 +183,7 @@ static int dm_test_spi_xfer(struct unit_test_state *uts) const char dout[5] = {0x9f}; unsigned char din[5]; - ut_assertok(spi_get_bus_and_cs(busnum, cs, 1000000, mode, NULL, 0, + ut_assertok(spi_get_bus_and_cs(busnum, cs, 1000000, mode, false, NULL, 0, &bus, &slave)); ut_assertok(spi_claim_bus(slave)); ut_assertok(spi_xfer(slave, 40, dout, din, -- 2.17.1

3 5

[PATCH v3] binman: Include also subnodes in generator nodes
by Jan Kiszka 01 Mar '22

01 Mar '22

From: Jan Kiszka <jan.kiszka(a)siemens.com> This allows to prefill fdt and config nodes with hash and signature subnodes. It's just important to place the child nodes last so that hashes do not come before the data - would be disliked by mkimage. Signed-off-by: Jan Kiszka <jan.kiszka(a)siemens.com> --- Rebased over "binman: rockchip: Migrate from rockchip SPL_FIT_GENERATOR script" tools/binman/etype/fit.py | 4 ++++ tools/binman/ftest.py | 1 + tools/binman/test/170_fit_fdt.dts | 3 +++ 3 files changed, 8 insertions(+) diff --git a/tools/binman/etype/fit.py b/tools/binman/etype/fit.py index 63d552ed192..a31498d5847 100644 --- a/tools/binman/etype/fit.py +++ b/tools/binman/etype/fit.py @@ -532,6 +532,10 @@ class Entry_fit(Entry_section): # Add data for 'images' nodes (but not 'config') if depth == 1 and in_images: fsw.property('data', tools.read_file(fname)) + + for subnode in node.subnodes: + with fsw.add_node(subnode.name): + _add_node(node, depth + 1, subnode) else: if self._fdts is None: if self._fit_list_prop: diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index ec8e3d4d91b..d296bf1a137 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -4037,6 +4037,7 @@ class TestFunctional(unittest.TestCase): self.assertEqual(expected_data, fnode.props['data'].bytes) self.assertEqual('fdt-test-fdt%d.dtb' % seq, fnode.props['description'].value) + self.assertEqual(fnode.subnodes[0].name, 'hash') def _CheckConfig(seq, expected_data): """Check the configuration nodes diff --git a/tools/binman/test/170_fit_fdt.dts b/tools/binman/test/170_fit_fdt.dts index 99d710c57e9..0197ffd1597 100644 --- a/tools/binman/test/170_fit_fdt.dts +++ b/tools/binman/test/170_fit_fdt.dts @@ -36,6 +36,9 @@ description = "fdt-NAME.dtb"; type = "flat_dt"; compression = "none"; + hash { + algo = "sha256"; + }; }; }; -- 2.34.1

2 1

[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] drivers: adc: fix return value if timeout occurs
by Francois Berder 01 Mar '22

01 Mar '22

Because unsigned integers cannot be negative, timeout variable is never less than zero. Hence, checks in Amlogic Meson ADC driver to detect timeouts always evaluated to false. Fix that. Signed-off-by: Francois Berder <fberder(a)outlook.fr> --- drivers/adc/meson-saradc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c index 1a45a3a265..a48200a769 100644 --- a/drivers/adc/meson-saradc.c +++ b/drivers/adc/meson-saradc.c @@ -192,7 +192,8 @@ meson_saradc_get_fifo_count(struct meson_saradc_priv *priv) static int meson_saradc_lock(struct meson_saradc_priv *priv) { - uint val, timeout = 10000; + uint val; + int timeout = 10000; /* prevent BL30 from using the SAR ADC while we are using it */ regmap_update_bits(priv->regmap, MESON_SAR_ADC_DELAY, @@ -246,7 +247,8 @@ static int meson_saradc_calib_val(struct meson_saradc_priv *priv, int val) static int meson_saradc_wait_busy_clear(struct meson_saradc_priv *priv) { - uint regval, timeout = 10000; + uint regval; + int timeout = 10000; /* * NOTE: we need a small delay before reading the status, otherwise -- 2.30.1 (Apple Git-130)

3 2

[PATCH] sunxi: f1c100s: Fix FEL registers restore
by Andre Przywara 01 Mar '22

01 Mar '22

Commit 88998f777531 ("arm: arm926ej-s: Add sunxi code") introduced the ARM926 version of the code to save and restore some FEL state, to be able to return to the BROM FEL code after the SPL has run. However during review a change was made, that happened to mess up the register restore part, so SCTLR and CPSR ended up with the wrong values, breaking return to FEL. Use the same offset that we actually save those registers to, to make FEL booting actually work on the Lichee Pi Nano. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- arch/arm/cpu/arm926ejs/sunxi/fel_utils.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/sunxi/fel_utils.S b/arch/arm/cpu/arm926ejs/sunxi/fel_utils.S index 08be7ed11a..25924033c6 100644 --- a/arch/arm/cpu/arm926ejs/sunxi/fel_utils.S +++ b/arch/arm/cpu/arm926ejs/sunxi/fel_utils.S @@ -25,9 +25,9 @@ ENTRY(return_to_fel) mov sp, r0 mov lr, r1 ldr r0, =fel_stash - ldr r1, [r0, #16] - mcr p15, 0, r1, c1, c0, 0 @ Write CP15 Control Register ldr r1, [r0, #12] + mcr p15, 0, r1, c1, c0, 0 @ Write CP15 SCTLR register + ldr r1, [r0, #8] msr cpsr, r1 @ Write CPSR bx lr ENDPROC(return_to_fel) -- 2.25.1

1 0

[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

回复: [PATCH V8] arm: add initial support for the Phytium Pomelo Board
by Nicholas zheng 01 Mar '22

01 Mar '22

First of all, thank you very much for your suggestions and help. With regard to the description of the CPU node of the current patch device tree, I hope "phytium, ftc663" will be added to uboot after Linux goes online. Thank! ________________________________ 发件人: Rob Herring <robh+dt(a)kernel.org> 发送时间: 2022年2月28日 23:21 收件人: Nicholas zheng <Nicholas_zheng(a)outlook.com> 主题: Re: [PATCH V8] arm: add initial support for the Phytium Pomelo Board Please reply on list instead of sending private emails. On Sun, Feb 27, 2022 at 8:50 PM Nicholas zheng <Nicholas_zheng(a)outlook.com> wrote: > > I'm very sorry. Maybe my meaning is not clear. Phytium is already submitting "phytium, ftc663" to the Linux kernel, but the process will be slower. Therefore, I would like to ask whether the current DT can not describe the CPUs node first? No, cpu nodes are required. It's a one line change to document the cpu compatible. But it's ultimately up to the u-boot maintainers, not me, on what they will take or not. And it's up to you if you want to have to go back and fix the u-boot copy once the Linux version is upstream. The goal is that u-boot has unmodified dts files sync'ed from the kernel tree. Rob

1 0