June 2022 - U-Boot

imx8mm: Invalid IVT structure
by Fabio Estevam 08 Jun '22

08 Jun '22

Hi, On top of tree U-Boot, when CONFIG_IMX_HAB=y is selected in imx8mm_evk_defconfig, the following error messages are seen: U-Boot SPL 2022.07-rc3-00097-g26aa5e5c3fbc-dirty (Jun 08 2022 - 10:59:56 -0300) SEC0: RNG instantiated Normal Boot WDT: Started watchdog@30280000 with servicing (60s timeout) Trying to boot from MMC1 hab fuse not enabled Authenticate image from DDR location 0x401fcdc0... bad magic magic=0x0 length=0x00 version=0x0 bad length magic=0x0 length=0x00 version=0x0 bad version magic=0x0 length=0x00 version=0x0 Error: Invalid IVT structure NOTICE: BL31: v2.4(release):lf-5.15.5-1.0.0-10-gcb51a0faa4b6 NOTICE: BL31: Built : 10:50:11, Jun 8 2022 The boot proceeds normally, despite the error messages above. Does anyone know how we could fix these errors? Thanks, Fabio Estevam

5 6

A reminder about U-Boot and lore/lei/b4
by Tom Rini 08 Jun '22

08 Jun '22

Hey all, As I've just recently updated my own workflow a bit, I wanted to remind everyone that the u-boot mailing list is archived as part of lore.kernel.org and as such all of the tricks and tools one might use such as having lei monitor this list (l:u-boot.lists.denx.de) and patches that touch specific areas works exactly as documented for all of the Linux kernel subsystems, etc. -- Tom

1 0

[PULL] u-boot-usb/master
by Marek Vasut 08 Jun '22

08 Jun '22

The following changes since commit 8f527342db4160a1f030de6fe4a1591787cce65a: Prepare v2022.07-rc4 (2022-06-06 10:25:13 -0400) are available in the Git repository at: git://source.denx.de/u-boot-usb.git master for you to fetch changes up to 02544db9a7ffd352129f51c8987fc5a6e2b31a8b: misc: Port USB251xB/xBi Hi-Speed Hub Controller Driver from Linux (2022-06-07 16:14:20 +0200) ---------------------------------------------------------------- Chunfeng Yun (1): usb: xhci-mtk: disable all ports when disable host controller Marek Vasut (1): misc: Port USB251xB/xBi Hi-Speed Hub Controller Driver from Linux drivers/misc/Kconfig | 9 ++ drivers/misc/Makefile | 1 + drivers/misc/usb251xb.c | 605 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/host/xhci-mtk.c | 6 +- 4 files changed, 619 insertions(+), 2 deletions(-) create mode 100644 drivers/misc/usb251xb.c

2 1

Unpatched Critical Flaws Disclosed in U-Boot Bootloader for Embedded Devices
by Turritopsis Dohrnii Teo En Ming 08 Jun '22

08 Jun '22

Subject: Unpatched Critical Flaws Disclosed in U-Boot Bootloader for Embedded Devices Good day from Singapore, I am sharing this news article for more awareness. Article: Unpatched Critical Flaws Disclosed in U-Boot Bootloader for Embedded Devices Link: https://thehackernews.com/2022/06/unpatched-critical-flaws-disclosed-in-u.h… Regards, Mr. Turritopsis Dohrnii Teo En Ming Targeted Individual in Singapore 7 Jun 2022 Tue Blogs: https://tdtemcerts.blogspot.com/ https://tdtemcerts.wordpress.com/

2 2

[PATCH] TPL: Do not allow enabling TPL symbols for non-TPL builds
by Pali Rohár 08 Jun '22

08 Jun '22

