From 5b7ddc4bd2dcdde201ffa2681ede9a0a029bad96 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 2 Jul 2021 22:47:46 +0200 Subject: Adding upstream version 1.14. Signed-off-by: Daniel Baumann --- nvme-print.h | 56 +++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 49 insertions(+), 7 deletions(-) (limited to 'nvme-print.h') diff --git a/nvme-print.h b/nvme-print.h index 2a6f5ee..2d8ed4d 100644 --- a/nvme-print.h +++ b/nvme-print.h @@ -2,7 +2,6 @@ #define NVME_PRINT_H #include "nvme.h" -#include "util/json.h" #include void d(unsigned char *buf, int len, int width, int group); @@ -11,7 +10,7 @@ uint64_t int48_to_long(__u8 *data); void nvme_show_status(__u16 status); void nvme_show_relatives(const char *name); - +const char *nvme_cmd_to_string(int admin, __u8 opcode); void __nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode, void (*vendor_show)(__u8 *vs, struct json_object *root)); void nvme_show_id_ctrl(struct nvme_id_ctrl *ctrl, unsigned int mode); @@ -26,8 +25,8 @@ void nvme_show_smart_log(struct nvme_smart_log *smart, unsigned int nsid, const char *devname, enum nvme_print_flags flags); void nvme_show_ana_log(struct nvme_ana_rsp_hdr *ana_log, const char *devname, enum nvme_print_flags flags, size_t len); -void nvme_show_self_test_log(struct nvme_self_test_log *self_test, const char *devname, - enum nvme_print_flags flags); +void nvme_show_self_test_log(struct nvme_self_test_log *self_test, __u8 dst_entries, + __u32 size, const char *devname, enum nvme_print_flags flags); void nvme_show_fw_log(struct nvme_firmware_log_page *fw_log, const char *devname, enum nvme_print_flags flags); void nvme_show_effects_log(struct nvme_effects_log_page *effects, unsigned int flags); @@ -37,6 +36,35 @@ void nvme_show_endurance_log(struct nvme_endurance_group_log *endurance_log, __u16 group_id, const char *devname, enum nvme_print_flags flags); void nvme_show_sanitize_log(struct nvme_sanitize_log_page *sanitize, const char *devname, enum nvme_print_flags flags); +void json_predictable_latency_per_nvmset( + struct nvme_predlat_per_nvmset_log_page *plpns_log, + __u16 nvmset_id); +void nvme_show_predictable_latency_per_nvmset( + struct nvme_predlat_per_nvmset_log_page *plpns_log, + __u16 nvmset_id, const char *devname, enum nvme_print_flags flags); +void json_predictable_latency_event_agg_log( + struct nvme_event_agg_log_page *pea_log, + __u64 log_entries); +void nvme_show_predictable_latency_event_agg_log( + struct nvme_event_agg_log_page *pea_log, + __u64 log_entries, __u32 size, const char *devname, + enum nvme_print_flags flags); +void json_persistent_event_log(void *pevent_log_info, __u32 size); +void nvme_show_persistent_event_log(void *pevent_log_info, + __u8 action, __u32 size, const char *devname, + enum nvme_print_flags flags); +void json_endurance_group_event_agg_log( + struct nvme_event_agg_log_page *endurance_log, + __u64 log_entries); +void nvme_show_endurance_group_event_agg_log( + struct nvme_event_agg_log_page *endurance_log, + __u64 log_entries, __u32 size, const char *devname, + enum nvme_print_flags flags); +void json_lba_status_log(void *lba_status); +void nvme_show_lba_status_log(void *lba_status, __u32 size, + const char *devname, enum nvme_print_flags flags); +void nvme_show_resv_notif_log(struct nvme_resv_notif_log *resv, + const char *devname, enum nvme_print_flags flags); void nvme_show_ctrl_registers(void *bar, bool fabrics, enum nvme_print_flags flags); void nvme_show_single_property(int offset, uint64_t prop, int human); void nvme_show_id_ns_descs(void *data, unsigned nsid, enum nvme_print_flags flags); @@ -47,21 +75,35 @@ void nvme_show_subsystem_list(struct nvme_topology *t, enum nvme_print_flags flags); void nvme_show_id_nvmset(struct nvme_id_nvmset *nvmset, unsigned nvmset_id, enum nvme_print_flags flags); +void nvme_show_primary_ctrl_caps(const struct nvme_primary_ctrl_caps *caps, + enum nvme_print_flags flags); void nvme_show_list_secondary_ctrl(const struct nvme_secondary_controllers_list *sc_list, __u32 count, enum nvme_print_flags flags); void nvme_show_id_ns_granularity_list(const struct nvme_id_ns_granularity_list *glist, enum nvme_print_flags flags); void nvme_show_id_uuid_list(const struct nvme_id_uuid_list *uuid_list, enum nvme_print_flags flags); +void nvme_show_id_iocs(struct nvme_id_iocs *iocs); -void nvme_feature_show_fields(__u32 fid, unsigned int result, unsigned char *buf); +void nvme_feature_show_fields(enum nvme_feat fid, unsigned int result, unsigned char *buf); void nvme_directive_show(__u8 type, __u8 oper, __u16 spec, __u32 nsid, __u32 result, void *buf, __u32 len, enum nvme_print_flags flags); void nvme_show_select_result(__u32 result); +void nvme_show_lba_status_info(__u32 result); + +void nvme_show_zns_id_ctrl(struct nvme_zns_id_ctrl *ctrl, unsigned int mode); +void nvme_show_id_ctrl_nvm(struct nvme_id_ctrl_nvm *ctrl_nvm, + enum nvme_print_flags flags); +void nvme_show_zns_id_ns(struct nvme_zns_id_ns *ns, + struct nvme_id_ns *id_ns, unsigned long flags); +void nvme_show_zns_changed( struct nvme_zns_changed_zone_log *log, + unsigned long flags); +void nvme_show_zns_report_zones(void *report, __u32 descs, + __u8 ext_size, __u32 report_size, unsigned long flags); -const char *nvme_status_to_string(__u32 status); +const char *nvme_status_to_string(__u16 status); const char *nvme_select_to_string(int sel); -const char *nvme_feature_to_string(int feature); +const char *nvme_feature_to_string(enum nvme_feat feature); const char *nvme_register_to_string(int reg); #endif -- cgit v1.2.3