Commit c206a389 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Damien Le Moal
Browse files

ata: libata: tracepoints for bus-master DMA 



Add tracepoints for bus-master DMA and taskfile related functions.
That allows us to drop the relevant DPRINTK() calls.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@opensource.wdc.com>
parent fc914faa

drivers/ata/ata_piix.c

+7 −1
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 
#include <scsi/scsi_host.h>

#include <linux/libata.h>

#include <linux/dmi.h>

#include <trace/events/libata.h>



#define DRV_NAME	"ata_piix"

#define DRV_VERSION	"2.13"
@@ -816,10 +817,15 @@ static int piix_sidpr_set_lpm(struct ata_link *link, enum ata_lpm_policy policy, 


static bool piix_irq_check(struct ata_port *ap)

{

	unsigned char host_stat;



	if (unlikely(!ap->ioaddr.bmdma_addr))

		return false;



	return ap->ops->bmdma_status(ap) & ATA_DMA_INTR;

	host_stat = ap->ops->bmdma_status(ap);

	trace_ata_bmdma_status(ap, host_stat);



	return host_stat & ATA_DMA_INTR;

}



#ifdef CONFIG_PM_SLEEP

drivers/ata/libata-core.c

+6 −0
Original line number Diff line number Diff line
@@ -6576,3 +6576,9 @@ void ata_print_version(const struct device *dev, const char *version) 
	dev_printk(KERN_DEBUG, dev, "version %s\n", version);

}

EXPORT_SYMBOL(ata_print_version);



EXPORT_TRACEPOINT_SYMBOL_GPL(ata_tf_load);

EXPORT_TRACEPOINT_SYMBOL_GPL(ata_exec_command);

EXPORT_TRACEPOINT_SYMBOL_GPL(ata_bmdma_setup);

EXPORT_TRACEPOINT_SYMBOL_GPL(ata_bmdma_start);

EXPORT_TRACEPOINT_SYMBOL_GPL(ata_bmdma_status);

drivers/ata/libata-sff.c

+21 −23
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/module.h>

#include <linux/libata.h>

#include <linux/highmem.h>



#include <trace/events/libata.h>

#include "libata.h"



static struct workqueue_struct *ata_sff_wq;
@@ -409,12 +409,6 @@ void ata_sff_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) 
		iowrite8(tf->hob_lbal, ioaddr->lbal_addr);

		iowrite8(tf->hob_lbam, ioaddr->lbam_addr);

		iowrite8(tf->hob_lbah, ioaddr->lbah_addr);

		VPRINTK("hob: feat 0x%X nsect 0x%X, lba 0x%X 0x%X 0x%X\n",

			tf->hob_feature,

			tf->hob_nsect,

			tf->hob_lbal,

			tf->hob_lbam,

			tf->hob_lbah);

	}



	if (is_addr) {
@@ -423,18 +417,10 @@ void ata_sff_tf_load(struct ata_port *ap, const struct ata_taskfile *tf) 
		iowrite8(tf->lbal, ioaddr->lbal_addr);

		iowrite8(tf->lbam, ioaddr->lbam_addr);

		iowrite8(tf->lbah, ioaddr->lbah_addr);

		VPRINTK("feat 0x%X nsect 0x%X lba 0x%X 0x%X 0x%X\n",

			tf->feature,

			tf->nsect,

			tf->lbal,

			tf->lbam,

			tf->lbah);

	}



	if (tf->flags & ATA_TFLAG_DEVICE) {

	if (tf->flags & ATA_TFLAG_DEVICE)

		iowrite8(tf->device, ioaddr->device_addr);

		VPRINTK("device 0x%X\n", tf->device);

	}



	ata_wait_idle(ap);

}
@@ -494,8 +480,6 @@ EXPORT_SYMBOL_GPL(ata_sff_tf_read); 
 */

void ata_sff_exec_command(struct ata_port *ap, const struct ata_taskfile *tf)

