Merge tag 'hwlock-v5.3' of git://github.com/andersson/remoteproc

[linux-2.6-block.git] / drivers / nvme / host / trace.c

diff --git a/drivers/nvme/host/trace.c b/drivers/nvme/host/trace.c
index f01ad0fd60bb7aee2cad3f576f8eba7b4687689c..9778eb0406b36ecf556bef63e0d291112ddbfe37 100644 (file)
--- a/drivers/nvme/host/trace.c
+++ b/drivers/nvme/host/trace.c
@@ -7,6 +7,17 @@
 #include <asm/unaligned.h>
 #include "trace.h"
 
+static const char *nvme_trace_delete_sq(struct trace_seq *p, u8 *cdw10)
+{
+       const char *ret = trace_seq_buffer_ptr(p);
+       u16 sqid = get_unaligned_le16(cdw10);
+
+       trace_seq_printf(p, "sqid=%u", sqid);
+       trace_seq_putc(p, 0);
+
+       return ret;
+}
+
 static const char *nvme_trace_create_sq(struct trace_seq *p, u8 *cdw10)
 {
        const char *ret = trace_seq_buffer_ptr(p);
@@ -23,6 +34,17 @@ static const char *nvme_trace_create_sq(struct trace_seq *p, u8 *cdw10)
        return ret;
 }
 
+static const char *nvme_trace_delete_cq(struct trace_seq *p, u8 *cdw10)
+{
+       const char *ret = trace_seq_buffer_ptr(p);
+       u16 cqid = get_unaligned_le16(cdw10);
+
+       trace_seq_printf(p, "cqid=%u", cqid);
+       trace_seq_putc(p, 0);
+
+       return ret;
+}
+
 static const char *nvme_trace_create_cq(struct trace_seq *p, u8 *cdw10)
 {
        const char *ret = trace_seq_buffer_ptr(p);
@@ -107,8 +129,12 @@ const char *nvme_trace_parse_admin_cmd(struct trace_seq *p,
                                       u8 opcode, u8 *cdw10)
 {
        switch (opcode) {
+       case nvme_admin_delete_sq:
+               return nvme_trace_delete_sq(p, cdw10);
        case nvme_admin_create_sq:
                return nvme_trace_create_sq(p, cdw10);
+       case nvme_admin_delete_cq:
+               return nvme_trace_delete_cq(p, cdw10);
        case nvme_admin_create_cq:
                return nvme_trace_create_cq(p, cdw10);
        case nvme_admin_identify:
@@ -178,7 +204,7 @@ static const char *nvme_trace_fabrics_common(struct trace_seq *p, u8 *spc)
 {
        const char *ret = trace_seq_buffer_ptr(p);
 
-       trace_seq_printf(p, "spcecific=%*ph", 24, spc);
+       trace_seq_printf(p, "specific=%*ph", 24, spc);
        trace_seq_putc(p, 0);
        return ret;
 }