Skip to contentSkip to conversation

nvme: Fix error code and log to indicate busy

PATCH Superseded Moritz Fischer 2 participants 4 messages Nov 22, 2023 – Dec 2, 2023

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

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.

Fixes 982388eaa991 ("nvme: Add NVM Express driver support")
---
 drivers/nvme/nvme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/nvme/nvme.c +2 -2
index c39cd41aa3..ec45f831a3 100644
@@ -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
#1 lore raw

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.

Fixes 982388eaa991 ("nvme: Add NVM Express driver support")
---
 drivers/nvme/nvme.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/nvme/nvme.c +3 -1
index ec45f831a3..59a139baa0 100644
@@ -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
Reviewed-by on v1 2/2
#2 lore raw

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")
---
 drivers/nvme/nvme.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Reviewed-by on v1 1/2
#3 lore raw
In reply to Moritz Fischer
Quoted 2 lines · Moritz Fischer

Return -EBUSY if 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")
---
 drivers/nvme/nvme.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Quoted 19 lines
drivers/nvme/nvme.c +2 -3
index c39cd41aa3..ec45f831a3 100644
@@ -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