It does not make sense to enable TPL options when not building TPL binary. So disallow selecting TPL options for non-TPL builds. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- common/Kconfig | 4 ++++ drivers/power/acpi_pmc/Kconfig | 1 + lib/Kconfig | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/common/Kconfig b/common/Kconfig index 8e59dcef4b8b..ba59edd14673 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -89,10 +89,14 @@ config SPL_LOGLEVEL endif +if TPL + config TPL_LOGLEVEL int default LOGLEVEL +endif + config VPL_LOGLEVEL int "loglevel for VPL" default LOGLEVEL diff --git a/drivers/power/acpi_pmc/Kconfig b/drivers/power/acpi_pmc/Kconfig index 8b712abc41e9..629acb071427 100644 --- a/drivers/power/acpi_pmc/Kconfig +++ b/drivers/power/acpi_pmc/Kconfig @@ -18,6 +18,7 @@ config SPL_ACPI_PMC config TPL_ACPI_PMC bool "Power Manager (x86 PMC) support in TPL" + depends on TPL default y if ACPI_PMC help Enable support for an x86-style power-management controller which diff --git a/lib/Kconfig b/lib/Kconfig index 299381ac80d5..ef1c57a075f6 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -249,6 +249,7 @@ config SPL_TINY_MEMSET config TPL_TINY_MEMSET bool "Use a very small memset() in TPL" + depends on TPL help The faster memset() is the arch-specific one (if available) enabled by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get @@ -779,7 +780,7 @@ config TPL_OF_LIBFDT config TPL_OF_LIBFDT_ASSUME_MASK hex "Mask of conditions to assume for libfdt" - depends on TPL_OF_LIBFDT || FIT + depends on TPL_OF_LIBFDT || (TPL && FIT) default 0xff help Use this to change the assumptions made by libfdt in TPL about the -- 2.20.1

2 1

[PATCH] SPL: Do not allow enabling SPL symbols for non-SPL builds
by Pali Rohár 08 Jun '22

08 Jun '22

