April 2023 - U-Boot

[PATCH] mmc: dw_mmc: reset controller after data error
by Eugen Hristev 02 Apr '23

02 Apr '23

From: Ziyuan Xu <xzy.xu(a)rock-chips.com> Per dw_mmc databook, it's recommended to reset the host controller if some data-related error occurred. Implement a reset mechanism. Signed-off-by: Ziyuan Xu <xzy.xu(a)rock-chips.com> Co-developed-by: Jason Zhu <jason.zhu(a)rock-chips.com> Signed-off-by: Jason Zhu <jason.zhu(a)rock-chips.com> [eugen.hristev(a)collabora.com: modified a bit the variables initialization] Signed-off-by: Eugen Hristev <eugen.hristev(a)collabora.com> --- drivers/mmc/dw_mmc.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index 5085a3b491da..7c302ee614f4 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -138,7 +138,7 @@ static int dwmci_data_transfer(struct dwmci_host *host, struct mmc_data *data) { struct mmc *mmc = host->mmc; int ret = 0; - u32 timeout, mask, size, i, len = 0; + u32 timeout, reset_timeout = 100, status, ctrl, mask, size, i, len = 0; u32 *buf = NULL; ulong start = get_timer(0); u32 fifo_depth = (((host->fifoth_val & RX_WMARK_MASK) >> @@ -159,6 +159,24 @@ static int dwmci_data_transfer(struct dwmci_host *host, struct mmc_data *data) /* Error during data transfer. */ if (mask & (DWMCI_DATA_ERR | DWMCI_DATA_TOUT)) { debug("%s: DATA ERROR!\n", __func__); + + dwmci_wait_reset(host, DWMCI_RESET_ALL); + dwmci_writel(host, DWMCI_CMD, DWMCI_CMD_PRV_DAT_WAIT | + DWMCI_CMD_UPD_CLK | DWMCI_CMD_START); + + do { + status = dwmci_readl(host, DWMCI_CMD); + if (!reset_timeout) + break; + udelay(100); + } while (status & DWMCI_CMD_START); + + if (!host->fifo_mode) { + ctrl = dwmci_readl(host, DWMCI_BMOD); + ctrl |= DWMCI_BMOD_IDMAC_RESET; + dwmci_writel(host, DWMCI_BMOD, ctrl); + } + ret = -EINVAL; break; } -- 2.34.1

3 2

[PATCH] net: ravb: Support fixed PHY in R-Car
by Marek Vasut 02 Apr '23

02 Apr '23

From: Mikhail Lappo <mikhail.lappo(a)esrlabs.com> Calling old U-Boot API doesn't allow to use fixed PHY. Searching by mask is the part of new function, after scanning FDT for a fixed PHY definition Fixes: e821a7bdb13 ("net: ravb: Detect PHY correctly") Reviewed-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> Signed-off-by: Mikhail Lappo <mikhail.lappo(a)esrlabs.com> Signed-off-by: Hai Pham <hai.pham.ud(a)renesas.com> [Hai Pham: Drop phy_connect_dev since it's called in phy_connect] Signed-off-by: Marek Vasut <marek.vasut+renesas(a)mailbox.org> [Marek: Use mask -1 instead of 0 to reinstate the search behavior over all PHY addresses. Add Fixes tag, sort the tag list.] --- Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Ramon Fried <rfried.dev(a)gmail.com> --- drivers/net/ravb.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/ravb.c b/drivers/net/ravb.c index 5a835cc06ff..0bc50dc7335 100644 --- a/drivers/net/ravb.c +++ b/drivers/net/ravb.c @@ -310,7 +310,7 @@ static int ravb_phy_config(struct udevice *dev) struct ravb_priv *eth = dev_get_priv(dev); struct eth_pdata *pdata = dev_get_plat(dev); struct phy_device *phydev; - int mask = 0xffffffff, reg; + int reg; if (dm_gpio_is_valid(&eth->reset_gpio)) { dm_gpio_set_value(&eth->reset_gpio, 1); @@ -319,12 +319,10 @@ static int ravb_phy_config(struct udevice *dev) mdelay(1); } - phydev = phy_find_by_mask(eth->bus, mask); + phydev = phy_connect(eth->bus, -1, dev, pdata->phy_interface); if (!phydev) return -ENODEV; - phy_connect_dev(phydev, dev, pdata->phy_interface); - eth->phydev = phydev; phydev->supported &= SUPPORTED_100baseT_Full | -- 2.39.2

