nvme-trace: move opcode symbol print to nvme.h

The following patches are going to provide the target-side trace which
might need these kind of macros.  It would be great if it can be shared
between host and target side both.

Signed-off-by: Minwoo Im <minwoo.im.dev@gmail.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/trace.h b/drivers/nvme/host/trace.h
index e71502d141ed1e636c48ad3f51260425b183d92b..62ee29107c32fc2b70ca7317624de1e335c13b7e 100644 (file)
--- a/drivers/nvme/host/trace.h
+++ b/drivers/nvme/host/trace.h
@@ -16,50 +16,6 @@
 
 #include "nvme.h"
 
-#define nvme_admin_opcode_name(opcode) { opcode, #opcode }
-#define show_admin_opcode_name(val)                                    \
-       __print_symbolic(val,                                           \
-               nvme_admin_opcode_name(nvme_admin_delete_sq),           \
-               nvme_admin_opcode_name(nvme_admin_create_sq),           \
-               nvme_admin_opcode_name(nvme_admin_get_log_page),        \
-               nvme_admin_opcode_name(nvme_admin_delete_cq),           \
-               nvme_admin_opcode_name(nvme_admin_create_cq),           \
-               nvme_admin_opcode_name(nvme_admin_identify),            \
-               nvme_admin_opcode_name(nvme_admin_abort_cmd),           \
-               nvme_admin_opcode_name(nvme_admin_set_features),        \
-               nvme_admin_opcode_name(nvme_admin_get_features),        \
-               nvme_admin_opcode_name(nvme_admin_async_event),         \
-               nvme_admin_opcode_name(nvme_admin_ns_mgmt),             \
-               nvme_admin_opcode_name(nvme_admin_activate_fw),         \
-               nvme_admin_opcode_name(nvme_admin_download_fw),         \
-               nvme_admin_opcode_name(nvme_admin_ns_attach),           \
-               nvme_admin_opcode_name(nvme_admin_keep_alive),          \
-               nvme_admin_opcode_name(nvme_admin_directive_send),      \
-               nvme_admin_opcode_name(nvme_admin_directive_recv),      \
-               nvme_admin_opcode_name(nvme_admin_dbbuf),               \
-               nvme_admin_opcode_name(nvme_admin_format_nvm),          \
-               nvme_admin_opcode_name(nvme_admin_security_send),       \
-               nvme_admin_opcode_name(nvme_admin_security_recv),       \
-               nvme_admin_opcode_name(nvme_admin_sanitize_nvm))
-
-#define nvme_opcode_name(opcode)       { opcode, #opcode }
-#define show_nvm_opcode_name(val)                              \
-       __print_symbolic(val,                                   \
-               nvme_opcode_name(nvme_cmd_flush),               \
-               nvme_opcode_name(nvme_cmd_write),               \
-               nvme_opcode_name(nvme_cmd_read),                \
-               nvme_opcode_name(nvme_cmd_write_uncor),         \
-               nvme_opcode_name(nvme_cmd_compare),             \
-               nvme_opcode_name(nvme_cmd_write_zeroes),        \
-               nvme_opcode_name(nvme_cmd_dsm),                 \
-               nvme_opcode_name(nvme_cmd_resv_register),       \
-               nvme_opcode_name(nvme_cmd_resv_report),         \
-               nvme_opcode_name(nvme_cmd_resv_acquire),        \
-               nvme_opcode_name(nvme_cmd_resv_release))
-
-#define show_opcode_name(qid, opcode)                                  \
-       (qid ? show_nvm_opcode_name(opcode) : show_admin_opcode_name(opcode))
-
 const char *nvme_trace_parse_admin_cmd(struct trace_seq *p, u8 opcode,
                u8 *cdw10);
 const char *nvme_trace_parse_nvm_cmd(struct trace_seq *p, u8 opcode,

diff --git a/include/linux/nvme.h b/include/linux/nvme.h
index 7080923e78d1ec1948f6879df1afd53b3b29ee44..86b3d04baf20d06bf9f955b724ada27a09a09202 100644 (file)
--- a/include/linux/nvme.h
+++ b/include/linux/nvme.h
@@ -562,6 +562,22 @@ enum nvme_opcode {
        nvme_cmd_resv_release   = 0x15,
 };
 
+#define nvme_opcode_name(opcode)       { opcode, #opcode }
+#define show_nvm_opcode_name(val)                              \
+       __print_symbolic(val,                                   \
+               nvme_opcode_name(nvme_cmd_flush),               \
+               nvme_opcode_name(nvme_cmd_write),               \
+               nvme_opcode_name(nvme_cmd_read),                \
+               nvme_opcode_name(nvme_cmd_write_uncor),         \
+               nvme_opcode_name(nvme_cmd_compare),             \
+               nvme_opcode_name(nvme_cmd_write_zeroes),        \
+               nvme_opcode_name(nvme_cmd_dsm),                 \
+               nvme_opcode_name(nvme_cmd_resv_register),       \
+               nvme_opcode_name(nvme_cmd_resv_report),         \
+               nvme_opcode_name(nvme_cmd_resv_acquire),        \
+               nvme_opcode_name(nvme_cmd_resv_release))
+
+
 /*
  * Descriptor subtype - lower 4 bits of nvme_(keyed_)sgl_desc identifier
  *
@@ -794,6 +810,35 @@ enum nvme_admin_opcode {
        nvme_admin_sanitize_nvm         = 0x84,
 };
 
+#define nvme_admin_opcode_name(opcode) { opcode, #opcode }
+#define show_admin_opcode_name(val)                                    \
+       __print_symbolic(val,                                           \
+               nvme_admin_opcode_name(nvme_admin_delete_sq),           \
+               nvme_admin_opcode_name(nvme_admin_create_sq),           \
+               nvme_admin_opcode_name(nvme_admin_get_log_page),        \
+               nvme_admin_opcode_name(nvme_admin_delete_cq),           \
+               nvme_admin_opcode_name(nvme_admin_create_cq),           \
+               nvme_admin_opcode_name(nvme_admin_identify),            \
+               nvme_admin_opcode_name(nvme_admin_abort_cmd),           \
+               nvme_admin_opcode_name(nvme_admin_set_features),        \
+               nvme_admin_opcode_name(nvme_admin_get_features),        \
+               nvme_admin_opcode_name(nvme_admin_async_event),         \
+               nvme_admin_opcode_name(nvme_admin_ns_mgmt),             \
+               nvme_admin_opcode_name(nvme_admin_activate_fw),         \
+               nvme_admin_opcode_name(nvme_admin_download_fw),         \
+               nvme_admin_opcode_name(nvme_admin_ns_attach),           \
+               nvme_admin_opcode_name(nvme_admin_keep_alive),          \
+               nvme_admin_opcode_name(nvme_admin_directive_send),      \
+               nvme_admin_opcode_name(nvme_admin_directive_recv),      \
+               nvme_admin_opcode_name(nvme_admin_dbbuf),               \
+               nvme_admin_opcode_name(nvme_admin_format_nvm),          \
+               nvme_admin_opcode_name(nvme_admin_security_send),       \
+               nvme_admin_opcode_name(nvme_admin_security_recv),       \
+               nvme_admin_opcode_name(nvme_admin_sanitize_nvm))
+
+#define show_opcode_name(qid, opcode)                                  \
+       (qid ? show_nvm_opcode_name(opcode) : show_admin_opcode_name(opcode))
+
 enum {
        NVME_QUEUE_PHYS_CONTIG  = (1 << 0),
        NVME_CQ_IRQ_ENABLED     = (1 << 1),