It does not make sense to enable SPL options when not building SPL binary. So disallow selecting SPL options for non-SPL builds. Signed-off-by: Pali Rohár <pali(a)kernel.org> --- arch/arm/Kconfig | 6 +++++- arch/arm/cpu/armv8/Kconfig | 2 ++ common/Kconfig | 5 +++++ common/spl/Kconfig | 4 ++-- drivers/firmware/Kconfig | 1 + drivers/gpio/Kconfig | 1 + drivers/misc/Kconfig | 1 + drivers/mmc/Kconfig | 5 +++++ drivers/mtd/spi/Kconfig | 1 + drivers/power/Kconfig | 1 + drivers/power/acpi_pmc/Kconfig | 1 + drivers/power/regulator/Kconfig | 1 + fs/cbfs/Kconfig | 1 + lib/Kconfig | 10 +++++++++- 14 files changed, 36 insertions(+), 4 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 0afec5155b1b..e4b2b76650fe 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -985,7 +985,7 @@ config ARCH_MX6 imply SYS_THUMB_BUILD imply SPL_SEPARATE_BSS -if ARCH_MX6 +if ARCH_MX6 && SPL config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds" endif @@ -2343,7 +2343,11 @@ source "arch/arm/Kconfig.debug" endmenu +if SPL + config SPL_LDSCRIPT default "arch/arm/cpu/arm926ejs/mxs/u-boot-spl.lds" if (ARCH_MX23 || ARCH_MX28) && !SPL_FRAMEWORK default "arch/arm/cpu/arm1136/u-boot-spl.lds" if CPU_ARM1136 default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64 + +endif diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index 09f3f50fa22f..0476446bc5ba 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -76,6 +76,7 @@ config ARMV8_SEC_FIRMWARE_SUPPORT config SPL_ARMV8_SEC_FIRMWARE_SUPPORT bool "Enable ARMv8 secure monitor firmware framework support for SPL" + depends on SPL select SPL_FIT select SPL_OF_LIBFDT help @@ -83,6 +84,7 @@ config SPL_ARMV8_SEC_FIRMWARE_SUPPORT config SPL_RECOVER_DATA_SECTION bool "save/restore SPL data section" + depends on SPL help Say Y here to save SPL data section for cold boot, and restore at warm boot in SPL phase. diff --git a/common/Kconfig b/common/Kconfig index a96842a5c11d..8e59dcef4b8b 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -81,10 +81,14 @@ config LOGLEVEL 8 - debug content 9 - debug hardware I/O +if SPL + config SPL_LOGLEVEL int default LOGLEVEL +endif + config TPL_LOGLEVEL int default LOGLEVEL @@ -241,6 +245,7 @@ config SYS_STDIO_DEREGISTER config SPL_SYS_STDIO_DEREGISTER bool "Allow deregistering stdio devices in SPL" + depends on SPL help Generally there is no need to deregister stdio devices since they are never deactivated. But if a stdio device is used which can be diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 84f2847c724b..3cfb19331272 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -19,6 +19,8 @@ config SPL help If you want to build SPL as well as the normal image, say Y. +if SPL + config SPL_FRAMEWORK bool "Support SPL based upon the common SPL framework" depends on SPL @@ -150,8 +152,6 @@ config HANDOFF in boot. It is available in gd->handoff. The state state is set up in SPL (or TPL if that is being used). -if SPL - config SPL_HANDOFF bool "Pass hand-off information from SPL to U-Boot proper" depends on HANDOFF && SPL_BLOBLIST diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index ef958b3a7a4e..55069e395ff2 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -3,6 +3,7 @@ config FIRMWARE config SPL_FIRMWARE bool "Enable Firmware driver support in SPL" + depends on SPL depends on FIRMWARE config SPL_ARM_PSCI_FW diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 149a62ffe611..3ba97515b718 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -490,6 +490,7 @@ config DM_PCA953X config SPL_DM_PCA953X bool "PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports in SPL" + depends on SPL depends on DM_GPIO help Say yes here to provide access to several register-oriented diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 9af806a20ae9..b99e7c25b807 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -492,6 +492,7 @@ config FS_LOADER config SPL_FS_LOADER bool "Enable loader driver for file system" + depends on SPL help This is file system generic loader which can be used to load the file image from the storage into target such as memory. diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index f04cc44e1973..a3f0cd00ed74 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -123,6 +123,7 @@ config MMC_IO_VOLTAGE config SPL_MMC_IO_VOLTAGE bool "Support IO voltage configuration in SPL" + depends on SPL help IO voltage configuration allows selecting the voltage level of the IO lines (not the level of main supply). This is required for UHS @@ -153,6 +154,7 @@ config MMC_HS400_ES_SUPPORT config SPL_MMC_HS400_ES_SUPPORT bool "enable HS400 Enhanced Strobe support in SPL" + depends on SPL help The HS400 Enhanced Strobe mode is support by some eMMC. The bus frequency is up to 200MHz. This mode does not tune the IO. @@ -166,6 +168,7 @@ config MMC_HS400_SUPPORT config SPL_MMC_HS400_SUPPORT bool "enable HS400 support in SPL" + depends on SPL select SPL_MMC_HS200_SUPPORT help The HS400 mode is support by some eMMC. The bus frequency is up to @@ -179,6 +182,7 @@ config MMC_HS200_SUPPORT config SPL_MMC_HS200_SUPPORT bool "enable HS200 support in SPL" + depends on SPL help The HS200 mode is support by some eMMC. The bus frequency is up to 200MHz. This mode requires tuning the IO. @@ -478,6 +482,7 @@ config MMC_SDHCI_ADMA config SPL_MMC_SDHCI_ADMA bool "Support SDHCI ADMA2 in SPL" + depends on SPL depends on MMC_SDHCI select MMC_SDHCI_ADMA_HELPERS help diff --git a/drivers/mtd/spi/Kconfig b/drivers/mtd/spi/Kconfig index f350c7e5dc21..eed51bb22b09 100644 --- a/drivers/mtd/spi/Kconfig +++ b/drivers/mtd/spi/Kconfig @@ -248,6 +248,7 @@ config SPI_FLASH_MTD config SPL_SPI_FLASH_MTD bool "SPI flash MTD support for SPL" + depends on SPL depends on SPI_FLASH help Enable the MTD support for the SPI flash layer in SPL. diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 2c20dc7c8318..1d184b285875 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -29,6 +29,7 @@ config POWER_LEGACY config SPL_POWER_LEGACY bool "Legacy power support in SPL" + depends on SPL default y if POWER_LEGACY help Note: This is a legacy option. Use SPL_DM_PMIC instead. diff --git a/drivers/power/acpi_pmc/Kconfig b/drivers/power/acpi_pmc/Kconfig index fcd50e36cad4..8b712abc41e9 100644 --- a/drivers/power/acpi_pmc/Kconfig +++ b/drivers/power/acpi_pmc/Kconfig @@ -8,6 +8,7 @@ config ACPI_PMC config SPL_ACPI_PMC bool "Power Manager (x86 PMC) support in SPL" + depends on SPL default y if ACPI_PMC help Enable support for an x86-style power-management controller which diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index cd253b95f2f0..dde694a5c44b 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -148,6 +148,7 @@ config DM_REGULATOR_FIXED config SPL_DM_REGULATOR_FIXED bool "Enable Driver Model for REGULATOR Fixed value in SPL" + depends on SPL_DM_REGULATOR depends on DM_REGULATOR_FIXED select SPL_DM_REGULATOR_COMMON ---help--- diff --git a/fs/cbfs/Kconfig b/fs/cbfs/Kconfig index 03980d830d30..b6639928f4af 100644 --- a/fs/cbfs/Kconfig +++ b/fs/cbfs/Kconfig @@ -9,6 +9,7 @@ config FS_CBFS config SPL_FS_CBFS bool "Enable CBFS (Coreboot Filesystem) in SPL" + depends on SPL help Define this to enable support for reading from a Coreboot filesystem. This is a ROM-based filesystem used for accessing files diff --git a/lib/Kconfig b/lib/Kconfig index acc0ac081a44..299381ac80d5 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -239,6 +239,7 @@ config GENERATE_ACPI_TABLE config SPL_TINY_MEMSET bool "Use a very small memset() in SPL" + depends on SPL help The faster memset() is the arch-specific one (if available) enabled by CONFIG_USE_ARCH_MEMSET. If that is not enabled, we can still get @@ -556,6 +557,7 @@ config MD5 config SPL_MD5 bool "Support MD5 algorithm in SPL" + depends on SPL help This option enables MD5 support in SPL. MD5 is an algorithm designed in 1991 that produces a 16-byte digest (or checksum) from its input @@ -642,6 +644,7 @@ config ZSTD config SPL_LZ4 bool "Enable LZ4 decompression support in SPL" + depends on SPL help This enables support for the LZ4 decompression algorithm in SPL. LZ4 is a lossless data compression algorithm that is focused on @@ -650,6 +653,7 @@ config SPL_LZ4 config SPL_LZMA bool "Enable LZMA decompression support for SPL build" + depends on SPL help This enables support for LZMA compression algorithm for SPL boot. @@ -661,22 +665,26 @@ config VPL_LZMA config SPL_LZO bool "Enable LZO decompression support in SPL" + depends on SPL help This enables support for LZO compression algorithm in the SPL. config SPL_GZIP bool "Enable gzip decompression support for SPL build" + depends on SPL select SPL_ZLIB help This enables support for the GZIP compression algorithm for SPL boot. config SPL_ZLIB bool + depends on SPL help This enables compression lib for SPL boot. config SPL_ZSTD bool "Enable Zstandard decompression support in SPL" + depends on SPL select XXHASH help This enables Zstandard decompression library in the SPL. @@ -749,7 +757,7 @@ config SPL_OF_LIBFDT config SPL_OF_LIBFDT_ASSUME_MASK hex "Mask of conditions to assume for libfdt" - depends on SPL_OF_LIBFDT || FIT + depends on SPL_OF_LIBFDT || (SPL && FIT) default 0xff help Use this to change the assumptions made by libfdt in SPL about the -- 2.20.1

