October 2024 - U-Boot

[GIT PULL] Please pull u-boot-dfu-next-20241003
by Mattijs Korpershoek 04 Oct '24

04 Oct '24

Hi Tom, Here are some new developments for next: DFU: - Reinitialize only if dfu_alt_info changed USB Gadget: - New usb gadget driver for Renesas USBHS - Simplify kconfig deps for CMD_USB_MASS_STORAGE Android: - Provide bootloader version to android via kernel commandline CI job: - https://source.denx.de/u-boot/custodians/u-boot-dfu/-/pipelines/22516 Regards, Mattijs The following changes since commit 3a0b829efc35227b1079a444f00e0729502197ad: Merge tag 'v2024.10-rc6' into next (2024-09-30 17:48:12 -0600) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-dfu.git tags/u-boot-dfu-next-20241003 for you to fetch changes up to c74758ccc091402b558b9aa7eaf1c50171d2f49f: cmd: simplify CONFIG_CMD_USB_MASS_STORAGE dependencies (2024-10-03 10:01:35 +0200) ---------------------------------------------------------------- u-boot-dfu-next-20241003 DFU: - Reinitialize only if dfu_alt_info changed USB Gadget: - New usb gadget driver for Renesas USBHS - Simplify kconfig deps for CMD_USB_MASS_STORAGE Android: - Provide bootloader version to android via kernel commandline ---------------------------------------------------------------- Heinrich Schuchardt (1): cmd: simplify CONFIG_CMD_USB_MASS_STORAGE dependencies Mattijs Korpershoek (1): bootstd: android: Add U-Boot version to cmdline Rasmus Villemoes (1): dfu: define a callback function for the dfu_alt_info environment variable Vitaliy Vasylskyy (1): usb: gadget: usbhs: Add Renesas USBHS device driver boot/bootmeth_android.c | 13 +- cmd/Kconfig | 3 +- drivers/dfu/dfu.c | 16 + drivers/dfu/dfu_mmc.c | 3 +- drivers/usb/gadget/Kconfig | 9 + drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/rcar/Makefile | 8 + drivers/usb/gadget/rcar/common.c | 478 ++++++++++++++ drivers/usb/gadget/rcar/common.h | 328 ++++++++++ drivers/usb/gadget/rcar/fifo.c | 1067 +++++++++++++++++++++++++++++++ drivers/usb/gadget/rcar/fifo.h | 114 ++++ drivers/usb/gadget/rcar/mod.c | 345 ++++++++++ drivers/usb/gadget/rcar/mod.h | 161 +++++ drivers/usb/gadget/rcar/mod_gadget.c | 1136 +++++++++++++++++++++++++++++++++ drivers/usb/gadget/rcar/pipe.c | 849 ++++++++++++++++++++++++ drivers/usb/gadget/rcar/pipe.h | 114 ++++ drivers/usb/gadget/rcar/renesas_usb.h | 125 ++++ include/dfu.h | 1 + include/env_callback.h | 7 + 19 files changed, 4774 insertions(+), 4 deletions(-) create mode 100644 drivers/usb/gadget/rcar/Makefile create mode 100644 drivers/usb/gadget/rcar/common.c create mode 100644 drivers/usb/gadget/rcar/common.h create mode 100644 drivers/usb/gadget/rcar/fifo.c create mode 100644 drivers/usb/gadget/rcar/fifo.h create mode 100644 drivers/usb/gadget/rcar/mod.c create mode 100644 drivers/usb/gadget/rcar/mod.h create mode 100644 drivers/usb/gadget/rcar/mod_gadget.c create mode 100644 drivers/usb/gadget/rcar/pipe.c create mode 100644 drivers/usb/gadget/rcar/pipe.h create mode 100644 drivers/usb/gadget/rcar/renesas_usb.h

2 1

[PATCH v2 00/20] arm: Initial support for Analog Devices SC5xx boards
by Oliver Gaskell via B4 Relay 03 Oct '24

03 Oct '24

