fix #1324 using explicit casting, using libnvme macro for cap

Signed-off-by: Steven Seungcheol Lee <sc108.lee@samsung.com>

diff --git a/nvme-print.c b/nvme-print.c
index 894d25711ede52c55f72df7630eb46248d317b92..3910f145657c591797f5db60a1f582df3dbbfa11 100644 (file)
--- a/nvme-print.c
+++ b/nvme-print.c
@@ -507,6 +507,7 @@ static void json_fw_log(struct nvme_firmware_slot *fw_log, const char *devname)
        char fmt[21];
        char str[32];
        int i;
+       __le64 *frs;
 
        root = json_create_object();
        fwsi = json_create_object();
@@ -517,8 +518,9 @@ static void json_fw_log(struct nvme_firmware_slot *fw_log, const char *devname)
                if (fw_log->frs[i]) {
                        snprintf(fmt, sizeof(fmt), "Firmware Rev Slot %d",
                                i + 1);
+                       frs = (__le64 *)&fw_log->frs[i];
                        snprintf(str, sizeof(str), "%"PRIu64" (%s)",
-                               (uint64_t)fw_log->frs[i],
+                               le64_to_cpu(*frs),
                        fw_to_string(fw_log->frs[i]));
                        json_object_add_value_string(fwsi, fmt, str);
                }
@@ -5360,6 +5362,7 @@ void nvme_show_fw_log(struct nvme_firmware_slot *fw_log,
        const char *devname, enum nvme_print_flags flags)
 {
        int i;
+       __le64 *frs;
 
        if (flags & BINARY)
                return d_raw((unsigned char *)fw_log, sizeof(*fw_log));
@@ -5369,10 +5372,12 @@ void nvme_show_fw_log(struct nvme_firmware_slot *fw_log,
        printf("Firmware Log for device:%s\n", devname);
        printf("afi  : %#x\n", fw_log->afi);
        for (i = 0; i < 7; i++) {
-               if (fw_log->frs[i])
+               if (fw_log->frs[i]) {
+                       frs = (__le64 *)&fw_log->frs[i];
                        printf("frs%d : %#016"PRIx64" (%s)\n", i + 1,
-                               (uint64_t)fw_log->frs[i],
+                               le64_to_cpu(*frs),
                                fw_to_string(fw_log->frs[i]));
+               }
        }
 }
 

diff --git a/nvme.c b/nvme.c
index b3caa523dbb97a405b76422a75fa8fee3355a88a..71b8bb12b2e899fef9dd4a66dcf4b02199ccf92c 100644 (file)
--- a/nvme.c
+++ b/nvme.c
@@ -677,7 +677,7 @@ static int get_effects_log(int argc, char **argv, struct command *cmd, struct pl
 
        if (cfg.csi < 0) {
                nvme_root_t nvme_root;
-               uint64_t cap_value;
+               uint64_t cap;
                int nvme_command_set_supported;
                int other_command_sets_supported;
                nvme_root = nvme_scan(NULL);
@@ -687,11 +687,11 @@ static int get_effects_log(int argc, char **argv, struct command *cmd, struct pl
                if (!bar) {
                        goto close_fd;
                }
-               cap_value = mmio_read64(bar + NVME_REG_CAP);
+               cap = mmio_read64(bar + NVME_REG_CAP);
                munmap(bar, getpagesize());
 
-               nvme_command_set_supported = (cap_value & (1UL << 37)) != 0;
-               other_command_sets_supported = (cap_value & (1UL << (37+6))) != 0;
+               nvme_command_set_supported = NVME_CAP_CSS(cap) & NVME_CAP_CSS_NVM;
+               other_command_sets_supported = NVME_CAP_CSS(cap) & NVME_CAP_CSS_CSI;
 
 
                if (nvme_command_set_supported) {