ocp: fix TCG configuration log endian

Fix the entry data fields to little endian format.
Basically print functions convert the fields data to cpu format.
But still some errors then fixed the print json functions also.

Signed-off-by: Tokunori Ikegami <ikegami.t@gmail.com>

diff --git a/plugins/ocp/ocp-nvme.h b/plugins/ocp/ocp-nvme.h
index af2cbe9a934f0e4518377afdc418cfb05ffa2e23..04acbfc0325829e7b03b95f2b5bea2d59e72de93 100644 (file)
--- a/plugins/ocp/ocp-nvme.h
+++ b/plugins/ocp/ocp-nvme.h
@@ -231,11 +231,11 @@ struct __packed tcg_configuration_log {
        __u8    no_of_read_unlock_locking_obj;
        __u8    no_of_write_unlock_locking_obj;
        __u8    rsvd2;
-       __u32   sid_auth_try_count;
-       __u32   sid_auth_try_limit;
-       __u32   pro_tcg_rc;
-       __u32   pro_rlc;
-       __u32   tcg_ec;
+       __le32  sid_auth_try_count;
+       __le32  sid_auth_try_limit;
+       __le32  pro_tcg_rc;
+       __le32  pro_rlc;
+       __le32  tcg_ec;
        __u8    rsvd3[458];
        __le16  log_page_version;
        __u8    log_page_guid[GUID_LEN];

diff --git a/plugins/ocp/ocp-print-json.c b/plugins/ocp/ocp-print-json.c
index fe11fd249a185e5b69faa6c9911399e8aec272e6..a600628ddd29df7f23b6b39dc300e4f32772610b 100644 (file)
--- a/plugins/ocp/ocp-print-json.c
+++ b/plugins/ocp/ocp-print-json.c
@@ -775,42 +775,42 @@ static void json_c7_log(struct nvme_dev *dev, struct tcg_configuration_log *log_
 
        root = json_create_object();
 
-       json_object_add_value_int(root, "State", le16_to_cpu(log_data->state));
+       json_object_add_value_int(root, "State", log_data->state);
        memset((__u8 *)res, 0, 3);
        for (j = 0; j < 3; j++)
                res += sprintf(res, "%d", log_data->rsvd1[j]);
        json_object_add_value_string(root, "Reserved1", res_arr);
        json_object_add_value_int(root, "Locking SP Activation Count",
-                                 le16_to_cpu(log_data->locking_sp_act_count));
+                                 log_data->locking_sp_act_count);
        json_object_add_value_int(root, "Tper Revert Count",
-                                 le16_to_cpu(log_data->locking_sp_rev_count));
+                                 log_data->locking_sp_rev_count);
        json_object_add_value_int(root, "Number of Locking Objects",
-                                 le16_to_cpu(log_data->no_of_locking_obj));
+                                 log_data->no_of_locking_obj);
        json_object_add_value_int(root, "Number of Single User Mode Locking Objects",
-                                 le16_to_cpu(log_data->no_of_single_um_locking_obj));
+                                 log_data->no_of_single_um_locking_obj);
        json_object_add_value_int(root, "Number of Range Provisioned Locking Objects",
-                                 le16_to_cpu(log_data->no_of_range_prov_locking_obj));
+                                 log_data->no_of_range_prov_locking_obj);
        json_object_add_value_int(root, "Number of Namespace Provisioned Locking Objects",
-                                 le16_to_cpu(log_data->no_of_ns_prov_locking_obj));
+                                 log_data->no_of_ns_prov_locking_obj);
        json_object_add_value_int(root, "Number of Read Locked Locking Objects",
-                                 le16_to_cpu(log_data->no_of_read_lock_locking_obj));
+                                 log_data->no_of_read_lock_locking_obj);
        json_object_add_value_int(root, "Number of Write Locked Locking Objects",
-                                 le16_to_cpu(log_data->no_of_write_lock_locking_obj));
+                                 log_data->no_of_write_lock_locking_obj);
        json_object_add_value_int(root, "Number of Read Unlocked Locking Objects",
-                                 le16_to_cpu(log_data->no_of_read_unlock_locking_obj));
+                                 log_data->no_of_read_unlock_locking_obj);
        json_object_add_value_int(root, "Number of Write Unlocked Locking Objects",
-                                 le16_to_cpu(log_data->no_of_write_unlock_locking_obj));
-       json_object_add_value_int(root, "Reserved2", le16_to_cpu(log_data->rsvd2));
+                                 log_data->no_of_write_unlock_locking_obj);
+       json_object_add_value_int(root, "Reserved2", log_data->rsvd2);
 
        json_object_add_value_int(root, "SID Authentication Try Count",
-                                 le16_to_cpu(log_data->sid_auth_try_count));
+                                 le32_to_cpu(log_data->sid_auth_try_count));
        json_object_add_value_int(root, "SID Authentication Try Limit",
-                                 le16_to_cpu(log_data->sid_auth_try_limit));
+                                 le32_to_cpu(log_data->sid_auth_try_limit));
        json_object_add_value_int(root, "Programmatic TCG Reset Count",
-                                 le16_to_cpu(log_data->pro_tcg_rc));
+                                 le32_to_cpu(log_data->pro_tcg_rc));
        json_object_add_value_int(root, "Programmatic Reset Lock Count",
-                                 le16_to_cpu(log_data->pro_rlc));
-       json_object_add_value_int(root, "TCG Error Count", le16_to_cpu(log_data->tcg_ec));
+                                 le32_to_cpu(log_data->pro_rlc));
+       json_object_add_value_int(root, "TCG Error Count", le32_to_cpu(log_data->tcg_ec));
 
        memset((__u8 *)res, 0, 458);
        for (j = 0; j < 458; j++)