ndctl: Clean up loop logic in query_fw_finish_status
PATCH 1/1 ndctl: Clean up loop logic in query_fw_finish_status
From: Ira Weiny <[email protected]>
This gets rid of a redundant variable as originally pointed out by Jeff Moyer[1]
Also, while we are here change the printf's to fprintf(stderr, ...)
[1] https://patchwork.kernel.org/patch/11199557/
To: "Verma, Vishal L" <[email protected]>
Suggested-by Jeff Moyer <[email protected]>
Signed-off-by Ira Weiny <[email protected]>
--- ndctl/dimm.c | 138 ++++++++++++++++++++++++++------------------------- 1 file changed, 70 insertions(+), 68 deletions(-)
ndctl/dimm.c +70 -68
@@ -691,85 +691,87 @@ static int query_fw_finish_status(struct ndctl_dimm *dimm, rc =clock_gettime (CLOCK_MONOTONIC , &before);if (rc <0 ) - goto out; + goto unref; now.tv_nsec = fw->query_interval /1000 ; now.tv_sec =0 ; -do { - rc =ndctl_cmd_submit (cmd); -if (rc <0 ) -break ; +again: + rc =ndctl_cmd_submit (cmd); +if (rc <0 ) + goto unref; - status =ndctl_cmd_fw_xlat_firmware_status (cmd); -switch (status) { -case FW_SUCCESS : - ver =ndctl_cmd_fw_fquery_get_fw_rev (cmd); -if (ver ==0 ) { -fprintf (stderr,"No firmware updated.\n" ); - rc = -ENXIO ; - goto out; - } + status =ndctl_cmd_fw_xlat_firmware_status (cmd); +if (status ==FW_EBUSY ) { +/* Still on going, continue */ + rc =clock_gettime (CLOCK_MONOTONIC , &after); +if (rc <0 ) { + rc = -errno; + goto unref; + } -printf ("Image updated successfully to DIMM %s.\n" , -ndctl_dimm_get_devname (dimm)); -printf ("Firmware version %#lx.\n" , ver); -printf ("Cold reboot to activate.\n" ); - rc =0 ; - goto out; -break ; -case FW_EBUSY : -/* Still on going, continue */ - rc =clock_gettime (CLOCK_MONOTONIC , &after); -if (rc <0 ) { - rc = -errno; - goto out; - } +/* +* If we expire max query time, +* we timed out +*/ +if (after.tv_sec - before.tv_sec > + fw->max_query /1000000 ) { + rc = -ETIMEDOUT ; + goto unref; + } -/* -* If we expire max query time, -* we timed out -*/ -if (after.tv_sec - before.tv_sec > - fw->max_query /1000000 ) { - rc = -ETIMEDOUT ; - goto out; - } +/* +* Sleep the interval dictated by firmware +* before query again. +*/ + rc =nanosleep (&now,NULL ); +if (rc <0 ) { + rc = -errno; + goto unref; + } + goto again; + } -/* -* Sleep the interval dictated by firmware -* before query again. -*/ - rc =nanosleep (&now,NULL ); -if (rc <0 ) { - rc = -errno; - goto out; - } -break ; -case FW_EBADFW : -fprintf (stderr, -"Firmware failed to verify by DIMM %s.\n" , -ndctl_dimm_get_devname (dimm)); -case FW_EINVAL_CTX : -case FW_ESEQUENCE : +/* We are done determine error code */ +switch (status) { +case FW_SUCCESS : + ver =ndctl_cmd_fw_fquery_get_fw_rev (cmd); +if (ver ==0 ) { +fprintf (stderr,"No firmware updated.\n" ); rc = -ENXIO ; - goto out; -case FW_ENORES : -fprintf (stderr, -"Firmware update sequence timed out: %s\n" , -ndctl_dimm_get_devname (dimm)); - rc = -ETIMEDOUT ; - goto out; -default : -fprintf (stderr, -"Unknown update status: %#x on DIMM %s\n" , - status,ndctl_dimm_get_devname (dimm)); - rc = -EINVAL ; - goto out; + goto unref; } - }while (true); -out: +fprintf (stderr,"Image updated successfully to DIMM %s.\n" , +ndctl_dimm_get_devname (dimm)); +fprintf (stderr,"Firmware version %#lx.\n" , ver); +fprintf (stderr,"Cold reboot to activate.\n" ); + rc =0 ; +break ; +case FW_EBADFW : +fprintf (stderr, +"Firmware failed to verify by DIMM %s.\n" , +ndctl_dimm_get_devname (dimm)); +/* FALLTHROUGH */ +case FW_EINVAL_CTX : +case FW_ESEQUENCE : + rc = -ENXIO ; +break ; +case FW_ENORES : +fprintf (stderr, +"Firmware update sequence timed out: %s\n" , +ndctl_dimm_get_devname (dimm)); + rc = -ETIMEDOUT ; +break ; +default : +fprintf (stderr, +"Unknown update status: %#x on DIMM %s\n" , + status,ndctl_dimm_get_devname (dimm)); + rc = -EINVAL ; +break ; + } + +unref:ndctl_cmd_unref (cmd);return rc; }
Signature · 4 lines
2.20.1 _______________________________________________ Linux-nvdimm mailing list -- [email protected] To unsubscribe send an email to [email protected]