Skip to content

Commit 6f7b9d7

Browse files
committed
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>
1 parent a4c5885 commit 6f7b9d7

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

plugins/ocp/ocp-nvme.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -231,11 +231,11 @@ struct __packed tcg_configuration_log {
231231
__u8 no_of_read_unlock_locking_obj;
232232
__u8 no_of_write_unlock_locking_obj;
233233
__u8 rsvd2;
234-
__u32 sid_auth_try_count;
235-
__u32 sid_auth_try_limit;
236-
__u32 pro_tcg_rc;
237-
__u32 pro_rlc;
238-
__u32 tcg_ec;
234+
__le32 sid_auth_try_count;
235+
__le32 sid_auth_try_limit;
236+
__le32 pro_tcg_rc;
237+
__le32 pro_rlc;
238+
__le32 tcg_ec;
239239
__u8 rsvd3[458];
240240
__le16 log_page_version;
241241
__u8 log_page_guid[GUID_LEN];

plugins/ocp/ocp-print-json.c

+17-17
Original file line numberDiff line numberDiff line change
@@ -775,42 +775,42 @@ static void json_c7_log(struct nvme_dev *dev, struct tcg_configuration_log *log_
775775

776776
root = json_create_object();
777777

778-
json_object_add_value_int(root, "State", le16_to_cpu(log_data->state));
778+
json_object_add_value_int(root, "State", log_data->state);
779779
memset((__u8 *)res, 0, 3);
780780
for (j = 0; j < 3; j++)
781781
res += sprintf(res, "%d", log_data->rsvd1[j]);
782782
json_object_add_value_string(root, "Reserved1", res_arr);
783783
json_object_add_value_int(root, "Locking SP Activation Count",
784-
le16_to_cpu(log_data->locking_sp_act_count));
784+
log_data->locking_sp_act_count);
785785
json_object_add_value_int(root, "Tper Revert Count",
786-
le16_to_cpu(log_data->locking_sp_rev_count));
786+
log_data->locking_sp_rev_count);
787787
json_object_add_value_int(root, "Number of Locking Objects",
788-
le16_to_cpu(log_data->no_of_locking_obj));
788+
log_data->no_of_locking_obj);
789789
json_object_add_value_int(root, "Number of Single User Mode Locking Objects",
790-
le16_to_cpu(log_data->no_of_single_um_locking_obj));
790+
log_data->no_of_single_um_locking_obj);
791791
json_object_add_value_int(root, "Number of Range Provisioned Locking Objects",
792-
le16_to_cpu(log_data->no_of_range_prov_locking_obj));
792+
log_data->no_of_range_prov_locking_obj);
793793
json_object_add_value_int(root, "Number of Namespace Provisioned Locking Objects",
794-
le16_to_cpu(log_data->no_of_ns_prov_locking_obj));
794+
log_data->no_of_ns_prov_locking_obj);
795795
json_object_add_value_int(root, "Number of Read Locked Locking Objects",
796-
le16_to_cpu(log_data->no_of_read_lock_locking_obj));
796+
log_data->no_of_read_lock_locking_obj);
797797
json_object_add_value_int(root, "Number of Write Locked Locking Objects",
798-
le16_to_cpu(log_data->no_of_write_lock_locking_obj));
798+
log_data->no_of_write_lock_locking_obj);
799799
json_object_add_value_int(root, "Number of Read Unlocked Locking Objects",
800-
le16_to_cpu(log_data->no_of_read_unlock_locking_obj));
800+
log_data->no_of_read_unlock_locking_obj);
801801
json_object_add_value_int(root, "Number of Write Unlocked Locking Objects",
802-
le16_to_cpu(log_data->no_of_write_unlock_locking_obj));
803-
json_object_add_value_int(root, "Reserved2", le16_to_cpu(log_data->rsvd2));
802+
log_data->no_of_write_unlock_locking_obj);
803+
json_object_add_value_int(root, "Reserved2", log_data->rsvd2);
804804

805805
json_object_add_value_int(root, "SID Authentication Try Count",
806-
le16_to_cpu(log_data->sid_auth_try_count));
806+
le32_to_cpu(log_data->sid_auth_try_count));
807807
json_object_add_value_int(root, "SID Authentication Try Limit",
808-
le16_to_cpu(log_data->sid_auth_try_limit));
808+
le32_to_cpu(log_data->sid_auth_try_limit));
809809
json_object_add_value_int(root, "Programmatic TCG Reset Count",
810-
le16_to_cpu(log_data->pro_tcg_rc));
810+
le32_to_cpu(log_data->pro_tcg_rc));
811811
json_object_add_value_int(root, "Programmatic Reset Lock Count",
812-
le16_to_cpu(log_data->pro_rlc));
813-
json_object_add_value_int(root, "TCG Error Count", le16_to_cpu(log_data->tcg_ec));
812+
le32_to_cpu(log_data->pro_rlc));
813+
json_object_add_value_int(root, "TCG Error Count", le32_to_cpu(log_data->tcg_ec));
814814

815815
memset((__u8 *)res, 0, 458);
816816
for (j = 0; j < 458; j++)

0 commit comments

Comments
 (0)