ADSP-SC5xx is a series of ARM-based DSPs. This comprises the armv7 based SC57x, SC58x and SC594 series, and the armv8 based SC598. This patch series includes configurations, init code, and minimal DTs to enable Analog Devices' evaluation boards for these SoCs to boot through SPL and into U-Boot Proper, as well as devicetree schemas for the added DTs. This patch series depends on ("arm: Add Analog Devices SC5xx Machine Type") (https://lists.denx.de/pipermail/u-boot/2024-April/552043.html) Signed-off-by: Oliver Gaskell <Oliver.Gaskell(a)analog.com> --- Changes in v2: - Reorganise Kconfig defaults into the root Kconfig, and common/spl/Kconfig. - Sort Kconfig `select`s alphabetically - Clean up implementation of bss_clear to be not platform-dependent - Update adi_rom_boot_args for SC598-SOM to support RevC and newer of the SoM. - Link to v1: https://lore.kernel.org/r/20240828-sc5xx-upstreaming-patches-v1-0-44d9adfdf… --- Oliver Gaskell (20): arm: dts: Support SC573-EZKIT arm: dts: Support SC584-EZKIT arm: dts: Support SC589-MINI arm: dts: Support SC589-EZKIT arm: dts: Support SC594-SOM-EZKIT arm: dts: Support SC594-SOM-EZLITE arm: dts: Support SC598-SOM-EZKIT arm: dts: Support SC598-SOM-EZLITE dt-bindings: arm: Add SC5xx Series binding dt-bindings: clock: Add SC5xx clock tree bindings dt-bindings: timer: Add SC5xx Timer bindings arm: mach-sc5xx: clean up Kconfig arm: SC598-SOM-EZKIT initial support arm: SC598-SOM-EZLITE initial support arm: SC594-SOM-EZKIT initial support arm: SC594-SOM-EZLITE initial support arm: SC584-EZKIT initial support arm: SC589-EZKIT initial support arm: SC589-MINI initial support arm: SC573-EZKIT initial support Kconfig | 8 +- MAINTAINERS | 7 + arch/arm/Kconfig | 14 ++ arch/arm/dts/Makefile | 9 ++ arch/arm/dts/sc573-ezkit.dts | 13 ++ arch/arm/dts/sc57x.dtsi | 21 +++ arch/arm/dts/sc584-ezkit.dts | 13 ++ arch/arm/dts/sc589-ezkit.dts | 13 ++ arch/arm/dts/sc589-mini.dts | 13 ++ arch/arm/dts/sc58x.dtsi | 23 ++++ arch/arm/dts/sc594-som-ezkit.dts | 13 ++ arch/arm/dts/sc594-som-ezlite.dts | 13 ++ arch/arm/dts/sc594-som.dtsi | 19 +++ arch/arm/dts/sc598-som-ezkit.dts | 13 ++ arch/arm/dts/sc598-som-ezlite.dts | 13 ++ arch/arm/dts/sc598-som.dtsi | 31 +++++ arch/arm/dts/sc5xx.dtsi | 54 ++++++++ arch/arm/mach-sc5xx/Kconfig | 145 +++++++++++++++++---- arch/arm/mach-sc5xx/Makefile | 4 + arch/arm/mach-sc5xx/sc57x-spl.c | 26 ++++ arch/arm/mach-sc5xx/sc58x-spl.c | 26 ++++ arch/arm/mach-sc5xx/sc59x-spl.c | 26 ++++ arch/arm/mach-sc5xx/sc59x_64-spl.c | 26 ++++ arch/arm/mach-sc5xx/sc59x_64.c | 25 ++++ arch/arm/mach-sc5xx/soc.c | 36 +++++ board/adi/sc573-ezkit/Kconfig | 116 +++++++++++++++++ board/adi/sc573-ezkit/sc573-ezkit.env | 13 ++ board/adi/sc584-ezkit/Kconfig | 116 +++++++++++++++++ board/adi/sc584-ezkit/sc584-ezkit.env | 13 ++ board/adi/sc589-ezkit/Kconfig | 116 +++++++++++++++++ board/adi/sc589-ezkit/sc589-ezkit.env | 13 ++ board/adi/sc589-mini/Kconfig | 116 +++++++++++++++++ board/adi/sc589-mini/sc589-mini.env | 13 ++ board/adi/sc594-som-ezkit/Kconfig | 133 +++++++++++++++++++ board/adi/sc594-som-ezkit/sc594-som-ezkit.env | 13 ++ board/adi/sc594-som-ezlite/Kconfig | 133 +++++++++++++++++++ board/adi/sc594-som-ezlite/sc594-som-ezlite.env | 13 ++ board/adi/sc598-som-ezkit/Kconfig | 100 ++++++++++++++ board/adi/sc598-som-ezkit/sc598-som-ezkit.env | 13 ++ board/adi/sc598-som-ezlite/Kconfig | 100 ++++++++++++++ board/adi/sc598-som-ezlite/sc598-som-ezlite.env | 13 ++ common/spl/Kconfig | 17 ++- doc/device-tree-bindings/arm/adi/adi,sc5xx.yaml | 46 +++++++ .../clock/adi,sc5xx-clocks.yaml | 112 ++++++++++++++++ .../timer/adi,sc5xx-gptimer.yaml | 42 ++++++ include/configs/sc573-ezkit.h | 18 +++ include/configs/sc584-ezkit.h | 18 +++ include/configs/sc589.h | 19 +++ include/configs/sc594-som.h | 19 +++ include/configs/sc598-som.h | 23 ++++ 50 files changed, 1923 insertions(+), 29 deletions(-) --- base-commit: 1312faac5f52d27cfb45dfe1a5a93a2944ca5c21 change-id: 20240821-sc5xx-upstreaming-patches-c048ba9f979a Best regards, -- Oliver Gaskell <Oliver.Gaskell(a)analog.com>

2 22

[PATCH v3 1/4] power: regulator: Trigger probe of regulators which are always-on or boot-on
by Marek Vasut 03 Oct '24

03 Oct '24

