nvme: Fix error code and log to indicate busy
PATCH 1/2 nvme: Fix error code and log to indicate busy
Return -EBUSY if controller is found busy rather than -ENOMEM and update the error message accordingly.
--- drivers/nvme/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/nvme.c +2 -2
@@ -835,8 +835,8 @@ int nvme_init(struct udevice *udev) ndev->udev = udev;INIT_LIST_HEAD (&ndev->namespaces);if (readl (&ndev->bar->csts) ==-1 ) { - ret = -ENODEV ; -printf ("Error: %s: Out of memory!\n" , udev->name); + ret = -EBUSY ; +printf ("Error: %s: Controller not ready!\n" , udev->name); goto free_nvme; }
Signature · 1 line
2.43.0.rc1.413.gea7ed67945-goog
PATCH 2/2 nvme: Update scan namespace to keep trying on busy
A busy controller shouldn't be game-over for all controllers, so keep trying on hitting -EBUSY.
This change brings the actual behavior of the routine in line with what the descriptions says.
--- drivers/nvme/nvme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/nvme.c +3 -1
@@ -695,7 +695,9 @@ int nvme_scan_namespace(void)if (ret) {log_err ("Failed to probe '%s': err=%dE\n" , dev->name, ret); -return ret; +/* Bail if we ran out of memory, else keep trying */ +if (ret != -EBUSY ) +return ret; } }
Signature · 1 line
2.43.0.rc1.413.gea7ed67945-goog
Re: [PATCH 2/2] nvme: Update scan namespace to keep trying on busy
Quoted 4 lines · Moritz Fischer
A busy controller shouldn't be game-over for all controllers, so keep trying on hitting
-EBUSY.
Quoted 8 lines
This change brings the actual behavior of the routine in line with what the descriptions says.
Fixes 982388eaa991 ("nvme: Add NVM Express driver support")Signed-off-by Moritz Fischer <[email protected]>--- drivers/nvme/nvme.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
Quoted 2 lines · Moritz Fischer
Return
-EBUSYif controller is found busy rather than-ENOMEM
-ENODEV ?
Quoted 7 lines
and update the error message accordingly.
Fixes 982388eaa991 ("nvme: Add NVM Express driver support")Signed-off-by Moritz Fischer <[email protected]>--- drivers/nvme/nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 19 lines
drivers/nvme/nvme.c +2
-3@@ -835,8 +835,8 @@ int nvme_init(struct udevice *udev) ndev->udev = udev;INIT_LIST_HEAD (&ndev->namespaces);if (readl (&ndev->bar->csts) ==-1 ) { - ret = -ENODEV ; -printf ("Error: %s: Out of memory!\n" , udev->name); + ret = -EBUSY ; +printf ("Error: %s: Controller not ready!\n" , udev->name); goto free_nvme; } --2.43.0.rc1.413.gea7ed67945-goog