{

	DPRINTK("ata%u: cmd 0x%X\n", ap->print_id, tf->command);



	iowrite8(tf->command, ap->ioaddr.command_addr);

	ata_sff_pause(ap);

}
@@ -505,6 +489,7 @@ EXPORT_SYMBOL_GPL(ata_sff_exec_command); 
 *	ata_tf_to_host - issue ATA taskfile to host controller

 *	@ap: port to which command is being issued

 *	@tf: ATA taskfile register set

 *	@tag: tag of the associated command

 *

 *	Issues ATA taskfile register set to ATA host controller,

 *	with proper synchronization with interrupt handler and
@@ -514,9 +499,12 @@ EXPORT_SYMBOL_GPL(ata_sff_exec_command); 
 *	spin_lock_irqsave(host lock)

 */

static inline void ata_tf_to_host(struct ata_port *ap,

				  const struct ata_taskfile *tf)

				  const struct ata_taskfile *tf,

				  unsigned int tag)

{

	trace_ata_tf_load(ap, tf);

	ap->ops->sff_tf_load(ap, tf);

	trace_ata_exec_command(ap, tf, tag);

	ap->ops->sff_exec_command(ap, tf);

}
@@ -768,6 +756,7 @@ static void atapi_send_cdb(struct ata_port *ap, struct ata_queued_cmd *qc) 
	case ATAPI_PROT_DMA:

		ap->hsm_task_state = HSM_ST_LAST;

		/* initiate bmdma */

		trace_ata_bmdma_start(ap, &qc->tf, qc->tag);

		ap->ops->bmdma_start(qc);

		break;

#endif /* CONFIG_ATA_BMDMA */
@@ -1376,7 +1365,7 @@ unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc) 
		if (qc->tf.flags & ATA_TFLAG_POLLING)

			ata_qc_set_polling(qc);



		ata_tf_to_host(ap, &qc->tf);

		ata_tf_to_host(ap, &qc->tf, qc->tag);

		ap->hsm_task_state = HSM_ST_LAST;



		if (qc->tf.flags & ATA_TFLAG_POLLING)
