July 2023 - U-Boot

[PATCH 1/1] part: eliminate part_get_info_by_name_type()
by Heinrich Schuchardt 25 Jul '23

25 Jul '23

Since commit 56670d6fb83f ("disk: part: use common api to lookup part driver") part_get_info_by_name_type() ignores the part_type parameter used to restrict the partition table type. omap_mmc_get_part_size() and part_get_info_by_name() are the only consumers. omap_mmc_get_part_size() calls with part_type = PART_TYPE_EFI because at the time of implementation a speed up could be gained by passing the partition table type. After 5 years experience without this restriction it looks safe to keep it that way. part_get_info_by_name() uses PART_TYPE_ALL. Move the logic of part_get_info_by_name_type() to part_get_info_by_name() and replace the function in omap_mmc_get_part_size(). Fixes: 56670d6fb83f ("disk: part: use common api to lookup part driver") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- arch/arm/mach-omap2/utils.c | 3 +-- disk/part.c | 10 ++-------- include/part.h | 23 ----------------------- 3 files changed, 3 insertions(+), 33 deletions(-) diff --git a/arch/arm/mach-omap2/utils.c b/arch/arm/mach-omap2/utils.c index 6e6791fc65..7d938724f8 100644 --- a/arch/arm/mach-omap2/utils.c +++ b/arch/arm/mach-omap2/utils.c @@ -100,8 +100,7 @@ static u32 omap_mmc_get_part_size(const char *part) return 0; } - /* Check only for EFI (GPT) partition table */ - res = part_get_info_by_name_type(dev_desc, part, &info, PART_TYPE_EFI); + res = part_get_info_by_name(dev_desc, part, &info); if (res < 0) return 0; diff --git a/disk/part.c b/disk/part.c index 35300df590..aeb4bf3b68 100644 --- a/disk/part.c +++ b/disk/part.c @@ -630,8 +630,8 @@ cleanup: return ret; } -int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, - struct disk_partition *info, int part_type) +int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, + struct disk_partition *info) { struct part_driver *part_drv; int ret; @@ -662,12 +662,6 @@ int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, return -ENOENT; } -int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, - struct disk_partition *info) -{ - return part_get_info_by_name_type(dev_desc, name, info, PART_TYPE_ALL); -} - /** * Get partition info from device number and partition name. * diff --git a/include/part.h b/include/part.h index be75c73549..29bdeeeccc 100644 --- a/include/part.h +++ b/include/part.h @@ -184,21 +184,6 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str, struct blk_desc **dev_desc, struct disk_partition *info, int allow_whole_dev); -/** - * part_get_info_by_name_type() - Search for a partition by name - * for only specified partition type - * - * @param dev_desc - block device descriptor - * @param gpt_name - the specified table entry name - * @param info - returns the disk partition info - * @param part_type - only search in partitions of this type - * - * Return: - the partition number on match (starting on 1), -1 on no match, - * otherwise error - */ -int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name, - struct disk_partition *info, int part_type); - /** * part_get_info_by_name() - Search for a partition by name * among all available registered partitions @@ -276,14 +261,6 @@ static inline int blk_get_device_part_str(const char *ifname, int allow_whole_dev) { *dev_desc = NULL; return -1; } -static inline int part_get_info_by_name_type(struct blk_desc *dev_desc, - const char *name, - struct disk_partition *info, - int part_type) -{ - return -ENOENT; -} - static inline int part_get_info_by_name(struct blk_desc *dev_desc, const char *name, struct disk_partition *info) -- 2.40.1

3 3

[PATCH] .mailmap: Correct entires for Masahiro Yamada
by Tom Rini 25 Jul '23

25 Jul '23

His entries had the correct email address listed last rather than first, correct this. Fixes 4fa4227cdd14 (".mailmap: Record all address for main U-Boot contributor") Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .mailmap | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 312a428dc9f6..05cb310e416f 100644 --- a/.mailmap +++ b/.mailmap @@ -65,8 +65,8 @@ Marek Vasut <marex(a)denx.de> <marek.vasut+renesas(a)gmail.com> Marek Vasut <marex(a)denx.de> <marek.vasut(a)gmail.com> Marek Vasut <marex(a)denx.de> <marex at denx.de> Markus Klotzbuecher <mk(a)denx.de> -Masahiro Yamada <yamada.masahiro(a)socionext.com> <masahiroy(a)kernel.org> -Masahiro Yamada <yamada.masahiro(a)socionext.com> <yamada.m(a)jp.panasonic.com> +Masahiro Yamada <masahiroy(a)kernel.org> <yamada.masahiro(a)socionext.com> +Masahiro Yamada <masahiroy(a)kernel.org> <yamada.m(a)jp.panasonic.com> Michal Simek <michal.simek(a)amd.com> <Monstr(a)seznam.cz> Michal Simek <michal.simek(a)amd.com> <michal.simek(a)xilinx.com> Michal Simek <michal.simek(a)amd.com> <monstr(a)monstr.eu> -- 2.34.1

2 2

[PATCH 1/1] test: avoid function name 'setup'
by Heinrich Schuchardt 25 Jul '23

25 Jul '23

pytest 7.3.2 treats the function name 'setup' as a fixture [1]. This leads to errors like: TypeError: setup() missing 2 required positional arguments: 'disk_img' and 'osindications' Rename setup() to capsule_setup(). [1] How to run tests written for nose https://docs.pytest.org/en/7.3.x/how-to/nose.html Fixes: 482ef90aeb4c ("test: efi_capsule: refactor efi_capsule test") Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- test/py/tests/test_efi_capsule/capsule_common.py | 2 +- .../test_efi_capsule/test_capsule_firmware_fit.py | 10 +++++----- .../test_efi_capsule/test_capsule_firmware_raw.py | 12 ++++++------ .../test_capsule_firmware_signed_fit.py | 12 ++++++------ .../test_capsule_firmware_signed_raw.py | 12 ++++++------ 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/test/py/tests/test_efi_capsule/capsule_common.py b/test/py/tests/test_efi_capsule/capsule_common.py index 9eef6767a6..fc0d851c61 100644 --- a/test/py/tests/test_efi_capsule/capsule_common.py +++ b/test/py/tests/test_efi_capsule/capsule_common.py @@ -6,7 +6,7 @@ from capsule_defs import CAPSULE_DATA_DIR, CAPSULE_INSTALL_DIR -def setup(u_boot_console, disk_img, osindications): +def capsule_setup(u_boot_console, disk_img, osindications): """setup the test Args: diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py index a3094c33f4..11bcdc2bb2 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py @@ -8,7 +8,7 @@ This test verifies capsule-on-disk firmware update for FIT images import pytest from capsule_common import ( - setup, + capsule_setup, init_content, place_capsule_file, exec_manual_update, @@ -49,7 +49,7 @@ class TestEfiCapsuleFirmwareFit(): disk_img = efi_capsule_data capsule_files = ['Test05'] with u_boot_console.log.section('Test Case 1-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') init_content(u_boot_console, '150000', 'u-boot.env.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -81,7 +81,7 @@ class TestEfiCapsuleFirmwareFit(): disk_img = efi_capsule_data capsule_files = ['Test04'] with u_boot_console.log.section('Test Case 2-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') init_content(u_boot_console, '150000', 'u-boot.env.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -116,7 +116,7 @@ class TestEfiCapsuleFirmwareFit(): disk_img = efi_capsule_data capsule_files = ['Test104'] with u_boot_console.log.section('Test Case 3-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') init_content(u_boot_console, '150000', 'u-boot.env.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -165,7 +165,7 @@ class TestEfiCapsuleFirmwareFit(): disk_img = efi_capsule_data capsule_files = ['Test105'] with u_boot_console.log.section('Test Case 4-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py index 80d791e3de..a5b5c8a385 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_raw.py @@ -8,7 +8,7 @@ This test verifies capsule-on-disk firmware update for raw images import pytest from capsule_common import ( - setup, + capsule_setup, init_content, place_capsule_file, exec_manual_update, @@ -51,7 +51,7 @@ class TestEfiCapsuleFirmwareRaw: disk_img = efi_capsule_data capsule_files = ['Test03'] with u_boot_console.log.section('Test Case 1-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') init_content(u_boot_console, '150000', 'u-boot.env.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -83,7 +83,7 @@ class TestEfiCapsuleFirmwareRaw: disk_img = efi_capsule_data capsule_files = ['Test01', 'Test02'] with u_boot_console.log.section('Test Case 2-a, before reboot'): - setup(u_boot_console, disk_img, None) + capsule_setup(u_boot_console, disk_img, None) init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') init_content(u_boot_console, '150000', 'u-boot.env.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -111,7 +111,7 @@ class TestEfiCapsuleFirmwareRaw: disk_img = efi_capsule_data capsule_files = ['Test01', 'Test02'] with u_boot_console.log.section('Test Case 3-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') init_content(u_boot_console, '150000', 'u-boot.env.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -157,7 +157,7 @@ class TestEfiCapsuleFirmwareRaw: disk_img = efi_capsule_data capsule_files = ['Test101', 'Test102'] with u_boot_console.log.section('Test Case 4-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') init_content(u_boot_console, '150000', 'u-boot.env.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -211,7 +211,7 @@ class TestEfiCapsuleFirmwareRaw: disk_img = efi_capsule_data capsule_files = ['Test103'] with u_boot_console.log.section('Test Case 5-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py index 94d6c3eef0..44a58baa31 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py @@ -11,7 +11,7 @@ with signed capsule files containing FIT images import pytest from capsule_common import ( - setup, + capsule_setup, init_content, place_capsule_file, exec_manual_update, @@ -47,7 +47,7 @@ class TestEfiCapsuleFirmwareSignedFit(): disk_img = efi_capsule_data capsule_files = ['Test13'] with u_boot_console.log.section('Test Case 1-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -76,7 +76,7 @@ class TestEfiCapsuleFirmwareSignedFit(): disk_img = efi_capsule_data capsule_files = ['Test14'] with u_boot_console.log.section('Test Case 2-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -107,7 +107,7 @@ class TestEfiCapsuleFirmwareSignedFit(): disk_img = efi_capsule_data capsule_files = ['Test02'] with u_boot_console.log.section('Test Case 3-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -137,7 +137,7 @@ class TestEfiCapsuleFirmwareSignedFit(): disk_img = efi_capsule_data capsule_files = ['Test114'] with u_boot_console.log.section('Test Case 4-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -176,7 +176,7 @@ class TestEfiCapsuleFirmwareSignedFit(): disk_img = efi_capsule_data capsule_files = ['Test115'] with u_boot_console.log.section('Test Case 5-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py index ad2b1c6324..83a10e160b 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py @@ -9,7 +9,7 @@ with signed capsule files containing raw images import pytest from capsule_common import ( - setup, + capsule_setup, init_content, place_capsule_file, exec_manual_update, @@ -44,7 +44,7 @@ class TestEfiCapsuleFirmwareSignedRaw(): disk_img = efi_capsule_data capsule_files = ['Test11'] with u_boot_console.log.section('Test Case 1-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -72,7 +72,7 @@ class TestEfiCapsuleFirmwareSignedRaw(): disk_img = efi_capsule_data capsule_files = ['Test12'] with u_boot_console.log.section('Test Case 2-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -101,7 +101,7 @@ class TestEfiCapsuleFirmwareSignedRaw(): disk_img = efi_capsule_data capsule_files = ['Test02'] with u_boot_console.log.section('Test Case 3-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -131,7 +131,7 @@ class TestEfiCapsuleFirmwareSignedRaw(): disk_img = efi_capsule_data capsule_files = ['Test111', 'Test112'] with u_boot_console.log.section('Test Case 4-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) @@ -175,7 +175,7 @@ class TestEfiCapsuleFirmwareSignedRaw(): disk_img = efi_capsule_data capsule_files = ['Test113'] with u_boot_console.log.section('Test Case 5-a, before reboot'): - setup(u_boot_console, disk_img, '0x0000000000000004') + capsule_setup(u_boot_console, disk_img, '0x0000000000000004') init_content(u_boot_console, '100000', 'u-boot.bin.old', 'Old') place_capsule_file(u_boot_console, capsule_files) -- 2.40.1

4 4

[PATCH] common: define time_t as 64bit
by Heinrich Schuchardt 25 Jul '23

25 Jul '23

To avoid the year 2038 problem time_t must be 64bit on all architectures. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- include/linux/types.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/types.h b/include/linux/types.h index baa2c491ea..9df930afd1 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -65,7 +65,7 @@ typedef __kernel_ptrdiff_t ptrdiff_t; #ifndef _TIME_T #define _TIME_T -typedef __kernel_time_t time_t; +typedef long long time_t; #endif #ifndef _CLOCK_T -- 2.40.1

2 1

[PATCH] fwu: Show number of attempts in Trial State
by Michal Simek 25 Jul '23

25 Jul '23

It is not visible anywhere in Trial State if this is the first, second, etc attempt that's why show a message to be aware about status. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- lib/fwu_updates/fwu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c index 38b50cb7628c..4d0c8b84b9d0 100644 --- a/lib/fwu_updates/fwu.c +++ b/lib/fwu_updates/fwu.c @@ -95,6 +95,8 @@ static int fwu_trial_count_update(void) log_err("Unable to revert active_index\n"); ret = 1; } else { + log_info("Trial State count: attempt %d out of %d\n", + trial_state_ctr, CONFIG_FWU_TRIAL_STATE_CNT); ret = trial_counter_update(&trial_state_ctr); if (ret) log_err("Unable to increment TrialStateCtr variable\n"); -- 2.36.1

3 2

[PATCH] fwu: mtd: Fix dfu_alt_info generation for 2 images per bank
by Michal Simek 25 Jul '23

25 Jul '23

Code rewrites the last char of size with adding &. It is visible from dfu_alt_info print before this patch: Make dfu_alt_info: 'mtd nor0=bank0 raw 2320000 80000;bank1 raw 27a0000 8000&mtd nor0=bank0 raw 23a0000 4000000;bank1 raw 2820000 4000000' And after it: Make dfu_alt_info: 'mtd nor0=bank0 raw 2320000 80000;bank1 raw 27a0000 80000&mtd nor0=bank0 raw 23a0000 4000000;bank1 raw 2820000 4000000' Size for bank0 and bank1 must be the same because it is the same image. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- lib/fwu_updates/fwu_mtd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/fwu_updates/fwu_mtd.c b/lib/fwu_updates/fwu_mtd.c index b73111ae24da..69cd3d7001f9 100644 --- a/lib/fwu_updates/fwu_mtd.c +++ b/lib/fwu_updates/fwu_mtd.c @@ -175,8 +175,10 @@ int fwu_gen_alt_info_from_mtd(char *buf, size_t len, struct mtd_info *mtd) l = strlen(buf); /* Replace the last ';' with '&' if there is another image. */ - if (i != CONFIG_FWU_NUM_IMAGES_PER_BANK - 1 && l) - buf[l - 1] = '&'; + if (i != CONFIG_FWU_NUM_IMAGES_PER_BANK - 1 && l) { + buf[l] = '&'; + buf++; + } len -= l; buf += l; } -- 2.36.1