2 1

[PATCH v2 0/5] Add ethernet driver for StarFive JH7110 SoC
by Yanhong Wang 02 Apr '23

02 Apr '23

This series adds ethernet support for the StarFive JH7110 RISC-V SoC. The series includes PHY and MAC drivers. The PHY model is YT8531 (from Motorcomm Inc), and the MAC version is dwmac-5.20 (from Synopsys DesignWare). The implementation of the phy driver is ported from linux, but it has been adjusted for the u-boot framework. The PHY and MAC driver has been tested on the StarFive VisionFive 2 1.2A and 1.3B boards and works normally. For more information and support,you can visit RVspace wiki[1]. This patchset should be applied after the patchset [2]. [1] https://wiki.rvspace.org/ [2] https://patchwork.ozlabs.org/project/uboot/cover/20230329034224.26545-1-yan… v2: - Reworded the phy driver. Added platform private data struct to save the configuration data read from dts. - Reworded the MAC driver. Added platform private data struct to save the configuration data read from dts. Previous versions: v1 - https://patchwork.ozlabs.org/project/uboot/cover/20230317010536.17860-1-yan… Yanhong Wang (5): net: phy: Add driver for Motorcomm yt8531 gigabit ethernet phy net: dwc_eth_qos: Add StarFive ethernet driver glue layer riscv: dts: jh7110: Add ethernet device tree nodes riscv: dts: starfive: Add phy clock delay configuration for StarFive VisionFive2 board configs: starfive: Enable ethernet configuration for StarFive VisionFive 2 .../jh7110-starfive-visionfive-2-v1.2a.dts | 13 + .../jh7110-starfive-visionfive-2-v1.3b.dts | 27 ++ .../dts/jh7110-starfive-visionfive-2.dtsi | 34 ++ arch/riscv/dts/jh7110.dtsi | 69 +++ configs/starfive_visionfive2_12a_defconfig | 12 +- configs/starfive_visionfive2_13b_defconfig | 12 +- drivers/net/Kconfig | 7 + drivers/net/Makefile | 1 + drivers/net/dwc_eth_qos.c | 6 + drivers/net/dwc_eth_qos.h | 1 + drivers/net/dwc_eth_qos_starfive.c | 249 ++++++++++ drivers/net/phy/Kconfig | 6 + drivers/net/phy/Makefile | 1 + drivers/net/phy/motorcomm.c | 450 ++++++++++++++++++ drivers/net/phy/phy.c | 4 +- include/phy.h | 1 + 16 files changed, 890 insertions(+), 3 deletions(-) create mode 100644 drivers/net/dwc_eth_qos_starfive.c create mode 100644 drivers/net/phy/motorcomm.c base-commit: d7c2e87a0b8025314ae7dd62a8add292b7524e0b -- 2.17.1

4 8

[PATCH 1/1] MAINTAINERS: assign include/tpm*, cmd/tpm.c
by Heinrich Schuchardt 02 Apr '23

02 Apr '23

The files include/tpm* are an integral part of the TPM drivers. The tpm command is used to access TPM devices. Both should be managed by the TPM DRIVERS maintainer. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d2e245e5e9..4961277e4f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1478,7 +1478,9 @@ TPM DRIVERS M: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> S: Maintained T: git https://source.denx.de/u-boot/custodians/u-boot-tpm.git +F: cmd/tpm.c F: drivers/tpm/ +F: include/tpm* TQ GROUP #M: Martin Krause <martin.krause(a)tq-systems.de> -- 2.39.2