@@ -1388,7 +1377,7 @@ unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc) 
		if (qc->tf.flags & ATA_TFLAG_POLLING)

			ata_qc_set_polling(qc);



		ata_tf_to_host(ap, &qc->tf);

		ata_tf_to_host(ap, &qc->tf, qc->tag);



		if (qc->tf.flags & ATA_TFLAG_WRITE) {

			/* PIO data out protocol */
@@ -1418,7 +1407,7 @@ unsigned int ata_sff_qc_issue(struct ata_queued_cmd *qc) 
		if (qc->tf.flags & ATA_TFLAG_POLLING)

			ata_qc_set_polling(qc);



		ata_tf_to_host(ap, &qc->tf);

		ata_tf_to_host(ap, &qc->tf, qc->tag);



		ap->hsm_task_state = HSM_ST_FIRST;
@@ -2745,8 +2734,11 @@ unsigned int ata_bmdma_qc_issue(struct ata_queued_cmd *qc) 
	case ATA_PROT_DMA:

		WARN_ON_ONCE(qc->tf.flags & ATA_TFLAG_POLLING);



		trace_ata_tf_load(ap, &qc->tf);

		ap->ops->sff_tf_load(ap, &qc->tf);  /* load tf registers */

		trace_ata_bmdma_setup(ap, &qc->tf, qc->tag);

		ap->ops->bmdma_setup(qc);	    /* set up bmdma */

		trace_ata_bmdma_start(ap, &qc->tf, qc->tag);

		ap->ops->bmdma_start(qc);	    /* initiate bmdma */

		ap->hsm_task_state = HSM_ST_LAST;

		break;
@@ -2754,7 +2746,9 @@ unsigned int ata_bmdma_qc_issue(struct ata_queued_cmd *qc) 
	case ATAPI_PROT_DMA:

		WARN_ON_ONCE(qc->tf.flags & ATA_TFLAG_POLLING);



		trace_ata_tf_load(ap, &qc->tf);

		ap->ops->sff_tf_load(ap, &qc->tf);  /* load tf registers */

		trace_ata_bmdma_setup(ap, &qc->tf, qc->tag);

		ap->ops->bmdma_setup(qc);	    /* set up bmdma */

		ap->hsm_task_state = HSM_ST_FIRST;
@@ -2795,13 +2789,14 @@ unsigned int ata_bmdma_port_intr(struct ata_port *ap, struct ata_queued_cmd *qc) 
	if (ap->hsm_task_state == HSM_ST_LAST && ata_is_dma(qc->tf.protocol)) {

		/* check status of DMA engine */

		host_stat = ap->ops->bmdma_status(ap);

		VPRINTK("ata%u: host_stat 0x%X\n", ap->print_id, host_stat);

		trace_ata_bmdma_status(ap, host_stat);



		/* if it's not our irq... */

		if (!(host_stat & ATA_DMA_INTR))

			return ata_sff_idle_irq(ap);



		/* before we do anything else, clear DMA-Start bit */

		trace_ata_bmdma_stop(ap, &qc->tf, qc->tag);

		ap->ops->bmdma_stop(qc);

		bmdma_stopped = true;
@@ -2870,6 +2865,7 @@ void ata_bmdma_error_handler(struct ata_port *ap) 
		u8 host_stat;



		host_stat = ap->ops->bmdma_status(ap);

		trace_ata_bmdma_status(ap, host_stat);



		/* BMDMA controllers indicate host bus error by

		 * setting DMA_ERR bit and timing out.  As it wasn't
@@ -2881,6 +2877,7 @@ void ata_bmdma_error_handler(struct ata_port *ap) 
			thaw = true;

		}



		trace_ata_bmdma_stop(ap, &qc->tf, qc->tag);

		ap->ops->bmdma_stop(qc);



		/* if we're gonna thaw, make sure IRQ is clear */
@@ -2914,6 +2911,7 @@ void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc) 


	if (ata_is_dma(qc->tf.protocol)) {

		spin_lock_irqsave(ap->lock, flags);

		trace_ata_bmdma_stop(ap, &qc->tf, qc->tag);

		ap->ops->bmdma_stop(qc);

		spin_unlock_irqrestore(ap->lock, flags);

	}

drivers/ata/libata-trace.c

+18 −0
Original line number Diff line number Diff line
@@ -38,6 +38,24 @@ libata_trace_parse_status(struct trace_seq *p, unsigned char status) 
	return ret;

}



const char *

libata_trace_parse_host_stat(struct trace_seq *p, unsigned char host_stat)

{

	const char *ret = trace_seq_buffer_ptr(p);



	trace_seq_printf(p, "{ ");

	if (host_stat & ATA_DMA_INTR)

		trace_seq_printf(p, "INTR ");

	if (host_stat & ATA_DMA_ERR)

		trace_seq_printf(p, "ERR ");

	if (host_stat & ATA_DMA_ACTIVE)

		trace_seq_printf(p, "ACTIVE ");

	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)

{

drivers/ata/pata_arasan_cf.c

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include <linux/spinlock.h>

#include <linux/types.h>

#include <linux/workqueue.h>

#include <trace/events/libata.h>



#define DRIVER_NAME	"arasan_cf"

#define TIMEOUT		msecs_to_jiffies(3000)
@@ -703,9 +704,11 @@ static unsigned int arasan_cf_qc_issue(struct ata_queued_cmd *qc) 
	case ATA_PROT_DMA:

		WARN_ON_ONCE(qc->tf.flags & ATA_TFLAG_POLLING);



		trace_ata_tf_load(ap, &qc->tf);

		ap->ops->sff_tf_load(ap, &qc->tf);

		acdev->dma_status = 0;

		acdev->qc = qc;

		trace_ata_bmdma_start(ap, &qc->tf, qc->tag);

		arasan_cf_dma_start(acdev);

		ap->hsm_task_state = HSM_ST_LAST;

		break;