3 2

[PATCH] fwu: Allow code to properly decode trial state
by Michal Simek 25 Jul '23

25 Jul '23

Current code after capsule update (mtd write) is not changing active_index in mdata to previous_active_index. On the reboot this is shown but showing message "Boot idx 1 is not matching active idx 0, changing active_idx" which is changing active_idx and writing mdata to flash. But when this message is visible it is not checking which state that images are. If they have acceptance bit setup to yes everything is fine and valid images are booted (doesn't mean the latest one). But if acceptance bit is no and images are in trial state in_trial variable is never setup. Which means that from new flashed image stable image can be rewritten because in_trial is not setup properly. Signed-off-by: Michal Simek <michal.simek(a)amd.com> --- lib/fwu_updates/fwu.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c index cd5c3b64773b..38b50cb7628c 100644 --- a/lib/fwu_updates/fwu.c +++ b/lib/fwu_updates/fwu.c @@ -666,8 +666,6 @@ static int fwu_boottime_checks(void *ctx, struct event *event) ret = fwu_set_active_index(boot_idx); if (!ret) boottime_check = 1; - - return 0; } if (efi_init_obj_list() != EFI_SUCCESS) -- 2.36.1

3 2

[PATCH] drivers: rtc: max313xx: provide read8/write8
by Chris Packham 25 Jul '23

25 Jul '23

In some designs the MAX313xx RTC may need calibration to cope with oscillator inaccuracies. Provide read8/write8 ops so that the registers can be accessed. Because the driver covers a range of MAX313xx variants no attempt is made to ensure the register is valid. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- drivers/rtc/max313xx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/rtc/max313xx.c b/drivers/rtc/max313xx.c index 748f3c42c30e..60400235dd0f 100644 --- a/drivers/rtc/max313xx.c +++ b/drivers/rtc/max313xx.c @@ -326,10 +326,22 @@ static int max313xx_reset(struct udevice *dev) return ret; } +static int max313xx_read8(struct udevice *dev, unsigned int reg) +{ + return dm_i2c_reg_read(dev, reg); +} + +static int max313xx_write8(struct udevice *dev, unsigned int reg, int val) +{ + return dm_i2c_reg_write(dev, reg, val); +} + static const struct rtc_ops max3133x_rtc_ops = { .get = max313xx_read_time, .set = max313xx_set_time, .reset = max313xx_reset, + .read8 = max313xx_read8, + .write8 = max313xx_write8, }; static int max313xx_init(struct udevice *dev) -- 2.41.0