1 0

BUG: cmd/tmp.c missing fallthrough or break
by Heinrich Schuchardt 02 Apr '23

02 Apr '23

Hello Simon, please, have a look and this error: cmd/tpm_test.c:473:25: note: in expansion of macro ‘assert’ 473 | assert(i >= TPM_MAX_NV_WRITES_NOOWNER); | ^~~~~~ cmd/tpm_test.c:474:17: note: here 474 | default: | ^~~~~~~ I am not sure if you forgot a break or a fallthrough. Best regards Heinrich

2 1

[PATCH 1/1] common: avoid NULL dereference in console_devices_set
by Heinrich Schuchardt 02 Apr '23

02 Apr '23

If CONFIG_CONSOLE_MUX=y and CONFIG_SYS_CONSOLE_IS_IN_ENV=n, a NULL dereference occurs in console_devices_set(). Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- common/console.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/console.c b/common/console.c index e4301a4932..39e1ab0e24 100644 --- a/common/console.c +++ b/common/console.c @@ -243,6 +243,9 @@ int cd_count[MAX_FILES]; static void console_devices_set(int file, struct stdio_dev *dev) { + console_devices[file] = malloc(sizeof(struct stdio_dev *)); + if (!console_devices[file]) + return; console_devices[file][0] = dev; cd_count[file] = 1; } -- 2.39.2

2 1

[PATCH 1/1] cmd: consider multiplexing in coninfo
by Heinrich Schuchardt 02 Apr '23

02 Apr '23

If console multiplexing in enabled (CONFIG_CONSOLE_MUX=y), the output of the coninfo command should show the file association (stdin, stderr, stdout) for all devices not only the default ones. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/console.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmd/console.c b/cmd/console.c index 620a961cde..58c2cf1c89 100644 --- a/cmd/console.c +++ b/cmd/console.c @@ -9,6 +9,7 @@ */ #include <common.h> #include <command.h> +#include <iomux.h> #include <stdio_dev.h> extern void _do_coninfo (void); @@ -33,9 +34,15 @@ static int do_coninfo(struct cmd_tbl *cmd, int flag, int argc, (dev->flags & DEV_FLAGS_OUTPUT) ? "O" : ""); for (l = 0; l < MAX_FILES; l++) { - if (stdio_devices[l] == dev) { - printf("| |-- %s\n", stdio_names[l]); + if (CONFIG_IS_ENABLED(CONSOLE_MUX)) { + if (iomux_match_device(console_devices[l], + cd_count[l], dev) >= 0) + printf("| |-- %s\n", stdio_names[l]); + } else { + if (stdio_devices[l] == dev) + printf("| |-- %s\n", stdio_names[l]); } + } } return 0; -- 2.39.2

2 1

[PATCH 1/1] doc: coninfo man-page
by Heinrich Schuchardt 02 Apr '23

02 Apr '23

