brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvme: Move block dev creation from uclass post_probe() to driver probe() 

At present the block device creation happens in the NVMe uclass
driver post_probe() phase. In preparation to support multiple
namespaces, we should issue namespace identify before creating
block devices but that touches the underlying hardware hence it
is not appropriate to do such in the uclass driver post_probe().
Let's move it to driver probe() phase instead.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Bin Meng 2021-06-22 21:16:17 +08:00
parent c3e52c71bb
commit 84344258f2
2 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/nvme/nvme-uclass.c
View File

@ -5,39 +5,9 @@
*/
#include <common.h>
#include <blk.h>
#include <errno.h>
#include <dm.h>
#include <dm/device.h>
#include "nvme.h"
static int nvme_uclass_post_probe(struct udevice *udev)
{
char name[20];
struct udevice *ns_udev;
int i, ret;
struct nvme_dev *ndev = dev_get_priv(udev);
/* Create a blk device for each namespace */
for (i = 0; i < ndev->nn; i++) {
/*
* Encode the namespace id to the device name so that
* we can extract it when doing the probe.
*/
sprintf(name, "blk#%d", i);
/* The real blksz and size will be set by nvme_blk_probe() */
ret = blk_create_devicef(udev, "nvme-blk", name, IF_TYPE_NVME,
-1, 512, 0, &ns_udev);
if (ret)
return ret;
}
return 0;
}
UCLASS_DRIVER(nvme) = {
.name = "nvme",
.id = UCLASS_NVME,
.post_probe = nvme_uclass_post_probe,
};

18
drivers/nvme/nvme.c
View File

@ -878,6 +878,24 @@ static int nvme_probe(struct udevice *udev)
nvme_get_info_from_identify(ndev);
/* Create a blk device for each namespace */
for (int i = 0; i < ndev->nn; i++) {
struct udevice *ns_udev;
char name[20];
/*
* Encode the namespace id to the device name so that
* we can extract it when doing the probe.
*/
sprintf(name, "blk#%d", i);
/* The real blksz and size will be set by nvme_blk_probe() */
ret = blk_create_devicef(udev, "nvme-blk", name, IF_TYPE_NVME,
-1, 512, 0, &ns_udev);
if (ret)
goto free_queue;
}
return 0;
free_queue: