December 2021 - U-Boot

[PATCH] ARM: mach-at91: Add compile time option to choose proper timer
by Hari Prasath 16 Dec '21

16 Dec '21

New SoC's of AT91 family with ARM-9 core includes a regular timer and a 64-bit timer.This patch adds a compile time option to the Makefile such that the old timer driver is chosen and compiled as default if none of timer configuration options are explicitly defined in the board configs. Signed-off-by: Hari Prasath <Hari.PrasathGE(a)microchip.com> --- arch/arm/mach-at91/arm926ejs/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-at91/arm926ejs/Makefile b/arch/arm/mach-at91/arm926ejs/Makefile index 8de6a2f966..c1904d535b 100644 --- a/arch/arm/mach-at91/arm926ejs/Makefile +++ b/arch/arm/mach-at91/arm926ejs/Makefile @@ -20,8 +20,11 @@ obj-$(CONFIG_AT91_LED) += led.o obj-y += clock.o obj-y += cpu.o obj-y += reset.o -ifeq ($(CONFIG_ATMEL_PIT_TIMER),) -obj-y += timer.o +ifneq ($(CONFIG_ATMEL_PIT_TIMER),y) +ifneq ($(CONFIG_MCHP_PIT64B_TIMER),y) +# old non-DM timer driver +obj-y += timer.o +endif endif ifndef CONFIG_SKIP_LOWLEVEL_INIT -- 2.17.1

2 1

[question] how is include path selected when compiling a .c file?
by Chan Kim 16 Dec '21

16 Dec '21

Hello, For example In file arch/arm/cpu/arm1136/mx31/timer.c, I see #include <common.h> #include <init.h> #include <asm/arch/imx-regs.h> #include <asm/io.h> There are 13 files named common.h files and 4405 files doing '#include <common.h>'. I can guess what file it is including but can't figure out exactly how the default include path (-I cflag ) is set for each .c file. I know the top Makefile has this line. UBOOTINCLUDE := \ -Iinclude \ $(if $(KBUILD_SRC), -I$(srctree)/include) \ $(if $(CONFIG_$(SPL_)SYS_THUMB_BUILD), \ $(if $(CONFIG_HAS_THUMB2), \ $(if $(CONFIG_CPU_V7M), \ -I$(srctree)/arch/arm/thumb1/include), \ -I$(srctree)/arch/arm/thumb1/include)) \ -I$(srctree)/arch/$(ARCH)/include \ -include $(srctree)/include/linux/kconfig.h And some other lower Makefiles additively add -I option according to the configuration. But still can't figure it out. For example in the above arch/arm/cpu/arm1136/mx31/timer.c file, I guess the #include <asm/arch/imx-regs.h> Is including ./arch/arm/include/asm/arch-mx31/imx-regs.h. Could anyone explain it to me? Thank you! Chan Kim

1 0

what is the purpose of timer_init() in board_init_r function in common/spl/spl.c?
by Chan Kim 16 Dec '21

16 Dec '21

Hello, I can't figure out why timer_init() is needed in board_init_r function for spl. (common/spl/spl.c) Why is it called there? I'm not sure if I have to provide a version for our board.. Any comment will be appreciated. Thank you. Chan Kim

1 0

[PULL] clock changes for v2022.01-rc3
by Sean Anderson 16 Dec '21

16 Dec '21

Hi Tom, The following changes since commit ade37460a944aed36ae6ee634c4d4a9a22690461: Prepare v2022.01-rc3 (2021-11-29 11:16:03 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-clk.git tags/clk-2022.01-rc3 for you to fetch changes up to 560e1e005093b1d62c53391d68960237294e7f89: clk: define LOG_CATEGORY for generic and ccf clocks (2021-12-15 12:16:16 -0500) CI: https://source.denx.de/u-boot/custodians/u-boot-clk/-/pipelines/10265 ---------------------------------------------------------------- Clock patches for v2022.01-rc3 This adds better logging support for many CCF drivers, and clarifies some documentation regarding clk_get_rate. ---------------------------------------------------------------- Giulio Benetti (1): clk: fix clk_get_rate() documentation Patrick Delaunay (2): clk: cosmetic: reorder include files clk: define LOG_CATEGORY for generic and ccf clocks drivers/clk/clk-composite.c | 9 ++++++--- drivers/clk/clk-divider.c | 6 +++++- drivers/clk/clk-fixed-factor.c | 13 +++++++++---- drivers/clk/clk-gate.c | 15 ++++++++++----- drivers/clk/clk-mux.c | 13 +++++++++---- drivers/clk/clk-uclass.c | 2 +- drivers/clk/clk.c | 20 +++++++++++--------- drivers/clk/clk_fixed_factor.c | 3 +++ drivers/clk/clk_fixed_rate.c | 3 +++ include/clk.h | 3 ++- 10 files changed, 59 insertions(+), 28 deletions(-)

2 1

[GIT PULL] rpi: updates for v2022.01
by Matthias Brugger 16 Dec '21

16 Dec '21

Hi Tom, Here come a small set of patches for v2022.01 for the RaspberryPi. You can find the passing tests here: https://source.denx.de/u-boot/custodians/u-boot-raspberrypi/-/pipelines/100… It's the same commit ID as the tag, although it's not the same test-run. Regards, Matthias --- The following changes since commit ade37460a944aed36ae6ee634c4d4a9a22690461: Prepare v2022.01-rc3 (2021-11-29 11:16:03 -0500) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-raspberrypi.git tags/rpi-next-2022.01 for you to fetch changes up to 874e544e89a7f9f42796b23f8d43c56e203b6e69: Fix MMC numbering issue for Raspberry Pi 3 (2021-11-30 16:07:40 +0100) ---------------------------------------------------------------- - enable RPi Zero 2 W - fix MMC numbering issue - Update link to documentation ---------------------------------------------------------------- Mike Karels (1): Fix MMC numbering issue for Raspberry Pi 3 Peter Robinson (2): rpi: Update the Raspberry Pi doucmentation URL rpi: Add identifier for the new RPi Zero 2 W board/raspberrypi/rpi/rpi.c | 7 ++++++- include/configs/rpi.h | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-)

2 1

[PATCH v2] squashfs: Fix file lookups on appended images
by Campbell Suter 15 Dec '21

15 Dec '21

Previously, sqfs_search_dir assumed that the root inode has the highest available ID. Unfortunately, this fails on appended images (those where you run mksquashfs multiple times) since the inodes there are arranged differently to those on a regular image. The squashfs format does contain a reference to the root inode. Unfortunately, it's stored as it's compressed block address and a byte offset into that block[1]. The only place we have access to that information is in sqfs_read_inode_table, so while it's ugly we find the root inode there and pass it back for later use. V2 of this patch fixes sqfs_opendir directly accessing an inode field, and instead uses the unaligned access function as it should. [1] In https://github.com/plougher/squashfs-tools/tree/b6f80b53: squashfs-tools/squashfs_fs.h line 154 squashfs-tools/read_fs.c line 950 Signed-off-by: Campbell Suter <campbell(a)snapit.group> --- fs/squashfs/sqfs.c | 65 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 56 insertions(+), 9 deletions(-) diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index e2d91c654c..5c05ddca38 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -442,7 +442,7 @@ static char *sqfs_resolve_symlink(struct squashfs_symlink_inode *sym, * table. */ static int sqfs_search_dir(struct squashfs_dir_stream *dirs, char **token_list, - int token_count, u32 *m_list, int m_count) + int token_count, u32 *m_list, int m_count, int root_inode) { struct squashfs_super_block *sblk = ctxt.sblk; char *path, *target, **sym_tokens, *res, *rem; @@ -463,7 +463,7 @@ static int sqfs_search_dir(struct squashfs_dir_stream *dirs, char **token_list, dirsp = (struct fs_dir_stream *)dirs; /* Start by root inode */ - table = sqfs_find_inode(dirs->inode_table, le32_to_cpu(sblk->inodes), + table = sqfs_find_inode(dirs->inode_table, root_inode, sblk->inodes, sblk->block_size); dir = (struct squashfs_dir_inode *)table; @@ -576,7 +576,7 @@ static int sqfs_search_dir(struct squashfs_dir_stream *dirs, char **token_list, dirs->entry = NULL; ret = sqfs_search_dir(dirs, sym_tokens, token_count, - m_list, m_count); + m_list, m_count, root_inode); goto out; } else if (!sqfs_is_dir(get_unaligned_le16(&dir->inode_type))) { printf("** Cannot find directory. **\n"); @@ -684,15 +684,17 @@ static int sqfs_get_metablk_pos(u32 *pos_list, void *table, u32 offset, return ret; } -static int sqfs_read_inode_table(unsigned char **inode_table) +static int sqfs_read_inode_table(unsigned char **inode_table, + const struct squashfs_base_inode **root_inode) { struct squashfs_super_block *sblk = ctxt.sblk; - u64 start, n_blks, table_offset, table_size; + u64 start, n_blks, table_offset, src_table_pos = 0, table_size; int j, ret = 0, metablks_count; unsigned char *src_table, *itb; u32 src_len, dest_offset = 0; unsigned long dest_len = 0; bool compressed; + u64 root_inode_block, root_inode_offset; table_size = get_unaligned_le64(&sblk->directory_table_start) - get_unaligned_le64(&sblk->inode_table_start); @@ -701,6 +703,13 @@ static int sqfs_read_inode_table(unsigned char **inode_table) n_blks = sqfs_calc_n_blks(sblk->inode_table_start, sblk->directory_table_start, &table_offset); + /* + * Value to indicate 'not found' - set it here so that it's not unset + * in case of an error. + */ + if (root_inode) + *root_inode = NULL; + /* Allocate a proper sized buffer (itb) to store the inode table */ itb = malloc_cache_aligned(n_blks * ctxt.cur_dev->blksz); if (!itb) @@ -733,8 +742,34 @@ static int sqfs_read_inode_table(unsigned char **inode_table) src_table = itb + table_offset + SQFS_HEADER_SIZE; + /* + * While we're here, find the root inode. It's specified by an on-disk + * block position and offset, which we can't look up anywhere else if + * the metadata is compressed. Thus find it's inode index, which can + * later be used to look it up. + * + * Note that while directory entries also have these offset + * parameters, they also include the inode number which is what this + * implementation uses to look them up. + */ + root_inode_block = (u64)le64_to_cpu(sblk->root_inode) >> 16; + root_inode_offset = (u64)le64_to_cpu(sblk->root_inode) & 0xffff; + /* Extract compressed Inode table */ for (j = 0; j < metablks_count; j++) { + /* + * Check if we're at the raw block offset the root inode is + * specified to live at, and if so point the root inode to + * where it's about to end up. + * + * Note we're doing this now, before dest_offset has been + * pointed to the next block. + */ + if (src_table_pos == root_inode_block && root_inode) { + *root_inode = (const struct squashfs_base_inode *) + (*inode_table + dest_offset + root_inode_offset); + } + sqfs_read_metablock(itb, table_offset, &compressed, &src_len); if (compressed) { dest_len = SQFS_METADATA_BLOCK_SIZE; @@ -749,8 +784,8 @@ static int sqfs_read_inode_table(unsigned char **inode_table) dest_offset += dest_len; } else { - memcpy(*inode_table + (j * SQFS_METADATA_BLOCK_SIZE), - src_table, src_len); + memcpy(*inode_table + dest_offset, src_table, src_len); + dest_offset += SQFS_METADATA_BLOCK_SIZE; } /* @@ -760,6 +795,17 @@ static int sqfs_read_inode_table(unsigned char **inode_table) table_offset += src_len + SQFS_HEADER_SIZE; src_table += src_len + SQFS_HEADER_SIZE; + src_table_pos += src_len + SQFS_HEADER_SIZE; + } + + /* + * If we couldn't find the inode, return an error to reduce the chance + * someone will try to index this null pointer. + */ + if (root_inode && !*root_inode) { + printf("Failed to locate root squashfs inode.\n"); + ret = -ENOENT; + goto free_itb; } free_itb: @@ -875,6 +921,7 @@ int sqfs_opendir(const char *filename, struct fs_dir_stream **dirsp) struct squashfs_dir_stream *dirs; char **token_list = NULL, *path = NULL; u32 *pos_list = NULL; + const struct squashfs_base_inode *root_inode = NULL; dirs = calloc(1, sizeof(*dirs)); if (!dirs) @@ -887,7 +934,7 @@ int sqfs_opendir(const char *filename, struct fs_dir_stream **dirsp) dirs->inode_table = NULL; dirs->dir_table = NULL; - ret = sqfs_read_inode_table(&inode_table); + ret = sqfs_read_inode_table(&inode_table, &root_inode); if (ret) { ret = -EINVAL; goto out; @@ -929,7 +976,7 @@ int sqfs_opendir(const char *filename, struct fs_dir_stream **dirsp) dirs->inode_table = inode_table; dirs->dir_table = dir_table; ret = sqfs_search_dir(dirs, token_list, token_count, pos_list, - metablks_count); + metablks_count, (int)get_unaligned_le32(&root_inode->inode_number)); if (ret) goto out; -- 2.33.1

1 0

[PATCH 1/2] clk: cosmetic: reorder include files
by Patrick Delaunay 15 Dec '21

15 Dec '21

Reorder include files in the U-Boot expected order: the common.h header should always be first, followed by other headers in order, then headers with directories, then local files. It is a preliminary step for next patch. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)foss.st.com> --- drivers/clk/clk-composite.c | 6 +++--- drivers/clk/clk-fixed-factor.c | 9 +++++---- drivers/clk/clk-gate.c | 9 +++++---- drivers/clk/clk-mux.c | 5 +++-- drivers/clk/clk-uclass.c | 2 +- drivers/clk/clk.c | 2 +- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c index bb5351ebc0..12288e10b3 100644 --- a/drivers/clk/clk-composite.c +++ b/drivers/clk/clk-composite.c @@ -5,13 +5,13 @@ */ #include <common.h> -#include <asm/io.h> -#include <malloc.h> +#include <clk.h> #include <clk-uclass.h> +#include <malloc.h> +#include <asm/io.h> #include <dm/device.h> #include <dm/devres.h> #include <linux/clk-provider.h> -#include <clk.h> #include <linux/err.h> #include "clk.h" diff --git a/drivers/clk/clk-fixed-factor.c b/drivers/clk/clk-fixed-factor.c index 8d9823bdab..9fcf30fd2e 100644 --- a/drivers/clk/clk-fixed-factor.c +++ b/drivers/clk/clk-fixed-factor.c @@ -6,16 +6,17 @@ * Copyright (C) 2011 Sascha Hauer, Pengutronix <s.hauer(a)pengutronix.de> */ #include <common.h> -#include <malloc.h> +#include <clk.h> #include <clk-uclass.h> +#include <div64.h> +#include <malloc.h> #include <dm/device.h> #include <dm/devres.h> #include <linux/clk-provider.h> -#include <div64.h> -#include <clk.h> -#include "clk.h" #include <linux/err.h> +#include "clk.h" + #define UBOOT_DM_CLK_IMX_FIXED_FACTOR "ccf_clk_fixed_factor" static ulong clk_factor_recalc_rate(struct clk *clk) diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index 006d3b6629..708499d95a 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -8,17 +8,18 @@ */ #include <common.h> -#include <asm/io.h> -#include <malloc.h> +#include <clk.h> #include <clk-uclass.h> +#include <malloc.h> +#include <asm/io.h> #include <dm/device.h> #include <dm/devres.h> #include <linux/bitops.h> #include <linux/clk-provider.h> -#include <clk.h> -#include "clk.h" #include <linux/err.h> +#include "clk.h" + #define UBOOT_DM_CLK_GATE "clk_gate" /** diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index f1becd20d8..fd746f2de3 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -24,14 +24,15 @@ #include <common.h> #include <clk.h> #include <clk-uclass.h> +#include <malloc.h> +#include <asm/io.h> #include <dm/device.h> #include <dm/devres.h> #include <dm/uclass.h> #include <linux/bitops.h> -#include <malloc.h> -#include <asm/io.h> #include <linux/clk-provider.h> #include <linux/err.h> + #include "clk.h" #define UBOOT_DM_CLK_CCF_MUX "ccf_clk_mux" diff --git a/drivers/clk/clk-uclass.c b/drivers/clk/clk-uclass.c index 493018b33e..f2d2642754 100644 --- a/drivers/clk/clk-uclass.c +++ b/drivers/clk/clk-uclass.c @@ -16,6 +16,7 @@ #include <errno.h> #include <log.h> #include <malloc.h> +#include <asm/global_data.h> #include <dm/device_compat.h> #include <dm/device-internal.h> #include <dm/devres.h> @@ -23,7 +24,6 @@ #include <linux/bug.h> #include <linux/clk-provider.h> #include <linux/err.h> -#include <asm/global_data.h> static inline const struct clk_ops *clk_dev_ops(struct udevice *dev) { diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index 1efb7fe9f3..d1a9787071 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -5,13 +5,13 @@ */ #include <common.h> +#include <clk.h> #include <clk-uclass.h> #include <log.h> #include <dm/device.h> #include <dm/uclass.h> #include <dm/lists.h> #include <dm/device-internal.h> -#include <clk.h> int clk_register(struct clk *clk, const char *drv_name, const char *name, const char *parent_name) -- 2.25.1

2 4

[PATCH] clk: fix clk_get_rate() documentation
by Giulio Benetti 15 Dec '21

15 Dec '21

clk_get_rate() can't and doesn't return -ve on error, it actually returns 0 on error or a value greater than 0 on success. So let's fix its documentation. Signed-off-by: Giulio Benetti <giulio.benetti(a)benettiengineering.com> --- include/clk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/clk.h b/include/clk.h index ca6b85fa6f..a833d6a27b 100644 --- a/include/clk.h +++ b/include/clk.h @@ -344,7 +344,7 @@ int clk_free(struct clk *clk); * * @clk: A clock struct that was previously successfully requested by * clk_request/get_by_*(). - * @return clock rate in Hz, or -ve error code. + * @return clock rate in Hz on success, or 0 on error. */ ulong clk_get_rate(struct clk *clk); -- 2.25.1

5 15

[PATCH 1/2] clk: cdce9xx: Convert .of_xlate to .request
by Sean Anderson 15 Dec '21

15 Dec '21

This xlate function just performs some checking. We can do this in request() instead and use the default xlate. Signed-off-by: Sean Anderson <seanga2(a)gmail.com> --- drivers/clk/clk-cdce9xx.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/clk/clk-cdce9xx.c b/drivers/clk/clk-cdce9xx.c index 6634b7b799..c15e9f210e 100644 --- a/drivers/clk/clk-cdce9xx.c +++ b/drivers/clk/clk-cdce9xx.c @@ -86,19 +86,13 @@ static int cdce9xx_reg_write(struct udevice *dev, u8 addr, u8 val) return ret; } -static int cdce9xx_clk_of_xlate(struct clk *clk, - struct ofnode_phandle_args *args) +static int cdce9xx_clk_of_request(struct clk *clk) { struct cdce9xx_clk_data *data = dev_get_priv(clk->dev); - if (args->args_count != 1) + if (clk->id > data->chip->num_outputs) return -EINVAL; - if (args->args[0] > data->chip->num_outputs) - return -EINVAL; - - clk->id = args->args[0]; - return 0; } @@ -241,7 +235,7 @@ static const struct udevice_id cdce9xx_clk_of_match[] = { }; static const struct clk_ops cdce9xx_clk_ops = { - .of_xlate = cdce9xx_clk_of_xlate, + .request = cdce9xx_clk_request, .get_rate = cdce9xx_clk_get_rate, .set_rate = cdce9xx_clk_set_rate, }; -- 2.33.0

