public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

block: introduce add_disk_fwnode()

Browse source 
Introduce add_disk_fwnode() as a replacement of device_add_disk() that
permits to pass and attach a fwnode to disk dev.

This variant can be useful for eMMC that might have the partition table
for the disk defined in DT. A parser can later make use of the attached
fwnode to parse the related table and init the hardcoded partition for
the disk.

device_add_disk() is converted to a simple wrapper of add_disk_fwnode()
with the fwnode entry set as NULL.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20241002221306.4403-4-ansuelsmth@gmail.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christian Marangi 2024-10-03 00:11:43 +02:00 • committed by Jens Axboe
parent 592e4deeab
commit 9dfd9ea93a
2 changed files with 27 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
block/genhd.c
View file

@ -383,16 +383,18 @@ int disk_scan_partitions(struct gendisk *disk, blk_mode_t mode)
} }
/** /**
* device_add_disk - add disk information to kernel list * add_disk_fwnode - add disk information to kernel list with fwnode
* @parent: parent device for the disk * @parent: parent device for the disk
* @disk: per-device partitioning information * @disk: per-device partitioning information
* @groups: Additional per-device sysfs groups * @groups: Additional per-device sysfs groups
* @fwnode: attached disk fwnode
* *
* This function registers the partitioning information in @disk * This function registers the partitioning information in @disk
* with the kernel. * with the kernel. Also attach a fwnode to the disk device.
*/ */
int __must_check device_add_disk(struct device *parent, struct gendisk *disk, int __must_check add_disk_fwnode(struct device *parent, struct gendisk *disk,
const struct attribute_group **groups) const struct attribute_group **groups,
struct fwnode_handle *fwnode)
{ {
struct device *ddev = disk_to_dev(disk); struct device *ddev = disk_to_dev(disk);
@ -452,6 +454,8 @@ int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
ddev->parent = parent; ddev->parent = parent;
ddev->groups = groups; ddev->groups = groups;
dev_set_name(ddev, "%s", disk->disk_name); dev_set_name(ddev, "%s", disk->disk_name);
if (fwnode)
device_set_node(ddev, fwnode);
if (!(disk->flags & GENHD_FL_HIDDEN)) if (!(disk->flags & GENHD_FL_HIDDEN))
ddev->devt = MKDEV(disk->major, disk->first_minor); ddev->devt = MKDEV(disk->major, disk->first_minor);
ret = device_add(ddev); ret = device_add(ddev);
@ -553,6 +557,22 @@ out_exit_elevator:
elevator_exit(disk->queue); elevator_exit(disk->queue);
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(add_disk_fwnode);
/**
* device_add_disk - add disk information to kernel list
* @parent: parent device for the disk
* @disk: per-device partitioning information
* @groups: Additional per-device sysfs groups
*
* This function registers the partitioning information in @disk
* with the kernel.
*/
int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
const struct attribute_group **groups)
{
return add_disk_fwnode(parent, disk, groups, NULL);
}
EXPORT_SYMBOL(device_add_disk); EXPORT_SYMBOL(device_add_disk);
static void blk_report_disk_dead(struct gendisk *disk, bool surprise) static void blk_report_disk_dead(struct gendisk *disk, bool surprise)

3
include/linux/blkdev.h
View file

@ -725,6 +725,9 @@ static inline unsigned int blk_queue_depth(struct request_queue *q)
#define for_each_bio(_bio) \ #define for_each_bio(_bio) \
for (; _bio; _bio = _bio->bi_next) for (; _bio; _bio = _bio->bi_next)
int __must_check add_disk_fwnode(struct device *parent, struct gendisk *disk,
const struct attribute_group **groups,
struct fwnode_handle *fwnode);
int __must_check device_add_disk(struct device *parent, struct gendisk *disk, int __must_check device_add_disk(struct device *parent, struct gendisk *disk,
const struct attribute_group **groups); const struct attribute_group **groups);
static inline int __must_check add_disk(struct gendisk *disk) static inline int __must_check add_disk(struct gendisk *disk)