2 1

[PATCH v2] lib: sparse: allocate FASTBOOT_MAX_BLK_WRITE instead of small number
by Mattijs Korpershoek 25 Jul '23

25 Jul '23

Commit 62649165cb02 ("lib: sparse: Make CHUNK_TYPE_RAW buffer aligned") fixed cache alignment for systems with a D-CACHE. However it introduced some performance regressions [1] on system flashing huge images, such as Android. On AM62x SK EVM, we also observe such performance penalty: Sending sparse 'super' 1/2 (768793 KB) OKAY [ 23.954s] Writing 'super' OKAY [ 75.926s] Sending sparse 'super' 2/2 (629819 KB) OKAY [ 19.641s] Writing 'super' OKAY [ 62.849s] Finished. Total time: 182.474s The reason for this is that we use an arbitrary small buffer (info->blksz * 100) for transferring. Fix it by using a bigger buffer (info->blksz * FASTBOOT_MAX_BLK_WRITE) as suggested in the original's patch review [2]. With this patch, performance impact is mitigated: Sending sparse 'super' 1/2 (768793 KB) OKAY [ 23.912s] Writing 'super' OKAY [ 15.780s] Sending sparse 'super' 2/2 (629819 KB) OKAY [ 19.581s] Writing 'super' OKAY [ 17.192s] Finished. Total time: 76.569s [1] https://lore.kernel.org/r/20221118121323.4009193-1-gary.bisson@boundarydevi… [2] https://lore.kernel.org/r/all/43e4c17c-4483-ec8e-f843-9b4c5569bd18@seco.com/ Fixes: 62649165cb02 ("lib: sparse: Make CHUNK_TYPE_RAW buffer aligned") Signed-off-by: Mattijs Korpershoek <mkorpershoek(a)baylibre.com> --- Changes in v2: - Use FASTBOOT_MAX_BLK_WRITE instead of blkcnt (Qianfan) - Link to v1: https://lore.kernel.org/r/20230616-sparse-flash-fix-v1-1-6bafeacc567b@bayli… --- drivers/fastboot/fb_mmc.c | 2 -- include/image-sparse.h | 2 ++ lib/image-sparse.c | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 9d25c402028a..060918e49109 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -19,8 +19,6 @@ #include <linux/compat.h> #include <android_image.h> -#define FASTBOOT_MAX_BLK_WRITE 16384 - #define BOOT_PARTITION_NAME "boot" struct fb_mmc_sparse { diff --git a/include/image-sparse.h b/include/image-sparse.h index 0572dbd0a283..282a0b256498 100644 --- a/include/image-sparse.h +++ b/include/image-sparse.h @@ -7,6 +7,8 @@ #include <part.h> #include <sparse_format.h> +#define FASTBOOT_MAX_BLK_WRITE 16384 + #define ROUNDUP(x, y) (((x) + ((y) - 1)) & ~((y) - 1)) struct sparse_storage { diff --git a/lib/image-sparse.c b/lib/image-sparse.c index 5ec0f94ab3eb..8f8a67e15804 100644 --- a/lib/image-sparse.c +++ b/lib/image-sparse.c @@ -55,7 +55,8 @@ static lbaint_t write_sparse_chunk_raw(struct sparse_storage *info, void *data, char *response) { - lbaint_t n = blkcnt, write_blks, blks = 0, aligned_buf_blks = 100; + lbaint_t n = blkcnt, write_blks, blks = 0; + lbaint_t aligned_buf_blks = FASTBOOT_MAX_BLK_WRITE; uint32_t *aligned_buf = NULL; if (CONFIG_IS_ENABLED(SYS_DCACHE_OFF)) { --- base-commit: 923de765ee1a5b26310f02cb42dcbad9e2b011c5 change-id: 20230616-sparse-flash-fix-9c2852aa8d16 Best regards, -- Mattijs Korpershoek <mkorpershoek(a)baylibre.com>

