4 files changed, 163 insertions, 3 deletions

diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index ae41107afc1f..b67e995179a9 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -111,7 +111,8 @@ obj-$(CONFIG_ATA_GENERIC)	+= ata_generic.o
 # Should be last libata driver
 obj-$(CONFIG_PATA_LEGACY)       += pata_legacy.o
 
-libata-y        := libata-core.o libata-scsi.o libata-eh.o libata-transport.o
+libata-y        := libata-core.o libata-scsi.o libata-eh.o \
+        libata-transport.o libata-trace.o
 libata-$(CONFIG_ATA_SFF)        += libata-sff.o
 libata-$(CONFIG_SATA_PMP)       += libata-pmp.o
 libata-$(CONFIG_ATA_ACPI)       += libata-acpi.o
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index ff57367f5f0c..be1722a4163a 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -70,6 +70,9 @@
 #include <linux/pm_runtime.h>
 #include <linux/platform_device.h>
 
+#define CREATE_TRACE_POINTS
+#include <trace/events/libata.h>
+
 #include "libata.h"
 #include "libata-transport.h"
 
@@ -4904,6 +4907,7 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
                  */
                 if (unlikely(ata_tag_internal(qc->tag))) {
                         fill_result_tf(qc);
+                        trace_ata_qc_complete_internal(qc);
                         __ata_qc_complete(qc);
                         return;
                 }
@@ -4914,6 +4918,7 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
                  */
                 if (unlikely(qc->flags & ATA_QCFLAG_FAILED)) {
                         fill_result_tf(qc);
+                        trace_ata_qc_complete_failed(qc);
                         ata_qc_schedule_eh(qc);
                         return;
                 }
@@ -4924,6 +4929,7 @@ void ata_qc_complete(struct ata_queued_cmd *qc)
                 if (qc->flags & ATA_QCFLAG_RESULT_TF)
                         fill_result_tf(qc);
 
+                trace_ata_qc_complete_done(qc);
                 /* Some commands need post-processing after successful
                  * completion.
                  */
@@ -5071,7 +5077,7 @@ void ata_qc_issue(struct ata_queued_cmd *qc)
         }
 
         ap->ops->qc_prep(qc);
-
+        trace_ata_qc_issue(qc);
         qc->err_mask |= ap->ops->qc_issue(qc);
         if (unlikely(qc->err_mask))
                 goto err;
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 77ef43e320ea..07f41be38fbe 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -46,6 +46,7 @@
 
 #include <linux/libata.h>
 
+#include <trace/events/libata.h>
 #include "libata.h"
 
 enum {
@@ -2291,6 +2292,7 @@ static void ata_eh_link_autopsy(struct ata_link *link)
                 all_err_mask |= qc->err_mask;
                 if (qc->flags & ATA_QCFLAG_IO)
                         eflags |= ATA_EFLAG_IS_IO;
+                trace_ata_eh_link_autopsy_qc(qc);
         }
 
         /* enforce default EH actions */
@@ -2325,7 +2327,7 @@ static void ata_eh_link_autopsy(struct ata_link *link)
                         eflags |= ATA_EFLAG_DUBIOUS_XFER;
                 ehc->i.action |= ata_eh_speed_down(dev, eflags, all_err_mask);
         }
-
+        trace_ata_eh_link_autopsy(dev, ehc->i.action, all_err_mask);
         DPRINTK("EXIT\n");
 }
 
