From 6748a1f2a3e59a867a55487916167c4a676a884e Mon Sep 17 00:00:00 2001 From: Harald Seiler Date: Thu, 26 Mar 2020 18:07:27 +0100 Subject: [PATCH 1/5] test/py: mmc: Fix 'mmc info' testcase Commit 41e30dcf8796 ("cmd: mmc: Make Mode: printout consistent") fixed the layout of `mmc info` output. Reflect this change in the respective testcase. Also fix a typo in the documentation. Fixes: 41e30dcf8796 ("cmd: mmc: Make Mode: printout consistent") Signed-off-by: Harald Seiler Acked-by: Stephen Warren Reviewed-by: Simon Glass --- test/py/tests/test_mmc_rd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/py/tests/test_mmc_rd.py b/test/py/tests/test_mmc_rd.py index a25aa5f6f7..ea652f9136 100644 --- a/test/py/tests/test_mmc_rd.py +++ b/test/py/tests/test_mmc_rd.py @@ -56,7 +56,7 @@ env__mmc_dev_configs = ( 'info_mode': ???, 'info_buswidth': ???. }, -} +) # Configuration data for test_mmc_rd; defines regions of the MMC (entire # devices, or ranges of sectors) which can be read: @@ -210,7 +210,7 @@ def test_mmc_info(u_boot_console, env__mmc_dev_config): assert good_response in response good_response = "Bus Speed: %s" % info_speed assert good_response in response - good_response = "Mode : %s" % info_mode + good_response = "Mode: %s" % info_mode assert good_response in response good_response = "Bus Width: %s" % info_buswidth assert good_response in response From cb11eed23d7215b6902d43f6273b562ee31e770a Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Wed, 25 Mar 2020 21:35:53 +0100 Subject: [PATCH 2/5] MAINTAINERS: Add usb.h entry to usb Add usb.h file into the USB list. Signed-off-by: Marek Vasut Cc: Tom Rini --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 92dda40a85..9c1543f17d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -937,6 +937,7 @@ T: git https://gitlab.denx.de/u-boot/custodians/u-boot-usb.git F: drivers/usb/ F: common/usb.c F: common/usb_kbd.c +F: include/usb.h USB xHCI M: Bin Meng From 7b83060b1eab4456b3dfaef636dfd5c0ff705b17 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 25 Mar 2020 21:27:51 +0100 Subject: [PATCH 3/5] fs: ext4: Fix alignment of cache buffers We need to align the cache buffer to ARCH_DMA_MINALIGN in order to avoid access errors like CACHE: Misaligned operation at range [be0231e0, be0235e0] seen on the MCIMX7SABRE. Fixes: d5aee659f217 ("fs: ext4: cache extent data") Signed-off-by: Jan Kiszka Reviewed-by: Tom Rini Reviewed-by: Stephen Warren Tested-by: Peter Robinson --- fs/ext4/ext4fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c index 1c616a26a2..966b427a97 100644 --- a/fs/ext4/ext4fs.c +++ b/fs/ext4/ext4fs.c @@ -288,7 +288,7 @@ int ext_cache_read(struct ext_block_cache *cache, lbaint_t block, int size) if (cache->buf && cache->block == block && cache->size == size) return 1; ext_cache_fini(cache); - cache->buf = malloc(size); + cache->buf = memalign(ARCH_DMA_MINALIGN, size); if (!cache->buf) return 0; if (!ext4fs_devread(block, 0, size, cache->buf)) { From 3e29bd268d6361d7962db2c4a9cd4cf4d85abec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Beh=C3=BAn?= Date: Wed, 25 Mar 2020 12:04:46 +0100 Subject: [PATCH 4/5] MAINTAINERS: add myself as maintainer of fs/btrfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marek Behún --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 9c1543f17d..b50652bd85 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -527,6 +527,13 @@ M: Simon Glass S: Maintained F: tools/binman/ +BTRFS +M: Marek Behun +S: Maintained +F: cmd/btrfs.c +F: fs/btrfs/ +F: include/btrfs.h + BUILDMAN M: Simon Glass S: Maintained From 6cc8e545b79311de2dbf7f05291fc77a54ffea6b Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Mon, 23 Mar 2020 18:47:47 +0100 Subject: [PATCH 5/5] test: typo decompression %s/decopmression/decompression/ Signed-off-by: Heinrich Schuchardt Reviewed-by: Simon Glass --- test/compression.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/compression.c b/test/compression.c index cf040d7c86..63f929fa4b 100644 --- a/test/compression.c +++ b/test/compression.c @@ -451,7 +451,7 @@ static int compress_using_none(struct unit_test_state *uts, } /** - * run_bootm_test() - Run tests on the bootm decopmression function + * run_bootm_test() - Run tests on the bootm decompression function * * @comp_type: Compression type to test * @compress: Our function to compress data