Provide a man-page for the coninfo command. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- doc/usage/cmd/coninfo.rst | 55 +++++++++++++++++++++++++++++++++++++++ doc/usage/index.rst | 1 + 2 files changed, 56 insertions(+) create mode 100644 doc/usage/cmd/coninfo.rst diff --git a/doc/usage/cmd/coninfo.rst b/doc/usage/cmd/coninfo.rst new file mode 100644 index 0000000000..f913148c44 --- /dev/null +++ b/doc/usage/cmd/coninfo.rst @@ -0,0 +1,55 @@ +.. SPDX-License-Identifier: GPL-2.0+: + +coninfo command +=============== + +Synopsis +-------- + +:: + + coninfo + +Description +----------- + +The coninfo command provides a list of available console input and output +devices and their assignment as stdin, stdout, stderr console devices. + +If CONFIG_SYS_CONSOLE_IS_IN_ENV=y, the assignment is controlled by the +environment variables stdin, stdout, stderr which contain a comma separated +list of device names. + +Example +-------- + +.. code-block:: console + + => coninfo + List of available devices + |-- pl011@9000000 (IO) + | |-- stdin + | |-- stdout + | |-- stderr + |-- serial (IO) + |-- usbkbd (I) + => setenv stdin pl011@9000000,usbkbd + => coninfo + List of available devices + |-- pl011@9000000 (IO) + | |-- stdin + | |-- stdout + | |-- stderr + |-- serial (IO) + |-- usbkbd (I) + | |-- stdin + +Configuration +------------- + +The coninfo command is only available if CONFIG_CMD_CONSOLE=y. + +Return value +------------ + +The return value $? is always 0 (true). diff --git a/doc/usage/index.rst b/doc/usage/index.rst index ebf5eea9f8..3de137590e 100644 --- a/doc/usage/index.rst +++ b/doc/usage/index.rst @@ -38,6 +38,7 @@ Shell commands cmd/cbsysinfo cmd/cls cmd/cmp + cmd/coninfo cmd/conitrace cmd/cyclic cmd/dm -- 2.39.2

2 1

[PATCH v7 01/11] bootstd: Tweak bootflow logic for device tree
by Simon Glass 02 Apr '23

02 Apr '23

We should only store the FDT filename if we were able to determine one. Adjust the logic for this. This corrects the case where no FDT is needed to boot, such as with EFI using ACPI. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- (no changes since v6) Changes in v6: - Fix 'unable' typo Changes in v5: - Add new patch to tweak bootflow logic for device tree boot/bootmeth_efi.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index 6a97ac02ff5c..d7e042cf01ee 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -235,21 +235,21 @@ static int distro_efi_read_bootflow_file(struct udevice *dev, /* try the various available names */ ret = -ENOENT; - for (seq = 0; ret; seq++) { + *fname = '\0'; + for (seq = 0; ret == -ENOENT; seq++) { ret = distro_efi_get_fdt_name(fname, sizeof(fname), seq); - if (ret == -EALREADY) { + if (ret == -EALREADY) bflow->flags = BOOTFLOWF_USE_PRIOR_FDT; - break; - } - if (ret) - return log_msg_ret("nam", ret); - ret = bootmeth_common_read_file(dev, bflow, fname, fdt_addr, - &size); + if (!ret) + ret = bootmeth_common_read_file(dev, bflow, fname, + fdt_addr, &size); } - bflow->fdt_fname = strdup(fname); - if (!bflow->fdt_fname) - return log_msg_ret("fil", -ENOMEM); + if (*fname) { + bflow->fdt_fname = strdup(fname); + if (!bflow->fdt_fname) + return log_msg_ret("fil", -ENOMEM); + } if (!ret) { bflow->fdt_size = size; -- 2.40.0.348.gf938b09366-goog

1 10

Re: [PATCH v6 11/11] bootstd: Enable BOOTSTD_DEFAULTS by default
by Tom Rini 02 Apr '23

02 Apr '23

On Sun, Apr 02, 2023 at 09:45:35AM +1200, Simon Glass wrote: > This is needed to enable the boot command used to start standard boot. > Enable it by default for boards which use BOOTSTD. > > This brings in quite a few features, mostly in common with > DISTRO_DEFAULTS > > Signed-off-by: Simon Glass <sjg(a)chromium.org> > --- > > Changes in v6: > - Redo patch for the new approach So, if the preceding patch to disable BOOTSTD is right, this patch should result in no size changes, since we're enabling these defaults on platforms that already had everything, but they're using distro_bootcmd and not bootstd itself. And please don't resync the defconfigs too, that makes review much harder and likely won't apply when merged anyhow. -- Tom

1 0