[PATCH v2 06/18] bloblist: Drop the flags value
Ilias Apalodimas
ilias.apalodimas at linaro.org
Mon Dec 4 09:36:23 CET 2023
On Mon, 27 Nov 2023 at 21:52, Raymond Mao <raymond.mao at linaro.org> wrote:
>
> From: Simon Glass <sjg at chromium.org>
>
> There is no flags value in spec v0.9 so drop it.
>
> For now it is still present in the header, with an underscore, so that
> tests continue to pass.
Why? Can't we drop it overall?
Thanks
/Ilias
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> Signed-off-by: Raymond Mao <raymond.mao at linaro.org>
> ---
> common/bloblist.c | 5 ++---
> include/bloblist.h | 6 ++----
> test/bloblist.c | 45 +++++++++++++++++++--------------------------
> 3 files changed, 23 insertions(+), 33 deletions(-)
>
> diff --git a/common/bloblist.c b/common/bloblist.c
> index f084a32cfc..4d01772c3b 100644
> --- a/common/bloblist.c
> +++ b/common/bloblist.c
> @@ -331,7 +331,7 @@ static u32 bloblist_calc_chksum(struct bloblist_hdr *hdr)
> return chksum;
> }
>
> -int bloblist_new(ulong addr, uint size, uint flags)
> +int bloblist_new(ulong addr, uint size)
> {
> struct bloblist_hdr *hdr;
>
> @@ -343,7 +343,6 @@ int bloblist_new(ulong addr, uint size, uint flags)
> memset(hdr, '\0', sizeof(*hdr));
> hdr->version = BLOBLIST_VERSION;
> hdr->hdr_size = sizeof(*hdr);
> - hdr->flags = flags;
> hdr->magic = BLOBLIST_MAGIC;
> hdr->size = size;
> hdr->alloced = hdr->hdr_size;
> @@ -490,7 +489,7 @@ int bloblist_init(void)
> }
> log_debug("Creating new bloblist size %lx at %lx\n", size,
> addr);
> - ret = bloblist_new(addr, size, 0);
> + ret = bloblist_new(addr, size);
> } else {
> log_debug("Found existing bloblist size %lx at %lx\n", size,
> addr);
> diff --git a/include/bloblist.h b/include/bloblist.h
> index d70a7bad2e..2b898d0c55 100644
> --- a/include/bloblist.h
> +++ b/include/bloblist.h
> @@ -164,7 +164,6 @@ enum bloblist_tag_t {
> * @version: BLOBLIST_VERSION
> * @hdr_size: Size of this header, normally sizeof(struct bloblist_hdr). The
> * first bloblist_rec starts at this offset from the start of the header
> - * @flags: Space for BLOBLISTF... flags (none yet)
> * @size: Total size of the bloblist (non-zero if valid) including this header.
> * The bloblist extends for this many bytes from the start of this header.
> * When adding new records, the bloblist can grow up to this size.
> @@ -182,7 +181,7 @@ struct bloblist_hdr {
> u32 magic;
> u32 version;
> u32 hdr_size;
> - u32 flags;
> + u32 _flags;
>
> u32 size;
> u32 alloced;
> @@ -317,11 +316,10 @@ int bloblist_resize(uint tag, int new_size);
> *
> * @addr: Address of bloblist
> * @size: Initial size for bloblist
> - * @flags: Flags to use for bloblist
> * Return: 0 if OK, -EFAULT if addr is not aligned correctly, -ENOSPC is the
> * area is not large enough
> */
> -int bloblist_new(ulong addr, uint size, uint flags);
> +int bloblist_new(ulong addr, uint size);
>
> /**
> * bloblist_check() - Check if a bloblist exists
> diff --git a/test/bloblist.c b/test/bloblist.c
> index 8b435e27ca..36994c3dd4 100644
> --- a/test/bloblist.c
> +++ b/test/bloblist.c
> @@ -72,15 +72,15 @@ static int bloblist_test_init(struct unit_test_state *uts)
> hdr = clear_bloblist();
> ut_asserteq(-ENOENT, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
> ut_asserteq_ptr(NULL, bloblist_check_magic(TEST_ADDR));
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> ut_asserteq_ptr(hdr, bloblist_check_magic(TEST_ADDR));
> hdr->version++;
> ut_asserteq(-EPROTONOSUPPORT, bloblist_check(TEST_ADDR,
> TEST_BLOBLIST_SIZE));
>
> - ut_asserteq(-ENOSPC, bloblist_new(TEST_ADDR, 0x10, 0));
> - ut_asserteq(-EFAULT, bloblist_new(1, TEST_BLOBLIST_SIZE, 0));
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_asserteq(-ENOSPC, bloblist_new(TEST_ADDR, 0x10));
> + ut_asserteq(-EFAULT, bloblist_new(1, TEST_BLOBLIST_SIZE));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
>
> ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
> ut_assertok(bloblist_finish());
> @@ -90,9 +90,6 @@ static int bloblist_test_init(struct unit_test_state *uts)
> ut_asserteq_ptr(NULL, bloblist_check_magic(TEST_ADDR));
> hdr->magic--;
>
> - hdr->flags++;
> - ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
> -
> return 1;
> }
> BLOBLIST_TEST(bloblist_test_init, 0);
> @@ -106,7 +103,7 @@ static int bloblist_test_blob(struct unit_test_state *uts)
> /* At the start there should be no records */
> hdr = clear_bloblist();
> ut_assertnull(bloblist_find(TEST_TAG, TEST_BLOBLIST_SIZE));
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> ut_asserteq(TEST_BLOBLIST_SIZE, bloblist_get_size());
> ut_asserteq(TEST_ADDR, bloblist_get_base());
> ut_asserteq(map_to_sysmem(hdr), TEST_ADDR);
> @@ -144,7 +141,7 @@ static int bloblist_test_blob_ensure(struct unit_test_state *uts)
>
> /* At the start there should be no records */
> clear_bloblist();
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
>
> /* Test with an empty bloblist */
> size = TEST_SIZE;
> @@ -176,7 +173,7 @@ static int bloblist_test_bad_blob(struct unit_test_state *uts)
> void *data;
>
> hdr = clear_bloblist();
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> data = hdr + 1;
> data += sizeof(struct bloblist_rec);
> ut_asserteq_addr(data, bloblist_ensure(TEST_TAG, TEST_SIZE));
> @@ -192,7 +189,7 @@ static int bloblist_test_checksum(struct unit_test_state *uts)
> char *data, *data2;
>
> hdr = clear_bloblist();
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> ut_assertok(bloblist_finish());
> ut_assertok(bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
>
> @@ -201,10 +198,6 @@ static int bloblist_test_checksum(struct unit_test_state *uts)
> * change the size or alloced fields, since that will crash the code.
> * It has to rely on these being correct.
> */
> - hdr->flags--;
> - ut_asserteq(-EIO, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
> - hdr->flags++;
> -
> hdr->size--;
> ut_asserteq(-EFBIG, bloblist_check(TEST_ADDR, TEST_BLOBLIST_SIZE));
> hdr->size++;
> @@ -256,7 +249,7 @@ static int bloblist_test_cmd_info(struct unit_test_state *uts)
> char *data, *data2;
>
> hdr = clear_bloblist();
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> data = bloblist_ensure(TEST_TAG, TEST_SIZE);
> data2 = bloblist_ensure(TEST_TAG2, TEST_SIZE2);
>
> @@ -282,7 +275,7 @@ static int bloblist_test_cmd_list(struct unit_test_state *uts)
> char *data, *data2;
>
> hdr = clear_bloblist();
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> data = bloblist_ensure(TEST_TAG, TEST_SIZE);
> data2 = bloblist_ensure(TEST_TAG2, TEST_SIZE2);
>
> @@ -312,7 +305,7 @@ static int bloblist_test_align(struct unit_test_state *uts)
>
> /* At the start there should be no records */
> hdr = clear_bloblist();
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> ut_assertnull(bloblist_find(TEST_TAG, TEST_BLOBLIST_SIZE));
>
> /* Check the default alignment */
> @@ -348,8 +341,8 @@ static int bloblist_test_align(struct unit_test_state *uts)
> hdr = map_sysmem(TEST_ADDR + BLOBLIST_ALIGN, TEST_BLOBLIST_SIZE);
> memset(hdr, ERASE_BYTE, TEST_BLOBLIST_SIZE);
> memset(hdr, '\0', sizeof(*hdr));
> - ut_assertok(bloblist_new(TEST_ADDR + BLOBLIST_ALIGN, TEST_BLOBLIST_SIZE,
> - 0));
> + ut_assertok(bloblist_new(TEST_ADDR + BLOBLIST_ALIGN,
> + TEST_BLOBLIST_SIZE));
>
> data = bloblist_add(1, 5, BLOBLIST_ALIGN_LOG2 + 1);
> ut_assertnonnull(data);
> @@ -370,7 +363,7 @@ static int bloblist_test_reloc(struct unit_test_state *uts)
> ulong new_addr;
> ulong new_size;
>
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> old_ptr = map_sysmem(TEST_ADDR, TEST_BLOBLIST_SIZE);
>
> /* Add one blob and then one that won't fit */
> @@ -409,7 +402,7 @@ static int bloblist_test_grow(struct unit_test_state *uts)
> memset(hdr, ERASE_BYTE, TEST_BLOBLIST_SIZE);
>
> /* Create two blobs */
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> blob1 = bloblist_add(TEST_TAG, small_size, 0);
> ut_assertnonnull(blob1);
> ut_assertok(check_zero(blob1, small_size));
> @@ -461,7 +454,7 @@ static int bloblist_test_shrink(struct unit_test_state *uts)
> ptr = map_sysmem(TEST_ADDR, TEST_BLOBLIST_SIZE);
>
> /* Create two blobs */
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> blob1 = bloblist_add(TEST_TAG, small_size, 0);
> ut_assertnonnull(blob1);
> strcpy(blob1, test1_str);
> @@ -511,7 +504,7 @@ static int bloblist_test_resize_fail(struct unit_test_state *uts)
> ptr = map_sysmem(TEST_ADDR, TEST_BLOBLIST_SIZE);
>
> /* Create two blobs */
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> blob1 = bloblist_add(TEST_TAG, small_size, 0);
> ut_assertnonnull(blob1);
>
> @@ -548,7 +541,7 @@ static int bloblist_test_resize_last(struct unit_test_state *uts)
> hdr = ptr;
>
> /* Create two blobs */
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
> blob1 = bloblist_add(TEST_TAG, small_size, 0);
> ut_assertnonnull(blob1);
>
> @@ -593,7 +586,7 @@ static int bloblist_test_blob_maxsize(struct unit_test_state *uts)
>
> /* At the start there should be no records */
> clear_bloblist();
> - ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE, 0));
> + ut_assertok(bloblist_new(TEST_ADDR, TEST_BLOBLIST_SIZE));
>
> /* Add a blob that takes up all space */
> size = TEST_BLOBLIST_SIZE - sizeof(struct bloblist_hdr) -
> --
> 2.25.1
>
More information about the U-Boot
mailing list