3 6

[PATCH] arm: mach-k3: am642_init: Unlock MCU PADCFG regs
by Christian Gmeiner 15 Dec '21

15 Dec '21

From: Michael Liebert <liebert(a)ibv-augsburg.de> Currently only the PADCFG registers of the main domain are unlocked. Also unlock PADCFG registers of MCU domain, so MCU pin muxing can be configured by u-boot or Linux. Signed-off-by: Michael Liebert <liebert(a)ibv-augsburg.de> Tested-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- arch/arm/mach-k3/am642_init.c | 3 +++ arch/arm/mach-k3/include/mach/am64_hardware.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/arch/arm/mach-k3/am642_init.c b/arch/arm/mach-k3/am642_init.c index 533905daeb..958fa05af4 100644 --- a/arch/arm/mach-k3/am642_init.c +++ b/arch/arm/mach-k3/am642_init.c @@ -37,6 +37,9 @@ static void ctrl_mmr_unlock(void) mmr_unlock(CTRL_MMR0_BASE, 3); mmr_unlock(CTRL_MMR0_BASE, 5); mmr_unlock(CTRL_MMR0_BASE, 6); + + /* Unlock all MCU_PADCFG_MMR1 module registers */ + mmr_unlock(MCU_PADCFG_MMR1_BASE, 1); } /* diff --git a/arch/arm/mach-k3/include/mach/am64_hardware.h b/arch/arm/mach-k3/include/mach/am64_hardware.h index 96383437d5..e06e1f9532 100644 --- a/arch/arm/mach-k3/include/mach/am64_hardware.h +++ b/arch/arm/mach-k3/include/mach/am64_hardware.h @@ -12,6 +12,8 @@ #define PADCFG_MMR1_BASE 0xf0000 +#define MCU_PADCFG_MMR1_BASE 0x04080000 + #define MAIN_DEVSTAT_PRIMARY_BOOTMODE_MASK 0x00000078 #define MAIN_DEVSTAT_PRIMARY_BOOTMODE_SHIFT 3 -- 2.33.1

1 0