In case a regulator DT node contains regulator-always-on or regulator-boot-on property, make sure the regulator gets correctly configured by U-Boot on start up. Unconditionally probe such regulator drivers. This is a preparatory patch for introduction of .regulator_post_probe() which would trigger the regulator configuration. Parsing of regulator-always-on and regulator-boot-on DT property has been moved to regulator_post_bind() as the information is required early, the rest of the DT parsing has been kept in regulator_pre_probe() to avoid slowing down the boot process. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Ben Wolsieffer <benwolsieffer(a)gmail.com> Cc: Caleb Connolly <caleb.connolly(a)linaro.org> Cc: Chris Morgan <macromorgan(a)hotmail.com> Cc: Dragan Simic <dsimic(a)manjaro.org> Cc: Eugen Hristev <eugen.hristev(a)collabora.com> Cc: Francesco Dolcini <francesco.dolcini(a)toradex.com> Cc: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Cc: Jaehoon Chung <jh80.chung(a)samsung.com> Cc: Jagan Teki <jagan(a)amarulasolutions.com> Cc: Jonas Karlman <jonas(a)kwiboo.se> Cc: Kever Yang <kever.yang(a)rock-chips.com> Cc: Kostya Porotchkin <kostap(a)marvell.com> Cc: Matteo Lisi <matteo.lisi(a)engicam.com> Cc: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> Cc: Max Krummenacher <max.krummenacher(a)toradex.com> Cc: Neil Armstrong <neil.armstrong(a)linaro.org> Cc: Patrice Chotard <patrice.chotard(a)foss.st.com> Cc: Patrick Delaunay <patrick.delaunay(a)foss.st.com> Cc: Philipp Tomsich <philipp.tomsich(a)vrull.eu> Cc: Quentin Schulz <quentin.schulz(a)cherry.de> Cc: Sam Day <me(a)samcday.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Sumit Garg <sumit.garg(a)linaro.org> Cc: Svyatoslav Ryhel <clamor95(a)gmail.com> Cc: Thierry Reding <treding(a)nvidia.com> Cc: Tom Rini <trini(a)konsulko.com> Cc: Volodymyr Babchuk <Volodymyr_Babchuk(a)epam.com> Cc: u-boot-amlogic(a)groups.io Cc: u-boot-qcom(a)groups.io Cc: u-boot(a)dh-electronics.com Cc: u-boot(a)lists.denx.de Cc: uboot-stm32(a)st-md-mailman.stormreply.com --- V2: - Rebase on current u-boot/next - Update test cases to handle already started regulators correctly V3: - Fix conditional around DM_FLAG_PROBE_AFTER_BIND to ORR --- drivers/power/regulator/regulator-uclass.c | 22 +++++++++++++++------- test/dm/panel.c | 2 +- test/dm/regulator.c | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 00922900292..1a970004540 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -439,6 +439,8 @@ static int regulator_post_bind(struct udevice *dev) const char *property = "regulator-name"; uc_pdata = dev_get_uclass_plat(dev); + uc_pdata->always_on = dev_read_bool(dev, "regulator-always-on"); + uc_pdata->boot_on = dev_read_bool(dev, "regulator-boot-on"); /* Regulator's mandatory constraint */ uc_pdata->name = dev_read_string(dev, property); @@ -450,13 +452,21 @@ static int regulator_post_bind(struct udevice *dev) return -EINVAL; } - if (regulator_name_is_unique(dev, uc_pdata->name)) - return 0; + if (!regulator_name_is_unique(dev, uc_pdata->name)) { + debug("'%s' of dev: '%s', has nonunique value: '%s\n", + property, dev->name, uc_pdata->name); + return -EINVAL; + } - debug("'%s' of dev: '%s', has nonunique value: '%s\n", - property, dev->name, uc_pdata->name); + /* + * In case the regulator has regulator-always-on or + * regulator-boot-on DT property, trigger probe() to + * configure its default state during startup. + */ + if (uc_pdata->always_on || uc_pdata->boot_on) + dev_or_flags(dev, DM_FLAG_PROBE_AFTER_BIND); - return -EINVAL; + return 0; } static int regulator_pre_probe(struct udevice *dev) @@ -479,8 +489,6 @@ static int regulator_pre_probe(struct udevice *dev) -ENODATA); uc_pdata->max_uA = dev_read_u32_default(dev, "regulator-max-microamp", -ENODATA); - uc_pdata->always_on = dev_read_bool(dev, "regulator-always-on"); - uc_pdata->boot_on = dev_read_bool(dev, "regulator-boot-on"); uc_pdata->ramp_delay = dev_read_u32_default(dev, "regulator-ramp-delay", 0); uc_pdata->force_off = dev_read_bool(dev, "regulator-force-boot-off"); diff --git a/test/dm/panel.c b/test/dm/panel.c index ce835c96ed0..ec85a9b1e6e 100644 --- a/test/dm/panel.c +++ b/test/dm/panel.c @@ -33,7 +33,7 @@ static int dm_test_panel(struct unit_test_state *uts) ut_assertok(sandbox_pwm_get_config(pwm, 0, &period_ns, &duty_ns, &enable, &polarity)); ut_asserteq(false, enable); - ut_asserteq(false, regulator_get_enable(reg)); + ut_asserteq(true, regulator_get_enable(reg)); ut_assertok(panel_enable_backlight(dev)); ut_assertok(sandbox_pwm_get_config(pwm, 0, &period_ns, &duty_ns, diff --git a/test/dm/regulator.c b/test/dm/regulator.c index 532bbd82376..449748ad52f 100644 --- a/test/dm/regulator.c +++ b/test/dm/regulator.c @@ -186,7 +186,7 @@ int dm_test_power_regulator_set_enable_if_allowed(struct unit_test_state *uts) /* Get BUCK1 - always on regulator */ platname = regulator_names[BUCK1][PLATNAME]; - ut_assertok(regulator_autoset_by_name(platname, &dev_autoset)); + ut_asserteq(-EALREADY, regulator_autoset_by_name(platname, &dev_autoset)); ut_assertok(regulator_get_by_platname(platname, &dev)); /* Try disabling always-on regulator */ @@ -288,7 +288,7 @@ static int dm_test_power_regulator_autoset(struct unit_test_state *uts) * Expected output state: uV=1200000; uA=200000; output enabled */ platname = regulator_names[BUCK1][PLATNAME]; - ut_assertok(regulator_autoset_by_name(platname, &dev_autoset)); + ut_asserteq(-EALREADY, regulator_autoset_by_name(platname, &dev_autoset)); /* Check, that the returned device is proper */ ut_assertok(regulator_get_by_platname(platname, &dev)); -- 2.45.2

4 9

[PATCH] boot: android: Fix ramdisk loading for v2 header
by Mattijs Korpershoek 03 Oct '24

03 Oct '24

Before commit da3447d09fa0 ("android: Fix ramdisk loading for bootimage v3+"), the ramdisk was loaded from img_data.ramdisk_ptr, ignoring offset provided via mkbootimg. commit da3447d09fa0 ("android: Fix ramdisk loading for bootimage v3+") rightfully fixes this by switching to use img_data.ramdisk_addr instead. However, it does not copy the ramdisk content to img_data.ramdisk_addr in case we use boot image v2. Because of this, we can no longer boot Android on Khadas vim3 board: [ 3.940361] RAMDISK: Couldn't find valid RAM disk image starting at 0. Add the missing memcpy() to fix the issue. Fixes: da3447d09fa0 ("android: Fix ramdisk loading for bootimage v3+") Signed-off-by: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> --- Note that on default AOSP boot images, there is another bug: the ramdisk offset is wronly configured: $ file boot.img boot.img: Android bootimg, kernel (0x11080000), ramdisk (0x11000000), page size: 2048 With this, we have a maximum ramdisk size of 0x80000 bytes (512KiB) which is not enough. The kernel would overlap on the ramdisk address. This can be fixed by repacking the boot image: $ unpack_bootimg --boot_img boot.img --out out --format=mkbootimg | \ tee mkbootimg_args $ vim mkbootimg_args # change --ramdisk_offset to 0x20000000 $ sh -c "mkbootimg $(cat mkbootimg_args) -o boot_repacked.img" --- boot/image-android.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/boot/image-android.c b/boot/image-android.c index 774565fd1fea..8934491c35f2 100644 --- a/boot/image-android.c +++ b/boot/image-android.c @@ -409,6 +409,10 @@ int android_image_get_ramdisk(const void *hdr, const void *vendor_boot_img, (ramdisk_ptr), (void *)img_data.bootconfig_addr, img_data.bootconfig_size); } + } else { + ramdisk_ptr = img_data.ramdisk_addr; + memcpy((void *)(ramdisk_ptr), (void *)img_data.ramdisk_ptr, + img_data.ramdisk_size); } printf("RAM disk load addr 0x%08lx size %u KiB\n", --- base-commit: 9cfe0cab3bf135a505e1e163ca442a4e4064d58e change-id: 20241003-android-fix-boot-v2-ada82163bd05 Best regards, -- Mattijs Korpershoek <mkorpershoek(a)baylibre.com>

2 1

[PATCH v1] mailbox: add i.MX MU driver
by alice.guo＠oss.nxp.com 03 Oct '24

03 Oct '24

From: Peng Fan <peng.fan(a)nxp.com> Add i.MX MU based mailbox driver. Signed-off-by: Viorel Suman <viorel.suman(a)nxp.com> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Signed-off-by: Alice Guo <alice.guo(a)nxp.com> Reviewed-by: Ye Li <ye.li(a)nxp.com> --- drivers/mailbox/Kconfig | 7 + drivers/mailbox/Makefile | 1 + drivers/mailbox/imx-mailbox.c | 417 ++++++++++++++++++++++++++++++++++ 3 files changed, 425 insertions(+) create mode 100644 drivers/mailbox/imx-mailbox.c diff --git a/drivers/mailbox/Kconfig b/drivers/mailbox/Kconfig index 67d5ac1a74..4d9f004eba 100644 --- a/drivers/mailbox/Kconfig +++ b/drivers/mailbox/Kconfig @@ -21,6 +21,13 @@ config APPLE_MBOX such as the System Management Controller (SMC) and NVMe and this driver is required to get that functionality up and running. +config IMX_MU_MBOX + bool "Enable i.MX MU MBOX support" + depends on DM_MAILBOX + help + Enable support for i.MX Messaging Unit for communication with other + processors on the SoC using mailbox interface + config SANDBOX_MBOX bool "Enable the sandbox mailbox test driver" depends on DM_MAILBOX && SANDBOX diff --git a/drivers/mailbox/Makefile b/drivers/mailbox/Makefile index 59e8d0de93..96a6adb709 100644 --- a/drivers/mailbox/Makefile +++ b/drivers/mailbox/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_$(SPL_)DM_MAILBOX) += mailbox-uclass.o obj-$(CONFIG_APPLE_MBOX) += apple-mbox.o +obj-$(CONFIG_IMX_MU_MBOX) += imx-mailbox.o obj-$(CONFIG_SANDBOX_MBOX) += sandbox-mbox.o obj-$(CONFIG_SANDBOX_MBOX) += sandbox-mbox-test.o obj-$(CONFIG_STM32_IPCC) += stm32-ipcc.o diff --git a/drivers/mailbox/imx-mailbox.c b/drivers/mailbox/imx-mailbox.c new file mode 100644 index 0000000000..584950b20d --- /dev/null +++ b/drivers/mailbox/imx-mailbox.c @@ -0,0 +1,417 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2017-2023 NXP + */ + +#include <asm/io.h> +#include <dm.h> +#include <dm/device_compat.h> +#include <mailbox-uclass.h> +#include <linux/bitfield.h> +#include <linux/bug.h> +#include <linux/iopoll.h> +#include <linux/compat.h> + +/* This driver only exposes the status bits to keep with the + * polling methodology of u-boot. + */ +DECLARE_GLOBAL_DATA_PTR; + +#define IMX_MU_CHANS 24 + +#define IMX_MU_V2_PAR_OFF 0x4 +#define IMX_MU_V2_TR_MASK GENMASK(7, 0) +#define IMX_MU_V2_RR_MASK GENMASK(15, 8) + +enum imx_mu_chan_type { + IMX_MU_TYPE_TX = 0, /* Tx */ + IMX_MU_TYPE_RX = 1, /* Rx */ + IMX_MU_TYPE_TXDB = 2, /* Tx doorbell */ + IMX_MU_TYPE_RXDB = 3, /* Rx doorbell */ + IMX_MU_TYPE_RST = 4, /* Reset */ + IMX_MU_TYPE_TXDB_V2 = 5, /* Tx doorbell with S/W ACK */ +}; + +enum imx_mu_xcr { + IMX_MU_CR, + IMX_MU_GIER, + IMX_MU_GCR, + IMX_MU_TCR, + IMX_MU_RCR, + IMX_MU_xCR_MAX, +}; + +enum imx_mu_xsr { + IMX_MU_SR, + IMX_MU_GSR, + IMX_MU_TSR, + IMX_MU_RSR, + IMX_MU_xSR_MAX, +}; + +struct imx_mu_con_priv { + unsigned int idx; + enum imx_mu_chan_type type; + struct mbox_chan *chan; +}; + +enum imx_mu_type { + IMX_MU_V1, + IMX_MU_V2 = BIT(1), + IMX_MU_V2_S4 = BIT(15), + IMX_MU_V2_IRQ = BIT(16), +}; + +struct imx_mu { + void __iomem *base; + const struct imx_mu_dcfg *dcfg; + u32 num_tr; + u32 num_rr; + /* use pointers to channel as a way to reserve channels */ + struct mbox_chan *channels[IMX_MU_CHANS]; + struct imx_mu_con_priv con_priv[IMX_MU_CHANS]; +}; + +struct imx_mu_dcfg { + int (*tx)(struct imx_mu *plat, struct imx_mu_con_priv *cp, const void *data); + int (*rx)(struct imx_mu *plat, struct imx_mu_con_priv *cp); + int (*rxdb)(struct imx_mu *plat, struct imx_mu_con_priv *cp); + int (*init)(struct imx_mu *plat); + int (*of_xlate)(struct mbox_chan *chan, struct ofnode_phandle_args *args); + enum imx_mu_type type; + u32 xTR; /* Transmit Register0 */ + u32 xRR; /* Receive Register0 */ + u32 xSR[IMX_MU_xSR_MAX]; /* Status Registers */ + u32 xCR[IMX_MU_xCR_MAX]; /* Control Registers */ +}; + +#define IMX_MU_xSR_GIPn(type, x) (type & IMX_MU_V2 ? BIT(x) : BIT(28 + (3 - (x)))) +#define IMX_MU_xSR_RFn(type, x) (type & IMX_MU_V2 ? BIT(x) : BIT(24 + (3 - (x)))) +#define IMX_MU_xSR_TEn(type, x) (type & IMX_MU_V2 ? BIT(x) : BIT(20 + (3 - (x)))) + +/* General Purpose Interrupt Enable */ +#define IMX_MU_xCR_GIEn(type, x) (type & IMX_MU_V2 ? BIT(x) : BIT(28 + (3 - (x)))) +/* Receive Interrupt Enable */ +#define IMX_MU_xCR_RIEn(type, x) (type & IMX_MU_V2 ? BIT(x) : BIT(24 + (3 - (x)))) +/* Transmit Interrupt Enable */ +#define IMX_MU_xCR_TIEn(type, x) (type & IMX_MU_V2 ? BIT(x) : BIT(20 + (3 - (x)))) +/* General Purpose Interrupt Request */ +#define IMX_MU_xCR_GIRn(type, x) (type & IMX_MU_V2 ? BIT(x) : BIT(16 + (3 - (x)))) +/* MU reset */ +#define IMX_MU_xCR_RST(type) (type & IMX_MU_V2 ? BIT(0) : BIT(5)) +#define IMX_MU_xSR_RST(type) (type & IMX_MU_V2 ? BIT(0) : BIT(7)) + +static void imx_mu_write(struct imx_mu *plat, u32 val, u32 offs) +{ + iowrite32(val, plat->base + offs); +} + +static u32 imx_mu_read(struct imx_mu *plat, u32 offs) +{ + return ioread32(plat->base + offs); +} + +static u32 imx_mu_xcr_rmw(struct imx_mu *plat, enum imx_mu_xcr type, u32 set, u32 clr) +{ + u32 val; + + val = imx_mu_read(plat, plat->dcfg->xCR[type]); + val &= ~clr; + val |= set; + imx_mu_write(plat, val, plat->dcfg->xCR[type]); + + return val; +} + +/* check that the channel is open or owned by caller */ +static int imx_mu_check_channel(struct mbox_chan *chan) +{ + struct imx_mu *plat = dev_get_plat(chan->dev); + + if (plat->channels[chan->id] != NULL) { + /* if reserved check that caller owns */ + if (plat->channels[chan->id] == chan) + return 1; /* caller owns the channel */ + + return -EACCES; + } + + return 0; /* channel empty */ +} + +static int imx_mu_chan_request(struct mbox_chan *chan) +{ + struct imx_mu *plat = dev_get_plat(chan->dev); + struct imx_mu_con_priv *cp; + enum imx_mu_chan_type type; + int idx; + + type = chan->id / 4; + idx = chan->id % 4; + + if (imx_mu_check_channel(chan) < 0) /* check if channel already in use */ + return -EPERM; + + plat->channels[chan->id] = chan; + chan->con_priv = kcalloc(1, sizeof(struct imx_mu_con_priv), 0); + if (!chan->con_priv) + return -ENOMEM; + cp = chan->con_priv; + cp->idx = idx; + cp->type = type; + cp->chan = chan; + + switch (type) { + case IMX_MU_TYPE_RX: + imx_mu_xcr_rmw(plat, IMX_MU_RCR, IMX_MU_xCR_RIEn(plat->dcfg->type, idx), 0); + break; + case IMX_MU_TYPE_TXDB_V2: + case IMX_MU_TYPE_TXDB: + case IMX_MU_TYPE_RXDB: + imx_mu_xcr_rmw(plat, IMX_MU_GIER, IMX_MU_xCR_GIEn(plat->dcfg->type, idx), 0); + break; + default: + break; + } + + return 0; +} + +static int imx_mu_chan_free(struct mbox_chan *chan) +{ + struct imx_mu *plat = dev_get_plat(chan->dev); + struct imx_mu_con_priv *cp = chan->con_priv; + + if (imx_mu_check_channel(chan) <= 0) /* check that the channel is also not empty */ + return -EINVAL; + + /* if you own channel and channel is NOT empty */ + plat->channels[chan->id] = NULL; + switch (cp->type) { + case IMX_MU_TYPE_TX: + imx_mu_xcr_rmw(plat, IMX_MU_TCR, 0, IMX_MU_xCR_TIEn(plat->dcfg->type, cp->idx)); + break; + case IMX_MU_TYPE_RX: + imx_mu_xcr_rmw(plat, IMX_MU_RCR, 0, IMX_MU_xCR_RIEn(plat->dcfg->type, cp->idx)); + break; + case IMX_MU_TYPE_TXDB_V2: + case IMX_MU_TYPE_TXDB: + case IMX_MU_TYPE_RXDB: + imx_mu_xcr_rmw(plat, IMX_MU_GIER, 0, IMX_MU_xCR_GIEn(plat->dcfg->type, cp->idx)); + break; + default: + break; + } + + kfree(cp); + + return 0; +} + +static int imx_mu_send(struct mbox_chan *chan, const void *data) +{ + struct imx_mu *plat = dev_get_plat(chan->dev); + struct imx_mu_con_priv *cp = chan->con_priv; + + if (imx_mu_check_channel(chan) < 1) /* return if channel isn't owned */ + return -EPERM; + + return plat->dcfg->tx(plat, cp, data); +} + +static int imx_mu_recv(struct mbox_chan *chan, void *data) +{ + struct imx_mu *plat = dev_get_plat(chan->dev); + struct imx_mu_con_priv *cp = chan->con_priv; + u32 ctrl, val; + + if (imx_mu_check_channel(chan) < 1) /* return if channel isn't owned */ + return -EPERM; + + switch (cp->type) { + case IMX_MU_TYPE_TXDB_V2: + case IMX_MU_TYPE_RXDB: + /* check if GSR[GIRn] bit is set */ + if (readx_poll_timeout(ioread32, plat->base + plat->dcfg->xSR[IMX_MU_GSR], + val, val & BIT(cp->idx), 1000000) < 0) + return -EBUSY; + + ctrl = imx_mu_read(plat, plat->dcfg->xCR[IMX_MU_GIER]); + val = imx_mu_read(plat, plat->dcfg->xSR[IMX_MU_GSR]); + val &= IMX_MU_xSR_GIPn(plat->dcfg->type, cp->idx) & + (ctrl & IMX_MU_xCR_GIEn(plat->dcfg->type, cp->idx)); + break; + default: + dev_warn(chan->dev, "Unhandled channel type %d\n", cp->type); + return -EOPNOTSUPP; + }; + + if (val == IMX_MU_xSR_GIPn(plat->dcfg->type, cp->idx)) + plat->dcfg->rxdb(plat, cp); + + return 0; +} + +static int imx_mu_of_to_plat(struct udevice *dev) +{ + struct imx_mu *plat = dev_get_plat(dev); + fdt_addr_t addr; + + addr = dev_read_addr(dev); + if (addr == FDT_ADDR_T_NONE) + return -ENODEV; + + plat->base = (struct mu_type *)addr; + + return 0; +} + +static int imx_mu_init_generic(struct imx_mu *plat) +{ + unsigned int i; + unsigned int val; + + if (plat->num_rr > 4 || plat->num_tr > 4) { + WARN_ONCE(true, "%s not support TR/RR larger than 4\n", __func__); + return -EOPNOTSUPP; + } + + /* Set default MU configuration */ + for (i = 0; i < IMX_MU_xCR_MAX; i++) + imx_mu_write(plat, 0, plat->dcfg->xCR[i]); + + /* Clear any pending GIP */ + val = imx_mu_read(plat, plat->dcfg->xSR[IMX_MU_GSR]); + imx_mu_write(plat, val, plat->dcfg->xSR[IMX_MU_GSR]); + + /* Clear any pending RSR */ + for (i = 0; i < plat->num_rr; i++) + imx_mu_read(plat, plat->dcfg->xRR + i * 4); + + return 0; +} + +static int imx_mu_generic_of_xlate(struct mbox_chan *chan, struct ofnode_phandle_args *args) +{ + enum imx_mu_chan_type type; + int idx, cid; + + if (args->args_count != 2) { + dev_err(chan->dev, "Invalid argument count %d\n", args->args_count); + return -EINVAL; + } + + type = args->args[0]; /* channel type */ + idx = args->args[1]; /* index */ + + cid = type * 4 + idx; + if (cid >= IMX_MU_CHANS) { + dev_err(chan->dev, "Not supported channel number: %d. (type: %d, idx: %d)\n", + cid, type, idx); + return -EINVAL; + } + + chan->id = cid; + + return 0; +} + +static int imx_mu_generic_tx(struct imx_mu *plat, struct imx_mu_con_priv *cp, + const void *data) +{ + switch (cp->type) { + case IMX_MU_TYPE_TXDB_V2: + imx_mu_xcr_rmw(plat, IMX_MU_GCR, IMX_MU_xCR_GIRn(plat->dcfg->type, cp->idx), 0); + break; + default: + dev_warn(cp->chan->dev, "Send data on wrong channel type: %d\n", cp->type); + return -EINVAL; + } + + return 0; +} + +static int imx_mu_generic_rxdb(struct imx_mu *plat, struct imx_mu_con_priv *cp) +{ + imx_mu_write(plat, IMX_MU_xSR_GIPn(plat->dcfg->type, cp->idx), + plat->dcfg->xSR[IMX_MU_GSR]); + + return 0; +} + +static const struct imx_mu_dcfg imx_mu_cfg_imx95 = { + .tx = imx_mu_generic_tx, + .rxdb = imx_mu_generic_rxdb, + .init = imx_mu_init_generic, + .of_xlate = imx_mu_generic_of_xlate, + .type = IMX_MU_V2, + .xTR = 0x200, + .xRR = 0x280, + .xSR = {0xC, 0x118, 0x124, 0x12C}, + .xCR = {0x8, 0x110, 0x114, 0x120, 0x128}, +}; + +static const struct udevice_id ids[] = { + { .compatible = "fsl,imx95-mu", .data = (ulong)&imx_mu_cfg_imx95 }, + { } +}; + +int imx_mu_of_xlate(struct mbox_chan *chan, struct ofnode_phandle_args *args) +{ + struct imx_mu *plat = dev_get_plat(chan->dev); + + return plat->dcfg->of_xlate(chan, args); +} + +struct mbox_ops imx_mu_ops = { + .of_xlate = imx_mu_of_xlate, + .request = imx_mu_chan_request, + .rfree = imx_mu_chan_free, + .send = imx_mu_send, + .recv = imx_mu_recv, +}; + +static void imx_mu_get_tr_rr(struct imx_mu *plat) +{ + u32 val; + + if (plat->dcfg->type & IMX_MU_V2) { + val = imx_mu_read(plat, IMX_MU_V2_PAR_OFF); + plat->num_tr = FIELD_GET(IMX_MU_V2_TR_MASK, val); + plat->num_rr = FIELD_GET(IMX_MU_V2_RR_MASK, val); + } else { + plat->num_tr = 4; + plat->num_rr = 4; + } +} + +static int imx_mu_probe(struct udevice *dev) +{ + struct imx_mu *plat = dev_get_plat(dev); + int ret; + + debug("%s(dev=%p)\n", __func__, dev); + + plat->dcfg = (void *)dev_get_driver_data(dev); + + imx_mu_get_tr_rr(plat); + + ret = plat->dcfg->init(plat); + if (ret) { + dev_err(dev, "Failed to init MU\n"); + return ret; + } + + return 0; +} + +U_BOOT_DRIVER(imx_mu) = { + .name = "imx-mu", + .id = UCLASS_MAILBOX, + .of_match = ids, + .of_to_plat = imx_mu_of_to_plat, + .plat_auto = sizeof(struct imx_mu), + .probe = imx_mu_probe, + .ops = &imx_mu_ops, + .flags = DM_FLAG_PRE_RELOC, +}; -- 2.34.1

2 1

[PATCH v3 0/7] Add AVS support for J721S2
by Manorit Chawdhry 03 Oct '24

03 Oct '24

This series adds support for AVS on J721S2. AVS Test for J721S2: https://gist.github.com/manorit2001/c64cf396281806102cae2b45ba84781e Boot Test results: https://gist.github.com/manorit2001/6775d721b3df5a690497d94d012b93c4 Signed-off-by: Manorit Chawdhry <m-chawdhry(a)ti.com> --- Changes in v3: * Udit - Change the method of soc_match_device * Tom - That code part changed so that error wouldn't exist anymore - Link to v2: https://lore.kernel.org/r/20240528-b4-upstream-j721s2-avs-v2-0-df940f2309d0… --- Manorit Chawdhry (7): power: pmic: tps65941: Add DM_PMIC dependency drivers: misc: k3_avs: Check return code while programming AVS arm: dts: k3-j7*-r5: Add MPU clock in clocks property drivers: misc: k3_avs: Extract MPU clk and dev ID from DT arm: mach-k3: j721s2_init: Initialize AVS Class 0 arm: dts: j721s2: Add VTM node in R5 configs: j721s2_evm_r5_defconfig: Add AVS Configs arch/arm/dts/k3-am69-r5-sk.dts | 3 +- arch/arm/dts/k3-j7200-r5-common-proc-board.dts | 3 +- arch/arm/dts/k3-j721e-r5.dtsi | 3 +- arch/arm/dts/k3-j721s2-r5-common-proc-board.dts | 9 ++++++ arch/arm/dts/k3-j721s2-r5.dtsi | 3 +- arch/arm/dts/k3-j784s4-r5-evm.dts | 3 +- arch/arm/mach-k3/j721s2/j721s2_init.c | 10 ++++++ configs/am68_sk_r5_defconfig | 4 +++ configs/j721s2_evm_r5_defconfig | 6 ++++ drivers/misc/k3_avs.c | 42 ++++++++++++++++++++++++- drivers/power/pmic/Kconfig | 1 + 11 files changed, 81 insertions(+), 6 deletions(-) --- base-commit: b4cbd1a257d4027038b4f997d73bdb0a066db045 change-id: 20240130-b4-upstream-j721s2-avs-8c187d3fe26a Best regards, -- Manorit Chawdhry <m-chawdhry(a)ti.com>

2 20

[PATCH 1/1] cmd: simplify CONFIG_CMD_USB_MASS_STORAGE dependencies
by Heinrich Schuchardt 03 Oct '24

03 Oct '24

CONFIG_USB_GADGET_DOWNLOAD depends on CONFIG_USB_GADGET. It is sufficient to depend on the prior. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- cmd/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 4ccb0cef390..02b2569e713 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1685,9 +1685,8 @@ config CMD_ROCKUSB config CMD_USB_MASS_STORAGE bool "UMS usb mass storage" - depends on USB_GADGET_DOWNLOAD + depends on BLK && USB_GADGET_DOWNLOAD select USB_FUNCTION_MASS_STORAGE - depends on BLK && USB_GADGET help Enables the command "ums" and the USB mass storage support to the export a block device: U-Boot, the USB device, acts as a simple -- 2.45.2

3 3

[PATCH v4 0/7] Add the USB5744 hub driver as per new DT binding
by Venkatesh Yadav Abbarapu 03 Oct '24

03 Oct '24

Add the usb5744/usb2744 hub driver which does the reset gpio toggling and the i2c initialization sequence. Tested the USB5744/USB2744 usb hub for usb0, usb1 with the DT nodes on KR260 board. Changes in v2: - Added the power_on_reset_us variable, for post-reset time. - Removed the DM_REGULATOR ifdef around the regulator API's. - Rename the i2c_init and fixed the return for the API's. Changes in v3: - Rename i2c_init to init. - Fixed the return values for the dev_read_phandle_with_args API. - Removed the unneccessary cast uint8_t *. Changes in v4: - Fixed the indentation issues. - Fixed the Reverse xmas tree for indentation. - Replaced dev_dbg to dev_err in all places. Venkatesh Yadav Abbarapu (7): usb: onboard-hub: Add reset-gpio support usb: onboard-hub: Fix the return values of regulator APIs usb: onboard-hub: add support for Microchip USB5744 usb: onboard-hub: Add i2c initialization for usb5744 hub usb: onboard-hub: Bail out if peer hub is already probed configs: zynqmp_kria: Enable the USB onboard hub arm64: zynqmp: Update the usb5744 hub node as per binding arch/arm/dts/zynqmp-sck-kr-g-revA.dtso | 48 +++++++ arch/arm/dts/zynqmp-sck-kr-g-revB.dtso | 48 +++++++ arch/arm/dts/zynqmp-sck-kv-g-revA.dtso | 18 +++ arch/arm/dts/zynqmp-sck-kv-g-revB.dtso | 25 +++- common/usb_onboard_hub.c | 180 ++++++++++++++++++++++++- configs/xilinx_zynqmp_kria_defconfig | 11 +- 6 files changed, 318 insertions(+), 12 deletions(-) -- 2.17.1

1 7

[PATCH] rtc: rv3028: add support to manage VDD regulator
by arturo.buzarra＠digi.com 03 Oct '24

03 Oct '24

From: Arturo Buzarra <arturo.buzarra(a)digi.com> This commit adds support to manage an external regulator to enable the main power supply VDD. Signed-off-by: Arturo Buzarra <arturo.buzarra(a)digi.com> --- drivers/rtc/rv3028.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/rtc/rv3028.c b/drivers/rtc/rv3028.c index 9f63afc14a8..b14d2a246ff 100644 --- a/drivers/rtc/rv3028.c +++ b/drivers/rtc/rv3028.c @@ -12,6 +12,9 @@ #include <dm.h> #include <i2c.h> #include <rtc.h> +#include <dm/device_compat.h> +#include <linux/delay.h> +#include <power/regulator.h> #define RV3028_SEC 0x00 #define RV3028_MIN 0x01 @@ -78,6 +81,12 @@ #define RTC_RV3028_LEN 7 +#define VDD_START_TIME_US 200000 + +struct rv3028_priv { + struct udevice *vdd; +}; + static int rv3028_rtc_get(struct udevice *dev, struct rtc_time *tm) { u8 regs[RTC_RV3028_LEN]; @@ -180,6 +189,28 @@ static int rv3028_rtc_write8(struct udevice *dev, unsigned int reg, int val) static int rv3028_probe(struct udevice *dev) { + struct rv3028_priv *priv = dev_get_priv(dev); + int ret; + + if (IS_ENABLED(CONFIG_DM_REGULATOR)) { + ret = device_get_supply_regulator(dev, "vdd-supply", &priv->vdd); + if (ret && ret != -ENOENT) { + dev_err(dev, "Warning: cannot get VDD supply\n"); + return ret; + } + + if (priv->vdd) { + ret = regulator_set_enable_if_allowed(priv->vdd, true); + if (ret) { + dev_err(dev, "failed to enable vdd-supply\n"); + return ret; + } + + /* We must wait Tstart = 0.2s before access to I2C */ + udelay(VDD_START_TIME_US); + } + } + i2c_set_chip_flags(dev, DM_I2C_CHIP_RD_ADDRESS | DM_I2C_CHIP_WR_ADDRESS); @@ -205,4 +236,5 @@ U_BOOT_DRIVER(rtc_rv3028) = { .probe = rv3028_probe, .of_match = rv3028_rtc_ids, .ops = &rv3028_rtc_ops, + .priv_auto = sizeof(struct rv3028_priv), }; -- 2.46.0

2 1

[PATCHv2 0/1] Makefile: pass external DTB provided by make variable EXT_DTB to binman
by al.kochet＠gmail.com 03 Oct '24

03 Oct '24

From: Alexander Kochetkov <al.kochet(a)gmail.com> Changes in v2: - fix syntax errors in the description - impelement handling multiple DTB files in the EXT_DTB Alexander Kochetkov (1): Makefile: pass external DTB provided by make variable EXT_DTB to binman Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -- 2.17.1

2 2