From: jeff-lien-wdc Date: Mon, 4 Mar 2024 20:31:26 +0000 (-0600) Subject: ocp: Fix timestamp displayed by fw-activate-history command X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=86628ad7c6773f05f09fae0562905535cd101bf7;p=users%2Fsagi%2Fnvme-cli.git ocp: Fix timestamp displayed by fw-activate-history command The current code is displaying all 8 bytes of the timestamp field for the timestamp. The timestamp value is only in the first 6 bytes. The 7th byte contains the origin and synch fields and the 8th byte is reserved. Signed-off-by: jeff-lien-wdc --- diff --git a/plugins/ocp/ocp-fw-activation-history.c b/plugins/ocp/ocp-fw-activation-history.c index ad96c6be..9f1f7f5b 100644 --- a/plugins/ocp/ocp-fw-activation-history.c +++ b/plugins/ocp/ocp-fw-activation-history.c @@ -66,7 +66,7 @@ static void ocp_fw_activation_history_normal(const struct fw_activation_history printf(" %-22s%d\n", "activation count:", le16_to_cpu(entry->activation_count)); printf(" %-22s%"PRIu64"\n", "timestamp:", - le64_to_cpu(entry->timestamp)); + (0x0000FFFFFFFFFFFF & le64_to_cpu(entry->timestamp))); printf(" %-22s%"PRIu64"\n", "power cycle count:", le64_to_cpu(entry->power_cycle_count)); printf(" %-22s%.*s\n", "previous firmware:", (int)sizeof(entry->previous_fw), @@ -106,7 +106,7 @@ static void ocp_fw_activation_history_json(const struct fw_activation_history *f json_object_add_value_uint(entry_obj, "activation count", le16_to_cpu(entry->activation_count)); json_object_add_value_uint64(entry_obj, "timestamp", - le64_to_cpu(entry->timestamp)); + (0x0000FFFFFFFFFFFF & le64_to_cpu(entry->timestamp))); json_object_add_value_uint(entry_obj, "power cycle count", le64_to_cpu(entry->power_cycle_count));