Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 48 additions & 10 deletions components/drivers/block/blk.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,19 +109,24 @@ static rt_err_t blk_control(rt_device_t dev, int cmd, void *args)
{
rt_err_t err;
struct rt_blk_disk *disk = to_blk_disk(dev);
struct rt_device_blk_geometry disk_geometry;

switch (cmd)
{
case RT_DEVICE_CTRL_BLK_GETGEOME:
if (args)
{
err = disk->ops->getgeome(disk, args);
}
else
if (!args)
{
err = -RT_EINVAL;
break;
}

err = disk->ops->getgeome(disk, &disk_geometry);
if (err != RT_EOK)
{
break;
}
rt_memcpy(args, &disk_geometry, sizeof(disk_geometry));
err = RT_EOK;
break;

case RT_DEVICE_CTRL_BLK_SYNC:
Expand Down Expand Up @@ -187,13 +192,43 @@ static rt_err_t blk_control(rt_device_t dev, int cmd, void *args)
break;

case RT_DEVICE_CTRL_BLK_SSIZEGET:
device_get_blk_ssize(dev, args);
err = RT_EOK;
if (!args)
{
err = -RT_EINVAL;
break;
}

err = disk->ops->getgeome(disk, &disk_geometry);
if (err != RT_EOK)
{
break;
}

{
rt_uint32_t ksize = disk_geometry.bytes_per_sector;
rt_memcpy(args, &ksize, sizeof(ksize));
err = RT_EOK;
}
break;

case RT_DEVICE_CTRL_ALL_BLK_SSIZEGET:
device_get_all_blk_ssize(dev, args);
err = RT_EOK;
if (!args)
{
err = -RT_EINVAL;
break;
}

err = disk->ops->getgeome(disk, &disk_geometry);
if (err != RT_EOK)
{
break;
}

{
rt_uint64_t ktotal = (rt_uint64_t)disk_geometry.bytes_per_sector * disk_geometry.sector_count;
rt_memcpy(args, &ktotal, sizeof(ktotal));
err = RT_EOK;
}
break;

default:
Expand Down Expand Up @@ -326,14 +361,17 @@ rt_err_t rt_hw_blk_disk_register(struct rt_blk_disk *disk)
disk->parent.master_id = disk->ida->master_id;
disk->parent.device_id = device_id;
#endif
device_set_blk_fops(&disk->parent);

err = rt_device_register(&disk->parent, disk_name, flags);

if (err)
{
rt_sem_detach(&disk->usr_lock);
}
else
{
device_set_blk_fops(&disk->parent);
}

/* Ignore partition scanning errors */
rt_blk_disk_probe_partition(disk);
Expand Down
72 changes: 52 additions & 20 deletions components/drivers/block/blk_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -68,25 +68,30 @@ static rt_err_t blk_dev_control(rt_device_t dev, int cmd, void *args)
rt_err_t err = -RT_EINVAL;
struct rt_blk_device *blk = to_blk(dev);
struct rt_blk_disk *disk = blk->disk;
struct rt_device_blk_geometry disk_geometry, *geometry;
struct rt_device_blk_geometry disk_geometry;

switch (cmd)
{
case RT_DEVICE_CTRL_BLK_GETGEOME:
if ((geometry = args))
if (!args)
{
if (!(err = disk->ops->getgeome(disk, &disk_geometry)))
{
geometry->bytes_per_sector = disk_geometry.bytes_per_sector;
geometry->block_size = disk_geometry.block_size;
geometry->sector_count = blk->sector_count;
}
err = -RT_EINVAL;
break;
}
else

if ((err = disk->ops->getgeome(disk, &disk_geometry)) != RT_EOK)
{
err = -RT_EINVAL;
break;
}

{
struct rt_device_blk_geometry kgeo;
kgeo.bytes_per_sector = disk_geometry.bytes_per_sector;
kgeo.block_size = disk_geometry.block_size;
kgeo.sector_count = blk->sector_count;
rt_memcpy(args, &kgeo, sizeof(kgeo));
err = RT_EOK;
}
break;

case RT_DEVICE_CTRL_BLK_SYNC:
Expand All @@ -106,25 +111,51 @@ static rt_err_t blk_dev_control(rt_device_t dev, int cmd, void *args)
break;

case RT_DEVICE_CTRL_BLK_PARTITION:
if (args)
if (!args)
{
rt_memcpy(args, &blk->partition, sizeof(blk->partition));
err = -RT_EINVAL;
break;
}
else
rt_memcpy(args, &blk->partition, sizeof(blk->partition));
err = RT_EOK;
break;

case RT_DEVICE_CTRL_BLK_SSIZEGET:
if (!args)
{
err = -RT_EINVAL;
break;
}

break;
if ((err = disk->ops->getgeome(disk, &disk_geometry)) != RT_EOK)
{
break;
}

case RT_DEVICE_CTRL_BLK_SSIZEGET:
device_get_blk_ssize(dev, args);
err = RT_EOK;
{
rt_uint32_t ksize = disk_geometry.bytes_per_sector;
rt_memcpy(args, &ksize, sizeof(ksize));
err = RT_EOK;
}
break;

case RT_DEVICE_CTRL_ALL_BLK_SSIZEGET:
device_get_all_blk_ssize(dev, args);
err = RT_EOK;
if (!args)
{
err = -RT_EINVAL;
break;
}

if ((err = disk->ops->getgeome(disk, &disk_geometry)) != RT_EOK)
{
break;
}

{
rt_uint64_t ktotal = (rt_uint64_t)disk_geometry.bytes_per_sector * blk->sector_count;
rt_memcpy(args, &ktotal, sizeof(ktotal));
err = RT_EOK;
}
break;

default:
Expand Down Expand Up @@ -215,7 +246,6 @@ rt_err_t disk_add_blk_dev(struct rt_blk_disk *disk, struct rt_blk_device *blk)
#else
rt_snprintf(blk->parent.parent.name, RT_NAME_MAX, name_fmt, disk_name, blk->partno);
#endif
device_set_blk_fops(&blk->parent);

err = rt_device_register(&blk->parent, to_blk_name(blk),
disk->parent.flag & RT_DEVICE_FLAG_RDWR);
Expand All @@ -228,6 +258,8 @@ rt_err_t disk_add_blk_dev(struct rt_blk_disk *disk, struct rt_blk_device *blk)
return err;
}

device_set_blk_fops(&blk->parent);

spin_lock(&disk->lock);

rt_list_insert_before(&disk->part_nodes, &blk->list);
Expand Down
81 changes: 81 additions & 0 deletions components/drivers/block/blk_dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,85 @@ rt_err_t disk_remove_blk_dev(struct rt_blk_device *blk, rt_bool_t lockless);

rt_uint32_t blk_request_ioprio(void);

static inline rt_err_t blk_get_geometry_k(struct rt_device *dev, struct rt_device_blk_geometry *geo)
{
struct rt_blk_disk *disk;
struct rt_blk_device *blk;
struct rt_device_blk_geometry disk_geo;
rt_err_t err;

if (!geo)
{
return -RT_EINVAL;
}

disk = to_blk_disk(dev);
if (disk && disk->__magic == RT_BLK_DISK_MAGIC)
{
err = disk->ops->getgeome(disk, &disk_geo);
if (err != RT_EOK)
{
return err;
}
rt_memcpy(geo, &disk_geo, sizeof(*geo));
return RT_EOK;
}

blk = to_blk(dev);
if (blk && blk->disk)
{
disk = blk->disk;
err = disk->ops->getgeome(disk, &disk_geo);
if (err != RT_EOK)
{
return err;
}
geo->bytes_per_sector = disk_geo.bytes_per_sector;
geo->block_size = disk_geo.block_size;
geo->sector_count = blk->sector_count;
return RT_EOK;
}

return -RT_EINVAL;
}

static inline rt_err_t blk_get_total_size_k(struct rt_device *dev, rt_uint64_t *total)
{
struct rt_blk_disk *disk;
struct rt_blk_device *blk;
struct rt_device_blk_geometry disk_geo;
rt_err_t err;

if (!total)
{
return -RT_EINVAL;
}

disk = to_blk_disk(dev);
if (disk && disk->__magic == RT_BLK_DISK_MAGIC)
{
err = disk->ops->getgeome(disk, &disk_geo);
if (err != RT_EOK)
{
return err;
}
*total = (rt_uint64_t)disk_geo.bytes_per_sector * disk_geo.sector_count;
return RT_EOK;
}

blk = to_blk(dev);
if (blk && blk->disk)
{
disk = blk->disk;
err = disk->ops->getgeome(disk, &disk_geo);
if (err != RT_EOK)
{
return err;
}
*total = (rt_uint64_t)disk_geo.bytes_per_sector * blk->sector_count;
return RT_EOK;
}

return -RT_EINVAL;
}
#endif /* __BLK_DEV_H__ */
Loading
Loading