From: ira.weiny@intel.com
To: "Verma, Vishal L" <vishal.l.verma@intel.com>,
Jeff Moyer <jmoyer@redhat.com>
Cc: linux-nvdimm@lists.01.org
Subject: [PATCH] ndctl: Clean up loop logic in query_fw_finish_status
Date: Mon, 28 Oct 2019 14:27:22 -0700 [thread overview]
Message-ID: <20191028212722.10388-1-ira.weiny@intel.com> (raw)
From: Ira Weiny <ira.weiny@intel.com>
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" <vishal.l.verma@intel.com>
Suggested-by: Jeff Moyer <jmoyer@redhat.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
ndctl/dimm.c | 138 ++++++++++++++++++++++++++-------------------------
1 file changed, 70 insertions(+), 68 deletions(-)
diff --git a/ndctl/dimm.c b/ndctl/dimm.c
index b1b84c253cdc..14cafc0c4b8f 100644
--- a/ndctl/dimm.c
+++ b/ndctl/dimm.c
@@ -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;
}
--
2.20.1
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org
reply other threads:[~2019-10-28 21:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191028212722.10388-1-ira.weiny@intel.com \
--to=ira.weiny@intel.com \
--cc=jmoyer@redhat.com \
--cc=linux-nvdimm@lists.01.org \
--cc=vishal.l.verma@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).