2 5

[BUG] keyboard doesn't work on Olimex teres-I notebook
by Milan P. Stanić 08 Jun '22

08 Jun '22

[ Please CC to me, I'm not subscribed to mailing list ] Hi, On u-boot release 2022.04 keyboard doesn't work in u-boot on Olimex TERES-I notebook. With git bisect I found that commit 35ae126c16a6a9149edc6638faaa247f67b8a400 is introduced this. Reverting this commit solved problem and in my test keyboard now works. -- Kind regards

2 2

BUG in u-boot for ODROID-XU3/XU4/HC1/HC2
by Gabriel Hojda 08 Jun '22

08 Jun '22

hi, i've recently tried u-boot 2022.04 (u-boot-v2022.04.tar.bz2) and my odroid-hc2 didn't boot with uefi (default since Fedora 35) but worked when i used exlinux.conf trying to track down the problem, i've found that in the default u-boot environment the "board" and "boardname" variables were "smdk5420" and not "odroid" (like before) ... and thus the "fdtfile" variable was "exynos5422-smdk5420hc1.dtb" and not "exynos5422-odroidhc1.dtb". continuing i've made a diff between the u-boot-v2021.10.tar.bz2 and u-boot-v2022.04.tar.bz2 ... and long story short, i've found the culprit in commit f76750d1 "Convert CONFIG_CONS_INDEX et al to Kconfig" : ------------------------------------------------------------------------------------------------- --- u-boot-v2021.10/include/configs/odroid_xu3.h 2021-10-04 18:09:26.000000000 +0300 +++ u-boot-v2022.04/include/configs/odroid_xu3.h 2022-04-04 17:31:32.000000000 +0300 @@ -75,14 +75,11 @@ /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ #define CONFIG_ODROID_REV_AIN 9 -#define CONFIG_REVISION_TAG /* * Need to override existing one (smdk5420) with odroid so set_board_info will * use proper prefix when creating full board_name (SYS_BOARD + type) */ -#undef CONFIG_SYS_BOARD -#define CONFIG_SYS_BOARD "odroid" /* Define new extra env settings, including DFU settings */ #undef CONFIG_EXTRA_ENV_SETTINGS ------------------------------------------------------------------------------------------------- and following part needs a revert ------------------------------------------------------------------------------------------------- -#undef CONFIG_SYS_BOARD -#define CONFIG_SYS_BOARD "odroid" ------------------------------------------------------------------------------------------------- or, as an (untested) alternative, define CONFIG_SYS_BOARD correctly in board/samsung/smdk5420/Kconfig as follows: ------------------------------------------------------------------------------------------------- --- Kconfig 2022-04-04 17:31:32.000000000 +0300 +++ Kconfig.new 2022-05-28 02:57:19.867518057 +0300 @@ -1,7 +1,7 @@ if TARGET_ODROID_XU3 config SYS_BOARD - default "smdk5420" + default "odroid" config SYS_VENDOR default "samsung" ------------------------------------------------------------------------------------------------- Gabriel

2 2

[PATCH] fs/squashfs: sqfs_read: Prevent arbitrary code execution
by Miquel Raynal 08 Jun '22

08 Jun '22

Following Jincheng's report, an out-of-band write leading to arbitrary code execution is possible because on one side the squashfs logic accepts directory names up to 65535 bytes (u16), while U-Boot fs logic accepts directory names up to 255 bytes long. Prevent such an exploit from happening by capping directory name sizes to 255. Use a define for this purpose so that developers can link the limitation to its source and eventually kill it some day by dynamically allocating this array (if ever desired). Link: https://lore.kernel.org/all/CALO=DHFB+yBoXxVr5KcsK0iFdg+e7ywko4-e+72kjbcS8J… Reported-by: Jincheng Wang <jc.w4ng(a)gmail.com> Signed-off-by: Miquel Raynal <miquel.raynal(a)bootlin.com> --- Hello Jincheng, can you please give this fix a try? Thanks! Miquèl fs/squashfs/sqfs.c | 8 +++++--- include/fs.h | 4 +++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index b4484fa17f5..ee6ac8b3e4d 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -976,6 +976,7 @@ int sqfs_readdir(struct fs_dir_stream *fs_dirs, struct fs_dirent **dentp) int i_number, offset = 0, ret; struct fs_dirent *dent; unsigned char *ipos; + u16 name_size; dirs = (struct squashfs_dir_stream *)fs_dirs; if (!dirs->size) { @@ -1058,9 +1059,10 @@ int sqfs_readdir(struct fs_dir_stream *fs_dirs, struct fs_dirent **dentp) return -SQFS_STOP_READDIR; } - /* Set entry name */ - strncpy(dent->name, dirs->entry->name, dirs->entry->name_size + 1); - dent->name[dirs->entry->name_size + 1] = '\0'; + /* Set entry name (capped at FS_DIRENT_NAME_LEN which is a U-Boot limitation) */ + name_size = min_t(u16, dirs->entry->name_size, FS_DIRENT_NAME_LEN - 1); + strncpy(dent->name, dirs->entry->name, name_size); + dent->name[name_size] = '\0'; offset = dirs->entry->name_size + 1 + SQFS_ENTRY_BASE_LENGTH; dirs->entry_count--; diff --git a/include/fs.h b/include/fs.h index b43f16a692f..2195dc172ec 100644 --- a/include/fs.h +++ b/include/fs.h @@ -174,6 +174,8 @@ int fs_write(const char *filename, ulong addr, loff_t offset, loff_t len, #define FS_DT_REG 8 /* regular file */ #define FS_DT_LNK 10 /* symbolic link */ +#define FS_DIRENT_NAME_LEN 256 + /** * struct fs_dirent - directory entry * @@ -194,7 +196,7 @@ struct fs_dirent { /** change_time: time of last modification */ struct rtc_time change_time; /** name: file name */ - char name[256]; + char name[FS_DIRENT_NAME_LEN]; }; /* Note: fs_dir_stream should be treated as opaque to the user of fs layer */ -- 2.34.1

3 4

[PATCH] watchdog: add amlogic watchdog support
by Philippe Boos 08 Jun '22

08 Jun '22

Add support for hardware watchdog timer for Amlogic SoCs. This driver has been heavily inspired by his Linux equivalent (meson_gxbb_wdt.c). Reviewed-by: Jerome Brunet <jbrunet(a)baylibre.com> Signed-off-by: Philippe Boos <pboos(a)baylibre.com> --- This watchdog driver has been tested on a GXL libretech-cc board and also on a custom G12a board. I did the following test cases: * boot with a faulty boot command, then we reach watchdog reset successfully, * boot a Linux kernel with and without watchdog support, and check if it is working as expected. drivers/watchdog/Kconfig | 6 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/meson_gxbb_wdt.c | 126 ++++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 drivers/watchdog/meson_gxbb_wdt.c diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index c3eb8a8aec..81b60482c9 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -175,6 +175,12 @@ config WDT_MAX6370 help Select this to enable max6370 watchdog timer. +config WDT_MESON_GXBB + bool "Amlogic watchdog timer support" + depends on WDT + help + Amlogic watchdog timer support. + config WDT_MPC8xx bool "MPC8xx watchdog timer support" depends on WDT && MPC8xx diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 1f6199beca..0e2f582a5f 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_WDT_ORION) += orion_wdt.o obj-$(CONFIG_WDT_CDNS) += cdns_wdt.o obj-$(CONFIG_WDT_GPIO) += gpio_wdt.o obj-$(CONFIG_WDT_MAX6370) += max6370_wdt.o +obj-$(CONFIG_WDT_MESON_GXBB) += meson_gxbb_wdt.o obj-$(CONFIG_WDT_MPC8xx) += mpc8xx_wdt.o obj-$(CONFIG_WDT_MT7620) += mt7620_wdt.o obj-$(CONFIG_WDT_MT7621) += mt7621_wdt.o diff --git a/drivers/watchdog/meson_gxbb_wdt.c b/drivers/watchdog/meson_gxbb_wdt.c new file mode 100644 index 0000000000..56b8a8990c --- /dev/null +++ b/drivers/watchdog/meson_gxbb_wdt.c @@ -0,0 +1,126 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (c) 2022 BayLibre, SAS. + */ + +#include <clk.h> +#include <common.h> +#include <dm.h> +#include <dm/device_compat.h> +#include <reset.h> +#include <wdt.h> +#include <asm/io.h> +#include <linux/bitops.h> + +#define GXBB_WDT_CTRL_REG 0x0 +#define GXBB_WDT_TCNT_REG 0x8 +#define GXBB_WDT_RSET_REG 0xc + +#define GXBB_WDT_CTRL_CLKDIV_EN BIT(25) +#define GXBB_WDT_CTRL_CLK_EN BIT(24) +#define GXBB_WDT_CTRL_EE_RESET BIT(21) +#define GXBB_WDT_CTRL_EN BIT(18) + +#define GXBB_WDT_CTRL_DIV_MASK GENMASK(17, 0) +#define GXBB_WDT_TCNT_SETUP_MASK GENMASK(15, 0) + + +struct amlogic_wdt_priv { + void __iomem *reg_base; +}; + +static int amlogic_wdt_set_timeout(struct udevice *dev, u64 timeout_ms) +{ + struct amlogic_wdt_priv *data = dev_get_priv(dev); + + if (timeout_ms > GXBB_WDT_TCNT_SETUP_MASK) { + dev_warn(dev, "%s: timeout_ms=%llu: maximum watchdog timeout " + "exceeded\n", __func__, timeout_ms); + timeout_ms = GXBB_WDT_TCNT_SETUP_MASK; + } + + writel(timeout_ms, data->reg_base + GXBB_WDT_TCNT_REG); + + return 0; +} + +static int amlogic_wdt_stop(struct udevice *dev) +{ + struct amlogic_wdt_priv *data = dev_get_priv(dev); + + writel(readl(data->reg_base + GXBB_WDT_CTRL_REG) & ~GXBB_WDT_CTRL_EN, + data->reg_base + GXBB_WDT_CTRL_REG); + + return 0; +} + +static int amlogic_wdt_start(struct udevice *dev, u64 time_ms, ulong flags) +{ + struct amlogic_wdt_priv *data = dev_get_priv(dev); + + writel(readl(data->reg_base + GXBB_WDT_CTRL_REG) | GXBB_WDT_CTRL_EN, + data->reg_base + GXBB_WDT_CTRL_REG); + + return amlogic_wdt_set_timeout(dev, time_ms); +} + +static int amlogic_wdt_reset(struct udevice *dev) +{ + struct amlogic_wdt_priv *data = dev_get_priv(dev); + + writel(0, data->reg_base + GXBB_WDT_RSET_REG); + + return 0; +} + +static int amlogic_wdt_probe(struct udevice *dev) +{ + struct amlogic_wdt_priv *data = dev_get_priv(dev); + int ret; + + data->reg_base = dev_remap_addr(dev); + if (!data->reg_base) + return -EINVAL; + + struct clk clk; + + ret = clk_get_by_index(dev, 0, &clk); + if (ret) + return ret; + + ret = clk_enable(&clk); + if (ret) { + clk_free(&clk); + return ret; + } + + /* Setup with 1ms timebase */ + writel(((clk_get_rate(&clk) / 1000) & GXBB_WDT_CTRL_DIV_MASK) | + GXBB_WDT_CTRL_EE_RESET | + GXBB_WDT_CTRL_CLK_EN | + GXBB_WDT_CTRL_CLKDIV_EN, + data->reg_base + GXBB_WDT_CTRL_REG); + + return 0; +} + +static const struct wdt_ops amlogic_wdt_ops = { + .start = amlogic_wdt_start, + .reset = amlogic_wdt_reset, + .stop = amlogic_wdt_stop, +}; + +static const struct udevice_id amlogic_wdt_ids[] = { + { .compatible = "amlogic,meson-gxbb-wdt" }, + {} +}; + +U_BOOT_DRIVER(amlogic_wdt) = { + .name = "amlogic_wdt", + .id = UCLASS_WDT, + .of_match = amlogic_wdt_ids, + .priv_auto = sizeof(struct amlogic_wdt_priv), + .probe = amlogic_wdt_probe, + .ops = &amlogic_wdt_ops, + .flags = DM_FLAG_PRE_RELOC, +}; -- 2.20.1

3 3