Difuse/u-boot
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "disk: Use a helper function to reduce duplication"

Browse source 
Per Takahiro Akashi this is not an equivalent rework, so revert it.

This reverts commit d87bdb82ea.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2023-04-03 10:43:37 -04:00
parent 942ac73afc
commit a25dcda452
1 changed files with 21 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
disk/disk-uclass.c
View file

@ -65,38 +65,26 @@ int part_create_block_devices(struct udevice *blk_dev)
return 0; 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, static ulong part_blk_read(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, void *buffer) lbaint_t blkcnt, void *buffer)
{ {
struct udevice *parent; struct udevice *parent;
struct disk_part *part;
const struct blk_ops *ops; const struct blk_ops *ops;
int ret;
parent = dev_get_parent(dev); parent = dev_get_parent(dev);
ops = blk_get_ops(parent); ops = blk_get_ops(parent);
if (!ops->read) if (!ops->read)
return -ENOSYS; return -ENOSYS;
ret = blk_part_setup(dev, &start, blkcnt); part = dev_get_uclass_plat(dev);
if (ret) if (start >= part->gpt_part_info.size)
return 0; 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); return ops->read(parent, start, blkcnt, buffer);
} }
@ -104,18 +92,22 @@ static ulong part_blk_write(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt, const void *buffer) lbaint_t blkcnt, const void *buffer)
{ {
struct udevice *parent; struct udevice *parent;
struct disk_part *part;
const struct blk_ops *ops; const struct blk_ops *ops;
int ret;
parent = dev_get_parent(dev); parent = dev_get_parent(dev);
ops = blk_get_ops(parent); ops = blk_get_ops(parent);
if (!ops->write) if (!ops->write)
return -ENOSYS; return -ENOSYS;
ret = blk_part_setup(dev, &start, blkcnt); part = dev_get_uclass_plat(dev);
if (ret) if (start >= part->gpt_part_info.size)
return 0; 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); return ops->write(parent, start, blkcnt, buffer);
} }
@ -123,18 +115,22 @@ static ulong part_blk_erase(struct udevice *dev, lbaint_t start,
lbaint_t blkcnt) lbaint_t blkcnt)
{ {
struct udevice *parent; struct udevice *parent;
struct disk_part *part;
const struct blk_ops *ops; const struct blk_ops *ops;
int ret;
parent = dev_get_parent(dev); parent = dev_get_parent(dev);
ops = blk_get_ops(parent); ops = blk_get_ops(parent);
if (!ops->erase) if (!ops->erase)
return -ENOSYS; return -ENOSYS;
ret = blk_part_setup(dev, &start, blkcnt); part = dev_get_uclass_plat(dev);
if (ret) if (start >= part->gpt_part_info.size)
return 0; 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); return ops->erase(parent, start, blkcnt);
} }