3 3

[PATCH] drivers: led: bcm6858: do not use null label to find the top
by Philippe Reynes 25 Jul '23

25 Jul '23

This driver considers that a node with an empty label is the top. But the led class has changed, if a label is not provided for a led, the label is filed with the node name. So we update this driver to use a wrapper to manage the top led node. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- drivers/led/led_bcm6858.c | 122 ++++++++++++++++++++------------------ 1 file changed, 64 insertions(+), 58 deletions(-) diff --git a/drivers/led/led_bcm6858.c b/drivers/led/led_bcm6858.c index 6b3698674b..397dc0d869 100644 --- a/drivers/led/led_bcm6858.c +++ b/drivers/led/led_bcm6858.c @@ -180,63 +180,71 @@ static const struct led_ops bcm6858_led_ops = { static int bcm6858_led_probe(struct udevice *dev) { - struct led_uc_plat *uc_plat = dev_get_uclass_plat(dev); - - /* Top-level LED node */ - if (!uc_plat->label) { - void __iomem *regs; - u32 set_bits = 0; - - regs = dev_remap_addr(dev); - if (!regs) - return -EINVAL; - - if (dev_read_bool(dev, "brcm,serial-led-msb-first")) - set_bits |= LED_CTRL_SERIAL_LED_MSB_FIRST; - if (dev_read_bool(dev, "brcm,serial-led-en-pol")) - set_bits |= LED_CTRL_SERIAL_LED_EN_POL; - if (dev_read_bool(dev, "brcm,serial-led-clk-pol")) - set_bits |= LED_CTRL_SERIAL_LED_CLK_POL; - if (dev_read_bool(dev, "brcm,serial-led-data-ppol")) - set_bits |= LED_CTRL_SERIAL_LED_DATA_PPOL; - if (dev_read_bool(dev, "brcm,led-test-mode")) - set_bits |= LED_CTRL_LED_TEST_MODE; - - clrsetbits_32(regs + LED_CTRL_REG, ~0, set_bits); - } else { - struct bcm6858_led_priv *priv = dev_get_priv(dev); - void __iomem *regs; - unsigned int pin, brightness; - - regs = dev_remap_addr(dev_get_parent(dev)); - if (!regs) - return -EINVAL; - - pin = dev_read_u32_default(dev, "reg", LEDS_MAX); - if (pin >= LEDS_MAX) - return -EINVAL; - - priv->regs = regs; - priv->pin = pin; - - /* this led is managed by software */ - clrbits_32(regs + LED_HW_LED_EN_REG, 1 << pin); - - /* configure the polarity */ - if (dev_read_bool(dev, "active-low")) - clrbits_32(regs + LED_PLED_OP_PPOL_REG, 1 << pin); - else - setbits_32(regs + LED_PLED_OP_PPOL_REG, 1 << pin); + struct bcm6858_led_priv *priv = dev_get_priv(dev); + void __iomem *regs; + unsigned int pin, brightness; + + regs = dev_remap_addr(dev_get_parent(dev)); + if (!regs) + return -EINVAL; + + pin = dev_read_u32_default(dev, "reg", LEDS_MAX); + if (pin >= LEDS_MAX) + return -EINVAL; + + priv->regs = regs; + priv->pin = pin; + + /* this led is managed by software */ + clrbits_32(regs + LED_HW_LED_EN_REG, 1 << pin); - brightness = dev_read_u32_default(dev, "default-brightness", + /* configure the polarity */ + if (dev_read_bool(dev, "active-low")) + clrbits_32(regs + LED_PLED_OP_PPOL_REG, 1 << pin); + else + setbits_32(regs + LED_PLED_OP_PPOL_REG, 1 << pin); + + brightness = dev_read_u32_default(dev, "default-brightness", LEDS_MAX_BRIGHTNESS); - led_set_brightness(dev, brightness); - } + led_set_brightness(dev, brightness); return 0; } -static int bcm6858_led_bind(struct udevice *parent) +U_BOOT_DRIVER(bcm6858_led) = { + .name = "bcm6858-led", + .id = UCLASS_LED, + .probe = bcm6858_led_probe, + .priv_auto = sizeof(struct bcm6858_led_priv), + .ops = &bcm6858_led_ops, +}; + +static int bcm6858_led_wrap_probe(struct udevice *dev) +{ + void __iomem *regs; + u32 set_bits = 0; + + regs = dev_remap_addr(dev); + if (!regs) + return -EINVAL; + + if (dev_read_bool(dev, "brcm,serial-led-msb-first")) + set_bits |= LED_CTRL_SERIAL_LED_MSB_FIRST; + if (dev_read_bool(dev, "brcm,serial-led-en-pol")) + set_bits |= LED_CTRL_SERIAL_LED_EN_POL; + if (dev_read_bool(dev, "brcm,serial-led-clk-pol")) + set_bits |= LED_CTRL_SERIAL_LED_CLK_POL; + if (dev_read_bool(dev, "brcm,serial-led-data-ppol")) + set_bits |= LED_CTRL_SERIAL_LED_DATA_PPOL; + if (dev_read_bool(dev, "brcm,led-test-mode")) + set_bits |= LED_CTRL_LED_TEST_MODE; + + clrsetbits_32(regs + LED_CTRL_REG, ~0, set_bits); + + return 0; +} + +static int bcm6858_led_wrap_bind(struct udevice *parent) { ofnode node; @@ -259,12 +267,10 @@ static const struct udevice_id bcm6858_led_ids[] = { { /* sentinel */ } }; -U_BOOT_DRIVER(bcm6858_led) = { - .name = "bcm6858-led", - .id = UCLASS_LED, +U_BOOT_DRIVER(bcm6858_led_wrap) = { + .name = "bcm6858_led_wrap", + .id = UCLASS_NOP, .of_match = bcm6858_led_ids, - .bind = bcm6858_led_bind, - .probe = bcm6858_led_probe, - .priv_auto = sizeof(struct bcm6858_led_priv), - .ops = &bcm6858_led_ops, + .probe = bcm6858_led_wrap_probe, + .bind = bcm6858_led_wrap_bind, }; -- 2.25.1

3 5