vhaudiquet/u-boot-krane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: Remove blk_find_first/next

Browse Source 
In [0], Andrew noted a code quality issue in the implementation of
blk_find_first and blk_find_next. This led to the observation that the
logic of these functions was also likely incorrect, and based on a quick
check it seemed the functions were unused outside of test code, which
did not exercise the potential failure case, so we felt they should be
removed. In [1], a test patch which illustrates the failure in sandbox
is provided for reference.

Because a more thorough check agrees that these functions are unused,
they are currently incorrect, and fixed/removable flags on block devices
prior to probe are unreliable, just remove these functions instead of
fixing them. All potential users should have used blk_first_device_err
instead anyway.

CI results at [2].

[0] https://patchwork.ozlabs.org/project/uboot/patch/20250714-blk-uclass-v1-1-d21428c5f762@linaro.org/
[1] https://gist.github.com/gmalysa/b05e73a5c14bc18c5741a0e0e06a2992
[2] https://gitlab.com/gmalysa/lnxdsp-u-boot/-/pipelines/1931210857

Signed-off-by: Greg Malysa <malysagreg@gmail.com>
Reviewed-by: Andrew Goodbody <andrew.goodbody@linaro.org>
This commit is contained in:
Greg Malysa
2025-07-23 17:37:14 -06:00
committed by Tom Rini
parent cf13f33d3a
commit 3532f1f5ed
3 changed files with 3 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/dm/blk.c
+3 -43
View File
@@ -229,30 +229,7 @@ static int dm_test_blk_flags(struct unit_test_state *uts)
{
struct udevice *dev;
/* Iterate through devices without probing them */
ut_assertok(blk_find_first(BLKF_BOTH, &dev));
ut_assertnonnull(dev);
ut_asserteq_str("mmc2.blk", dev->name);
ut_assertok(blk_find_next(BLKF_BOTH, &dev));
ut_assertnonnull(dev);
ut_asserteq_str("mmc1.blk", dev->name);
ut_assertok(blk_find_next(BLKF_BOTH, &dev));
ut_assertnonnull(dev);
ut_asserteq_str("mmc0.blk", dev->name);
ut_asserteq(-ENODEV, blk_find_next(BLKF_BOTH, &dev));
ut_assertnull(dev);
/* All devices are removable until probed */
ut_asserteq(-ENODEV, blk_find_first(BLKF_FIXED, &dev));
ut_assertok(blk_find_first(BLKF_REMOVABLE, &dev));
ut_assertnonnull(dev);
ut_asserteq_str("mmc2.blk", dev->name);
/* Now probe them and iterate again */
/* Probe and look through block devices */
ut_assertok(blk_first_device_err(BLKF_BOTH, &dev));
ut_assertnonnull(dev);
ut_asserteq_str("mmc2.blk", dev->name);
@@ -289,30 +266,13 @@ static int dm_test_blk_flags(struct unit_test_state *uts)
}
DM_TEST(dm_test_blk_flags, UTF_SCAN_PDATA | UTF_SCAN_FDT);
/* Test blk_foreach() and friend */
/* Test blk_foreach_probe() */
static int dm_test_blk_foreach(struct unit_test_state *uts)
{
struct udevice *dev;
int found;
/* Test blk_foreach() - use the 3rd bytes of the name (0/1/2) */
found = 0;
blk_foreach(BLKF_BOTH, dev)
found |= 1 << dectoul(&dev->name[3], NULL);
ut_asserteq(7, found);
/* All devices are removable until probed */
found = 0;
blk_foreach(BLKF_FIXED, dev)
found |= 1 << dectoul(&dev->name[3], NULL);
ut_asserteq(0, found);
found = 0;
blk_foreach(BLKF_REMOVABLE, dev)
found |= 1 << dectoul(&dev->name[3], NULL);
ut_asserteq(7, found);
/* Now try again with the probing functions */
/* The test device tree has two fixed and one removable block device(s) */
found = 0;
blk_foreach_probe(BLKF_BOTH, dev)
found |= 1 << dectoul(&dev->name[3], NULL);