diff options
| -rw-r--r-- | components/drivers/block/blk.c | 58 | ||||
| -rw-r--r-- | components/drivers/block/blk_dev.c | 72 | ||||
| -rw-r--r-- | components/drivers/block/blk_dev.h | 81 | ||||
| -rw-r--r-- | components/drivers/block/blk_dfs.c | 140 | ||||
| -rw-r--r-- | components/drivers/block/blk_dfs.h | 2 |
5 files changed, 294 insertions, 59 deletions
diff --git a/components/drivers/block/blk.c b/components/drivers/block/blk.c index a0c18acca9..5399cce359 100644 --- a/components/drivers/block/blk.c +++ b/components/drivers/block/blk.c @@ -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: @@ -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: @@ -326,7 +361,6 @@ 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); @@ -334,6 +368,10 @@ rt_err_t rt_hw_blk_disk_register(struct rt_blk_disk *disk) { rt_sem_detach(&disk->usr_lock); } + else + { + device_set_blk_fops(&disk->parent); + } /* Ignore partition scanning errors */ rt_blk_disk_probe_partition(disk); diff --git a/components/drivers/block/blk_dev.c b/components/drivers/block/blk_dev.c index 5c45aa5ecc..fd2d078e6f 100644 --- a/components/drivers/block/blk_dev.c +++ b/components/drivers/block/blk_dev.c @@ -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: @@ -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: @@ -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); @@ -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); diff --git a/components/drivers/block/blk_dev.h b/components/drivers/block/blk_dev.h index b433f57f87..7b24618f0a 100644 --- a/components/drivers/block/blk_dev.h +++ b/components/drivers/block/blk_dev.h @@ -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__ */ diff --git a/components/drivers/block/blk_dfs.c b/components/drivers/block/blk_dfs.c index ce637b687c..aabd23efc0 100644 --- a/components/drivers/block/blk_dfs.c +++ b/components/drivers/block/blk_dfs.c @@ -10,12 +10,19 @@ #include <rtthread.h> +#include "blk_dev.h" #include "blk_dfs.h" #include <drivers/classes/block.h> #if defined(RT_USING_POSIX_DEVIO) && defined(RT_USING_DFS_V2) #include <dfs_file.h> +#include <dfs_fs.h> + +#ifdef RT_USING_LWP +#include <lwp.h> +#include <lwp_user_mm.h> +#endif struct blk_fops_data { @@ -26,16 +33,48 @@ static int blk_fops_open(struct dfs_file *file) { struct rt_device *dev = file->vnode->data; struct blk_fops_data *data = rt_malloc(sizeof(*data)); + rt_uint16_t oflag = RT_DEVICE_OFLAG_RDONLY; + rt_uint64_t total_size; + rt_err_t err; if (!data) { return (int)-RT_ENOMEM; } - dev->user_data = data; - rt_device_control(dev, RT_DEVICE_CTRL_BLK_GETGEOME, &data->geometry); - rt_device_control(dev, RT_DEVICE_CTRL_ALL_BLK_SSIZEGET, &file->vnode->size); + if ((file->flags & O_ACCMODE) != O_RDONLY) + { + oflag = RT_DEVICE_OFLAG_RDWR; + } + + err = rt_device_open(dev, oflag); + if (err != RT_EOK) + { + rt_free(data); + + return (int)err; + } + err = blk_get_geometry_k(dev, &data->geometry); + if (err != RT_EOK) + { + rt_device_close(dev); + rt_free(data); + + return (int)err; + } + + err = blk_get_total_size_k(dev, &total_size); + if (err != RT_EOK) + { + rt_device_close(dev); + rt_free(data); + + return (int)err; + } + + file->vnode->size = (size_t)total_size; + dev->user_data = data; return 0; } @@ -45,6 +84,7 @@ static int blk_fops_close(struct dfs_file *file) rt_free(dev->user_data); dev->user_data = RT_NULL; + rt_device_close(dev); return 0; } @@ -53,6 +93,76 @@ static int blk_fops_ioctl(struct dfs_file *file, int cmd, void *arg) { struct rt_device *dev = file->vnode->data; +#ifdef RT_USING_LWP + if (lwp_self() != RT_NULL) + { + rt_err_t err; + union blk_user_ioctl_arg + { + struct rt_device_blk_geometry geometry; + rt_uint32_t sector_size; + rt_uint64_t total_size; + struct dfs_partition partition; + } karg; + size_t arg_size = 0; + void *kptr = arg; + + switch (cmd) + { + case RT_DEVICE_CTRL_BLK_GETGEOME: + arg_size = sizeof(karg.geometry); + kptr = &karg.geometry; + break; + + case RT_DEVICE_CTRL_BLK_SSIZEGET: + arg_size = sizeof(karg.sector_size); + kptr = &karg.sector_size; + break; + + case RT_DEVICE_CTRL_ALL_BLK_SSIZEGET: + arg_size = sizeof(karg.total_size); + kptr = &karg.total_size; + break; + + case RT_DEVICE_CTRL_BLK_PARTITION: + arg_size = sizeof(karg.partition); + kptr = &karg.partition; + break; + + default: + break; + } + + if (arg_size) + { + if (arg == RT_NULL || !lwp_user_accessable(arg, arg_size)) + { + return (int)-RT_EFAULT; + } + + rt_memset(&karg, 0, sizeof(karg)); + + err = rt_device_control(dev, cmd, kptr); + if (err != RT_EOK) + { + return (int)err; + } + + if (cmd == RT_DEVICE_CTRL_BLK_PARTITION) + { + karg.partition.lock = RT_NULL; + } + + if (lwp_put_to_user(arg, kptr, arg_size) != arg_size) + { + return (int)-RT_EFAULT; + } + + return 0; + } + } +#endif /* RT_USING_LWP */ + return (int)rt_device_control(dev, cmd, arg); } @@ -255,27 +365,3 @@ void device_set_blk_fops(struct rt_device *dev) { } #endif /* RT_USING_POSIX_DEVIO && RT_USING_DFS_V2 */ - -void device_get_blk_ssize(struct rt_device *dev, void *args) -{ - rt_uint32_t bytes_per_sector; - struct rt_device_blk_geometry geometry; - - rt_device_control(dev, RT_DEVICE_CTRL_BLK_GETGEOME, &geometry); - bytes_per_sector = geometry.bytes_per_sector; - - RT_ASSERT(sizeof(bytes_per_sector) == sizeof(geometry.bytes_per_sector)); - - rt_memcpy(args, &bytes_per_sector, sizeof(bytes_per_sector)); -} - -void device_get_all_blk_ssize(struct rt_device *dev, void *args) -{ - rt_uint64_t count_mul_per; - struct rt_device_blk_geometry geometry; - - rt_device_control(dev, RT_DEVICE_CTRL_BLK_GETGEOME, &geometry); - count_mul_per = geometry.bytes_per_sector * geometry.sector_count; - - rt_memcpy(args, &count_mul_per, sizeof(count_mul_per)); -} diff --git a/components/drivers/block/blk_dfs.h b/components/drivers/block/blk_dfs.h index c532869fc7..58eeea89ff 100644 --- a/components/drivers/block/blk_dfs.h +++ b/components/drivers/block/blk_dfs.h @@ -17,7 +17,5 @@ #define RT_DEVICE_CTRL_ALL_BLK_SSIZEGET 0x80081272 /**< get number of bytes per sector * sector counts */ void device_set_blk_fops(struct rt_device *dev); -void device_get_blk_ssize(struct rt_device *dev, void *args); -void device_get_all_blk_ssize(struct rt_device *dev, void *args); #endif /* __BLK_DFS_H__ */ |
