disk: Use a helper function to reduce duplication
PATCH v2 1/1 disk: Use a helper function to reduce duplication
Reduce the duplicated code slightly by using a helper function to handle the common code.
This reduces the code size very slightly.
---
Changes in v2:
- Rebase to -next
disk/disk-uclass.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-)
disk/disk-uclass.c +25 -21
@@ -65,26 +65,38 @@ int part_create_block_devices(struct udevice *blk_dev)return 0 ; } +static int blk_part_setup (struct udevice *dev,lbaint_t *startp, +lbaint_t blkcnt) +{ +struct disk_part *part; + + part =dev_get_uclass_plat (dev); +if (*startp >= part->gpt_part_info.size) +return -E2BIG ; + +if (*startp + blkcnt > part->gpt_part_info.size) + blkcnt = part->gpt_part_info.size - *startp; + *startp += part->gpt_part_info.start; + +return 0 ; +} +static ulong part_blk_read (struct udevice *dev,lbaint_t start,lbaint_t blkcnt,void *buffer) {struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->read)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ; -if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -return ops->read (parent, start, blkcnt, buffer); }
@@ -92,22 +104,18 @@ static ulong part_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, const void *buffer) { struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->write)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ; -if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -return ops->write (parent, start, blkcnt, buffer); }
@@ -115,22 +123,18 @@ static ulong part_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) {struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->erase)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ; -if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -return ops->erase (parent, start, blkcnt); }
Signature · 1 line
2.40.0.rc1.284.g88254d51c5-goog
Hi Simon,
Patch looks good, but isn't the new function name a bit misleading? Something like blk_part_find_start() sounds a bit more descriptive, or am I missing something?
Cheers
/Ilias
Quoted 119 lines · Simon Glass
Reduce the duplicated code slightly by using a helper function to handle the common code.
This reduces the code size very slightly.
Signed-off-by Simon Glass <[email protected]>---
Changes in v2:
- Rebase to -nextdisk/disk-uclass.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-)disk/disk-uclass.c +25
-22@@ -65,26 +65,38 @@ int part_create_block_devices(struct udevice *blk_dev)return 0 ; } +static int blk_part_setup (struct udevice *dev,lbaint_t *startp, +lbaint_t blkcnt) +{ +struct disk_part *part; + + part =dev_get_uclass_plat (dev); +if (*startp >= part->gpt_part_info.size) +return -E2BIG ; + +if (*startp + blkcnt > part->gpt_part_info.size) + blkcnt = part->gpt_part_info.size - *startp; + *startp += part->gpt_part_info.start; + +return 0 ; +} +static ulong part_blk_read (struct udevice *dev,lbaint_t start,lbaint_t blkcnt,void *buffer) {struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->read)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ; -if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -return ops->read (parent, start, blkcnt, buffer); }@@ -92,22 +104,18 @@ static ulong part_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, const void *buffer) { struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->write)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ; -if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -return ops->write (parent, start, blkcnt, buffer); }@@ -115,22 +123,18 @@ static ulong part_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) {struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->erase)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ; -if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -return ops->erase (parent, start, blkcnt); } --2.40.0.rc1.284.g88254d51c5-goog
Quoted 5 lines · Ilias Apalodimas
Hi Simon,
Patch looks good, but isn't the new function name a bit misleading? Something like
blk_part_find_start()sounds a bit more descriptive, or am I missing something?
I don't think that the helper function works as my original code does.
Quoted 61 lines
Cheers
/IliasQuoted 57 lines · Simon Glass
Reduce the duplicated code slightly by using a helper function to handle the common code.
This reduces the code size very slightly.
Signed-off-by Simon Glass <[email protected]>---
Changes in v2:
- Rebase to -nextdisk/disk-uclass.c | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-)disk/disk-uclass.c +19
-3@@ -65,26 +65,38 @@ int part_create_block_devices(struct udevice *blk_dev)return 0 ; } +static int blk_part_setup (struct udevice *dev,lbaint_t *startp, +lbaint_t blkcnt) +{ +struct disk_part *part; + + part =dev_get_uclass_plat (dev); +if (*startp >= part->gpt_part_info.size) +return -E2BIG ; + +if (*startp + blkcnt > part->gpt_part_info.size) + blkcnt = part->gpt_part_info.size - *startp; + *startp += part->gpt_part_info.start; + +return 0 ; +} +static ulong part_blk_read (struct udevice *dev,lbaint_t start,lbaint_t blkcnt,void *buffer) {struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->read)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ;
Quoted 4 lines
disk/disk-uclass.c int part_create_block_devices(struct udevice *blk_dev) · line 87
Quoted 4 lines
disk/disk-uclass.c +0
-4-if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -
We cannot read out more blocks than the size of the partition.
Quoted 1 line
disk/disk-uclass.c int part_create_block_devices(struct udevice *blk_dev) · line 100
Quoted 1 line
disk/disk-uclass.c +0
-0return ops->read (parent, start, blkcnt, buffer);
So blkcnt must also be adjusted, otherwise we may see extra blocks beyond the partition boundary.
-Takahiro Akashi
Quoted 57 lines
Quoted 57 lines
disk/disk-uclass.c +6
-15}@@ -92,22 +104,18 @@ static ulong part_blk_write(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, const void *buffer) { struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->write)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ; -if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -return ops->write (parent, start, blkcnt, buffer); }@@ -115,22 +123,18 @@ static ulong part_blk_erase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt) {struct udevice *parent; -struct disk_part *part;const struct blk_ops *ops; +int ret; parent =dev_get_parent (dev); ops =blk_get_ops (parent);if (!ops->erase)return -ENOSYS ; - part =dev_get_uclass_plat (dev); -if (start >= part->gpt_part_info.size) + ret =blk_part_setup (dev, &start, blkcnt); +if (ret)return 0 ; -if ((start + blkcnt) > part->gpt_part_info.size) - blkcnt = part->gpt_part_info.size - start; - start += part->gpt_part_info.start; -return ops->erase (parent, start, blkcnt); } --2.40.0.rc1.284.g88254d51c5-goog
Quoted 6 lines · Simon Glass
Reduce the duplicated code slightly by using a helper function to handle the common code.
This reduces the code size very slightly.
Signed-off-by Simon Glass <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom
Hi Tom,
Quoted 10 lines · Tom Rini
Quoted 6 lines · Simon Glass
Reduce the duplicated code slightly by using a helper function to handle the common code.
This reduces the code size very slightly.
Signed-off-by Simon Glass <[email protected]>Applied to u-boot/next, thanks!
I think I said nak against this patch.
https://lists.denx.de/pipermail/u-boot/2023-March/512677.html
-Takahiro Akashi
Quoted 2 lines
Signature · 1 line
Tom
Hi,
Quoted 9 lines · On Mon, 3 Apr 2023, 12:06 AKASHI Takahiro, <[email protected]> wrote:
Hi Tom,
Quoted 3 lines · Tom Rini
Quoted 1 line · Simon Glass
Reduce the duplicated code slightly by using a helper function to
handle
Quoted 2 lines
Quoted 2 lines
the common code.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
This reduces the code size very slightly.
Signed-off-by Simon Glass <[email protected]>Applied to u-boot/next, thanks!
I think I said nak against this patch.
https://lists.denx.de/pipermail/u-boot/2023-March/512677.html
Yes,sorry I did'nt get back to it. If this applied I wonder if there is test coverage missing. Do you think you could add a test for it?
I am afk so cannot send a revert for a few days,if someone else can?
Regards,
Simon
Quoted 10 lines
-Takahiro Akashi
Quoted 2 lines
--
Tom
Quoted 8 lines · AKASHI Takahiro
Hi Tom,
Quoted 5 lines · Tom Rini
Quoted 3 lines · Simon Glass
Reduce the duplicated code slightly by using a helper function to handle the common code.
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
This reduces the code size very slightly.
Signed-off-by Simon Glass <[email protected]>Applied to u-boot/next, thanks!
I think I said nak against this patch.
https://lists.denx.de/pipermail/u-boot/2023-March/512677.html
Ah I missed that, sorry, reverting.
Signature · 1 line
Tom