From 7bb683513c8d910aae10353fbea31969fe85f3a4 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 17 May 2022 23:24:43 +0800 Subject: [PATCH 1/9] test/py: Reset the console timeout value Reset the console timeout value as some tests may change its default value during the execution. This fixes the random case timeout issue seen in the U-Boot CI. Signed-off-by: Bin Meng --- test/py/u_boot_console_base.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index 58ec859b34f..26b6de07f88 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -400,6 +400,10 @@ class ConsoleBase(object): """ if self.p: + # Reset the console timeout value as some tests may change + # its default value during the execution + if not self.config.gdbserver: + self.p.timeout = 30000 return try: self.log.start_section('Starting U-Boot') From 7eb2e88ae9120b14a479bb14f461762619d7f551 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 17 May 2022 23:24:44 +0800 Subject: [PATCH 2/9] test/py: test_fs: Correct the test case name Use test_fstypes as the name instead of test_dm_compact. Signed-off-by: Bin Meng --- test/py/tests/test_fs/test_fs_cmd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/py/tests/test_fs/test_fs_cmd.py b/test/py/tests/test_fs/test_fs_cmd.py index ba39a53159e..700cf3591de 100644 --- a/test/py/tests/test_fs/test_fs_cmd.py +++ b/test/py/tests/test_fs/test_fs_cmd.py @@ -6,7 +6,7 @@ import pytest @pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('cmd_fs_generic') -def test_dm_compat(u_boot_console): +def test_fstypes(u_boot_console): """Test that `fstypes` prints a result which includes `sandbox`.""" output = u_boot_console.run_command('fstypes') assert "Supported filesystems:" in output From 9e892ac27670e094ce4bade5a13b4d0e3a7c4da3 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Tue, 17 May 2022 23:24:45 +0800 Subject: [PATCH 3/9] test/py: test_part: Correct the test case name Use test_part_types as the name instead of dm_compact. Signed-off-by: Bin Meng --- test/py/tests/test_part.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/py/tests/test_part.py b/test/py/tests/test_part.py index cba98045101..2b5184654db 100644 --- a/test/py/tests/test_part.py +++ b/test/py/tests/test_part.py @@ -7,7 +7,7 @@ import pytest @pytest.mark.buildconfigspec('cmd_part') @pytest.mark.buildconfigspec('partitions') @pytest.mark.buildconfigspec('efi_partition') -def test_dm_compat(u_boot_console): +def test_part_types(u_boot_console): """Test that `part types` prints a result which includes `EFI`.""" output = u_boot_console.run_command('part types') assert "Supported partition tables:" in output From bdbf7a05e26f3c5fd437c99e2755ffde186ddc80 Mon Sep 17 00:00:00 2001 From: Andrea zi0Black Cappa Date: Wed, 18 May 2022 16:30:08 +0000 Subject: [PATCH 4/9] net: nfs: Fix CVE-2022-30767 (old CVE-2019-14196) This patch mitigates the vulnerability identified via CVE-2019-14196. The previous patch was bypassed/ineffective, and now the vulnerability is identified via CVE-2022-30767. The patch removes the sanity check introduced to mitigate CVE-2019-14196 since it's ineffective. filefh3_length is changed to unsigned type integer, preventing negative numbers from being used during comparison with positive values during size sanity checks. Signed-off-by: Andrea zi0Black Cappa --- net/nfs.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/net/nfs.c b/net/nfs.c index 3c01cebd96f..9152ab742ef 100644 --- a/net/nfs.c +++ b/net/nfs.c @@ -52,7 +52,7 @@ static const ulong nfs_timeout = CONFIG_NFS_TIMEOUT; static char dirfh[NFS_FHSIZE]; /* NFSv2 / NFSv3 file handle of directory */ static char filefh[NFS3_FHSIZE]; /* NFSv2 / NFSv3 file handle */ -static int filefh3_length; /* (variable) length of filefh when NFSv3 */ +static unsigned int filefh3_length; /* (variable) length of filefh when NFSv3 */ static enum net_loop_state nfs_download_state; static struct in_addr nfs_server_ip; @@ -573,8 +573,6 @@ static int nfs_lookup_reply(uchar *pkt, unsigned len) filefh3_length = ntohl(rpc_pkt.u.reply.data[1]); if (filefh3_length > NFS3_FHSIZE) filefh3_length = NFS3_FHSIZE; - if (((uchar *)&(rpc_pkt.u.reply.data[0]) - (uchar *)(&rpc_pkt) + filefh3_length) > len) - return -NFS_RPC_DROP; memcpy(filefh, rpc_pkt.u.reply.data + 2, filefh3_length); } From 24c8d1aba1f0fa671f5aa556f389723e2a817c1f Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Thu, 19 May 2022 10:06:33 +0930 Subject: [PATCH 5/9] MAINTAINERS: aspeed: Add more files and myself as a reviewer Add the rest of the ASPEED drivers that are in tree. Most are obvious, except for ftgmac100 which matches the register layout used in the ASPEED SoC. I am the Linux maintainer for the ASPEED kernel port, and help maintain the fork of u-boot used for OpenBMC, so add myself as a reviewer so I can stay informed about u-boot changes. Signed-off-by: Joel Stanley Reviewed-by: Chia-Wei Wang --- MAINTAINERS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 56be0bfad00..28e4d382386 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -169,12 +169,23 @@ ARM ASPEED M: Ryan Chen M: Chia-Wei Wang R: Aspeed BMC SW team +R: Joel Stanley S: Maintained F: arch/arm/mach-aspeed/ F: arch/arm/include/asm/arch-aspeed/ F: board/aspeed/ F: drivers/clk/aspeed/ +F: drivers/crypto/aspeed/ +F: drivers/gpio/gpio-aspeed.c +F: drivers/i2c/ast_i2c.[ch] +F: drivers/mmc/aspeed_sdhci.c +F: drivers/net/aspeed_mdio.c +F: drivers/net/ftgmac100.[ch] F: drivers/pinctrl/aspeed/ +F: drivers/pwm/pwm-aspeed.c +F: drivers/ram/aspeed/ +F: drivers/reset/reset-ast2500.c +F: drivers/watchdog/ast_wdt.c N: aspeed ARM BROADCOM BCM283X / BCM27XX From e7356f08e91566293415915b08229938c062a279 Mon Sep 17 00:00:00 2001 From: Georgi Vlaev Date: Fri, 20 May 2022 15:30:26 +0300 Subject: [PATCH 6/9] arm: dts: k3-am642-*: Mark the memory node with u-boot, dm-spl Since commit dffdb1f8eb ("board: ti: am64x: Use fdt functions for ram and bank init") ddr_init() and dram_bank_init() have switched to fdtdec for getting the memory configuration from the am64xx dts files instead of using hardcoded values. This requires an accessible memory node in SPL as we already have in k3-am642-r5-evm.dts. Make the memory node accessible in A53 SPL for both am642-sk and am642-evm and in am642-sk R5 SPL. Signed-off-by: Georgi Vlaev Reviewed-by: Tom Rini --- arch/arm/dts/k3-am642-evm-u-boot.dtsi | 4 ++++ arch/arm/dts/k3-am642-r5-sk.dts | 2 +- arch/arm/dts/k3-am642-sk-u-boot.dtsi | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/k3-am642-evm-u-boot.dtsi b/arch/arm/dts/k3-am642-evm-u-boot.dtsi index 0c2d9734091..055215cff8d 100644 --- a/arch/arm/dts/k3-am642-evm-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-evm-u-boot.dtsi @@ -8,6 +8,10 @@ stdout-path = "serial2:115200n8"; tick-timer = &timer1; }; + + memory@80000000 { + u-boot,dm-spl; + }; }; &cbass_main{ diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts index 1f96e3fcacf..cf3ba0e209c 100644 --- a/arch/arm/dts/k3-am642-r5-sk.dts +++ b/arch/arm/dts/k3-am642-r5-sk.dts @@ -27,7 +27,7 @@ device_type = "memory"; /* 2G RAM */ reg = <0x00000000 0x80000000 0x00000000 0x80000000>; - + u-boot,dm-spl; }; a53_0: a53@0 { diff --git a/arch/arm/dts/k3-am642-sk-u-boot.dtsi b/arch/arm/dts/k3-am642-sk-u-boot.dtsi index 65042281363..dda2c5d18a7 100644 --- a/arch/arm/dts/k3-am642-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am642-sk-u-boot.dtsi @@ -12,6 +12,10 @@ aliases { mmc1 = &sdhci1; }; + + memory@80000000 { + u-boot,dm-spl; + }; }; &cbass_main{ From d9402bd49b9b2013ac48b5f4d82217d1628da797 Mon Sep 17 00:00:00 2001 From: Wasim Khan Date: Sun, 22 May 2022 07:23:58 +0200 Subject: [PATCH 7/9] board: freescale: Update MAINTAINERS List Update MAINTAINERS List for LS2088ARDB and LS2088AQDS platforms Signed-off-by: Wasim Khan --- board/freescale/ls2080aqds/MAINTAINERS | 1 + board/freescale/ls2080ardb/MAINTAINERS | 2 ++ 2 files changed, 3 insertions(+) diff --git a/board/freescale/ls2080aqds/MAINTAINERS b/board/freescale/ls2080aqds/MAINTAINERS index 84735dce289..39d02ae3f46 100644 --- a/board/freescale/ls2080aqds/MAINTAINERS +++ b/board/freescale/ls2080aqds/MAINTAINERS @@ -1,6 +1,7 @@ LS2080A BOARD M: Priyanka Jain M: Rajesh Bhagat +M: Wasim Khan S: Maintained F: board/freescale/ls2080aqds/ F: board/freescale/ls2080a/ls2080aqds.c diff --git a/board/freescale/ls2080ardb/MAINTAINERS b/board/freescale/ls2080ardb/MAINTAINERS index 6e25b82db5b..f49d26af3a0 100644 --- a/board/freescale/ls2080ardb/MAINTAINERS +++ b/board/freescale/ls2080ardb/MAINTAINERS @@ -1,5 +1,6 @@ LS2080A BOARD M: Priyanka Jain +M: Wasim Khan S: Maintained F: board/freescale/ls2080ardb/ F: board/freescale/ls2080a/ls2080ardb.c @@ -10,6 +11,7 @@ F: configs/ls2080ardb_nand_defconfig LS2088A_QSPI-boot BOARD M: Priyanka Jain M: Rajesh Bhagat +M: Wasim Khan S: Maintained F: configs/ls2088ardb_qspi_defconfig F: configs/ls2088ardb_tfa_defconfig From d051a91c8dcb27a2f5377cee044d5376e91c372b Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 24 May 2022 13:36:21 +0200 Subject: [PATCH 8/9] test: fix parsing the mksquashfs version number Testing with mksquasshfs 4.5.1 results in an error ValueError: could not convert string to float: '4.5.1' Version 4.10 would be considered to be lower than 4.4. Fixes: 04c9813e951f ("test/py: rewrite common tools for SquashFS tests") Signed-off-by: Heinrich Schuchardt --- test/py/tests/test_fs/test_squashfs/sqfs_common.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/py/tests/test_fs/test_squashfs/sqfs_common.py b/test/py/tests/test_fs/test_squashfs/sqfs_common.py index 8b84c2cdca8..d1621dcce3a 100644 --- a/test/py/tests/test_fs/test_squashfs/sqfs_common.py +++ b/test/py/tests/test_fs/test_squashfs/sqfs_common.py @@ -146,15 +146,14 @@ def get_mksquashfs_version(): out = subprocess.run(['mksquashfs -version'], shell=True, check=True, capture_output=True, text=True) # 'out' is: mksquashfs version X (yyyy/mm/dd) ... - return float(out.stdout.split()[2].split('-')[0]) + return out.stdout.split()[2].split('.')[0:2] def check_mksquashfs_version(): """ Checks if mksquashfs meets the required version. """ - required_version = 4.4 - if get_mksquashfs_version() < required_version: - print('Error: mksquashfs is too old.') - print('Required version: {}'.format(required_version)) + version = get_mksquashfs_version(); + if int(version[0]) < 4 or int(version[0]) == 4 and int(version[1]) < 4 : + print('Error: mksquashfs is too old, required version: 4.4') raise AssertionError def make_all_images(build_dir): From d64ac8549d97cfc37bd629a60f0d502bcd3ee9c7 Mon Sep 17 00:00:00 2001 From: Sean Anderson Date: Tue, 26 Apr 2022 14:35:33 -0400 Subject: [PATCH 9/9] net: e1000: Depend on CONFIG_PCI This driver depends on PCI. Update the Kconfig accordingly. Signed-off-by: Sean Anderson Reviewed-by: Tim Harvey Reviewed-by: Stefan Roese Reviewed-by: Ramon Fried --- drivers/net/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index 7fe0e00649c..84d859c21eb 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -231,6 +231,7 @@ config DWC_ETH_QOS_TEGRA186 config E1000 bool "Intel PRO/1000 Gigabit Ethernet support" + depends on PCI help This driver supports Intel(R) PRO/1000 gigabit ethernet family of adapters. For more information on how to identify your adapter, go