diff --git a/drivers/ata/libata-trace.c b/drivers/ata/libata-trace.c
new file mode 100644
index 000000000000..fd30b8c10cf5
--- /dev/null
+++ b/drivers/ata/libata-trace.c
@@ -0,0 +1,151 @@
+/*
+ * libata-trace.c - trace functions for libata
+ *
+ * Copyright 2015 Hannes Reinecke
+ * Copyright 2015 SUSE Linux GmbH
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2, or (at your option)
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; see the file COPYING.  If not, write to
+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/kernel.h>
+#include <linux/trace_seq.h>
+#include <trace/events/libata.h>
+
+const char *
+libata_trace_parse_status(struct trace_seq *p, unsigned char status)
+{
+        const char *ret = trace_seq_buffer_ptr(p);
+
+        trace_seq_printf(p, "{ ");
+        if (status & ATA_BUSY)
+                trace_seq_printf(p, "BUSY ");
+        if (status & ATA_DRDY)
+                trace_seq_printf(p, "DRDY ");
+        if (status & ATA_DF)
+                trace_seq_printf(p, "DF ");
+        if (status & ATA_DSC)
+                trace_seq_printf(p, "DSC ");
+        if (status & ATA_DRQ)
+                trace_seq_printf(p, "DRQ ");
+        if (status & ATA_CORR)
+                trace_seq_printf(p, "CORR ");
+        if (status & ATA_SENSE)
+                trace_seq_printf(p, "SENSE ");
+        if (status & ATA_ERR)
+                trace_seq_printf(p, "ERR ");
+        trace_seq_putc(p, '}');
+        trace_seq_putc(p, 0);
+
+        return ret;
+}
+
+const char *
+libata_trace_parse_eh_action(struct trace_seq *p, unsigned int eh_action)
+{
+        const char *ret = trace_seq_buffer_ptr(p);
+
+        trace_seq_printf(p, "%x", eh_action);
+        if (eh_action) {
+                trace_seq_printf(p, "{ ");
+                if (eh_action & ATA_EH_REVALIDATE)
+                        trace_seq_printf(p, "REVALIDATE ");
+                if (eh_action & (ATA_EH_SOFTRESET | ATA_EH_HARDRESET))
+                        trace_seq_printf(p, "RESET ");
+                else if (eh_action & ATA_EH_SOFTRESET)
+                        trace_seq_printf(p, "SOFTRESET ");
+                else if (eh_action & ATA_EH_HARDRESET)
+                        trace_seq_printf(p, "HARDRESET ");
+                if (eh_action & ATA_EH_ENABLE_LINK)
+                        trace_seq_printf(p, "ENABLE_LINK ");
+                if (eh_action & ATA_EH_PARK)
+                        trace_seq_printf(p, "PARK ");
+                trace_seq_putc(p, '}');
+        }
+        trace_seq_putc(p, 0);
+
+        return ret;
+}
+
+const char *
+libata_trace_parse_eh_err_mask(struct trace_seq *p, unsigned int eh_err_mask)
+{
+        const char *ret = trace_seq_buffer_ptr(p);
+
+        trace_seq_printf(p, "%x", eh_err_mask);
+        if (eh_err_mask) {
+                trace_seq_printf(p, "{ ");
+                if (eh_err_mask & AC_ERR_DEV)
+                        trace_seq_printf(p, "DEV ");
+                if (eh_err_mask & AC_ERR_HSM)
+                        trace_seq_printf(p, "HSM ");
+                if (eh_err_mask & AC_ERR_TIMEOUT)
+                        trace_seq_printf(p, "TIMEOUT ");
+                if (eh_err_mask & AC_ERR_MEDIA)
+                        trace_seq_printf(p, "MEDIA ");
+                if (eh_err_mask & AC_ERR_ATA_BUS)
+                        trace_seq_printf(p, "ATA_BUS ");
+                if (eh_err_mask & AC_ERR_HOST_BUS)
+                        trace_seq_printf(p, "HOST_BUS ");
+                if (eh_err_mask & AC_ERR_SYSTEM)
+                        trace_seq_printf(p, "SYSTEM ");
+                if (eh_err_mask & AC_ERR_INVALID)
+                        trace_seq_printf(p, "INVALID ");
+                if (eh_err_mask & AC_ERR_OTHER)
+                        trace_seq_printf(p, "OTHER ");
+                if (eh_err_mask & AC_ERR_NODEV_HINT)
+                        trace_seq_printf(p, "NODEV_HINT ");
+                if (eh_err_mask & AC_ERR_NCQ)
+                        trace_seq_printf(p, "NCQ ");
+                trace_seq_putc(p, '}');
+        }
+        trace_seq_putc(p, 0);
+
+        return ret;
+}
+
+const char *
+libata_trace_parse_qc_flags(struct trace_seq *p, unsigned int qc_flags)
+{
+        const char *ret = trace_seq_buffer_ptr(p);
+
+        trace_seq_printf(p, "%x", qc_flags);
+        if (qc_flags) {
+                trace_seq_printf(p, "{ ");
+                if (qc_flags & ATA_QCFLAG_ACTIVE)
+                        trace_seq_printf(p, "ACTIVE ");
+                if (qc_flags & ATA_QCFLAG_DMAMAP)
+                        trace_seq_printf(p, "DMAMAP ");
+                if (qc_flags & ATA_QCFLAG_IO)
+                        trace_seq_printf(p, "IO ");
+                if (qc_flags & ATA_QCFLAG_RESULT_TF)
+                        trace_seq_printf(p, "RESULT_TF ");
+                if (qc_flags & ATA_QCFLAG_CLEAR_EXCL)
+                        trace_seq_printf(p, "CLEAR_EXCL ");
+                if (qc_flags & ATA_QCFLAG_QUIET)
+                        trace_seq_printf(p, "QUIET ");
+                if (qc_flags & ATA_QCFLAG_RETRY)
+                        trace_seq_printf(p, "RETRY ");
+                if (qc_flags & ATA_QCFLAG_FAILED)
+                        trace_seq_printf(p, "FAILED ");
+                if (qc_flags & ATA_QCFLAG_SENSE_VALID)
+                        trace_seq_printf(p, "SENSE_VALID ");
+                if (qc_flags & ATA_QCFLAG_EH_SCHEDULED)
+                        trace_seq_printf(p, "EH_SCHEDULED ");
+                trace_seq_putc(p, '}');
+        }
+        trace_seq_putc(p, 0);
+
+        return ret;
+}