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

ata: libata: add reset tracepoints 



To follow the flow of control we should be using tracepoints, as
they will tie in with the actual I/O flow and deliver a better
overview about what it happening.
This patch adds tracepoints for hard reset, soft reset, and postreset
and adds them in the libata-eh control flow.
With that we can drop the reset DPRINTK calls in the various drivers.

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

drivers/ata/ahci.c

+0 −7
Original line number Diff line number Diff line
@@ -700,8 +700,6 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, 
	bool online;

	int rc;



	DPRINTK("ENTER\n");



	hpriv->stop_engine(ap);



	rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context),
@@ -709,8 +707,6 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, 


	hpriv->start_engine(ap);



	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);



	/* vt8251 doesn't clear BSY on signature FIS reception,

	 * request follow-up softreset.

	 */
@@ -790,8 +786,6 @@ static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, 
	bool online;

	int rc, i;



	DPRINTK("ENTER\n");



	hpriv->stop_engine(ap);



	for (i = 0; i < 2; i++) {
@@ -829,7 +823,6 @@ static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, 
	if (online)

		*class = ahci_dev_classify(ap);



	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);

	return rc;

}

drivers/ata/ahci_qoriq.c

+0 −4
Original line number Diff line number Diff line
@@ -103,8 +103,6 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class, 
	int rc;

	bool ls1021a_workaround = (qoriq_priv->type == AHCI_LS1021A);



	DPRINTK("ENTER\n");



	hpriv->stop_engine(ap);



	/*
@@ -146,8 +144,6 @@ static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class, 


	if (online)

		*class = ahci_dev_classify(ap);



	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);

	return rc;

}

drivers/ata/libahci.c

+0 −10
Original line number Diff line number Diff line
@@ -1415,8 +1415,6 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, 
	bool fbs_disabled = false;

	int rc;



	DPRINTK("ENTER\n");



	/* prepare for SRST (AHCI-1.1 10.4.1) */

	rc = ahci_kick_engine(ap);

	if (rc && rc != -EOPNOTSUPP)
@@ -1476,7 +1474,6 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class, 
	if (fbs_disabled)

		ahci_enable_fbs(ap);



	DPRINTK("EXIT, class=%u\n", *class);

	return 0;



 fail:
@@ -1498,8 +1495,6 @@ static int ahci_softreset(struct ata_link *link, unsigned int *class, 
{

	int pmp = sata_srst_pmp(link);



	DPRINTK("ENTER\n");



	return ahci_do_softreset(link, class, pmp, deadline, ahci_check_ready);

}

EXPORT_SYMBOL_GPL(ahci_do_softreset);
@@ -1529,8 +1524,6 @@ static int ahci_pmp_retry_softreset(struct ata_link *link, unsigned int *class, 
	int rc;

	u32 irq_sts;



	DPRINTK("ENTER\n");



	rc = ahci_do_softreset(link, class, pmp, deadline,

			       ahci_bad_pmp_check_ready);
@@ -1564,8 +1557,6 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class, 
	struct ata_taskfile tf;

	int rc;



	DPRINTK("ENTER\n");



	hpriv->stop_engine(ap);



	/* clear D2H reception area to properly wait for D2H FIS */
@@ -1581,7 +1572,6 @@ int ahci_do_hardreset(struct ata_link *link, unsigned int *class, 
	if (*online)

		*class = ahci_dev_classify(ap);



	DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class);

	return rc;

}

EXPORT_SYMBOL_GPL(ahci_do_hardreset);

drivers/ata/libata-core.c

+0 −4
Original line number Diff line number Diff line
@@ -3656,16 +3656,12 @@ void ata_std_postreset(struct ata_link *link, unsigned int *classes) 
{

	u32 serror;



	DPRINTK("ENTER\n");



	/* reset complete, clear SError */

	if (!sata_scr_read(link, SCR_ERROR, &serror))

		sata_scr_write(link, SCR_ERROR, serror);



	/* print link status */

	sata_print_link_status(link);



	DPRINTK("EXIT\n");

}

EXPORT_SYMBOL_GPL(ata_std_postreset);

drivers/ata/libata-eh.c

+18 −3
Original line number Diff line number Diff line
@@ -2596,12 +2596,19 @@ int ata_eh_reset(struct ata_link *link, int classify, 


		/* mark that this EH session started with reset */

		ehc->last_reset = jiffies;

		if (reset == hardreset)

		if (reset == hardreset) {

			ehc->i.flags |= ATA_EHI_DID_HARDRESET;

		else

			trace_ata_link_hardreset_begin(link, classes, deadline);

		} else {

			ehc->i.flags |= ATA_EHI_DID_SOFTRESET;

			trace_ata_link_softreset_begin(link, classes, deadline);

		}



		rc = ata_do_reset(link, reset, classes, deadline, true);

		if (reset == hardreset)

			trace_ata_link_hardreset_end(link, classes, rc);

		else

			trace_ata_link_softreset_end(link, classes, rc);

		if (rc && rc != -EAGAIN) {

			failed_link = link;

			goto fail;
@@ -2615,8 +2622,11 @@ int ata_eh_reset(struct ata_link *link, int classify, 
				ata_link_info(slave, "hard resetting link\n");



			ata_eh_about_to_do(slave, NULL, ATA_EH_RESET);

			trace_ata_slave_hardreset_begin(slave, classes,

							deadline);

			tmp = ata_do_reset(slave, reset, classes, deadline,

					   false);

			trace_ata_slave_hardreset_end(slave, classes, tmp);

			switch (tmp) {

			case -EAGAIN:

				rc = -EAGAIN;
@@ -2644,7 +2654,9 @@ int ata_eh_reset(struct ata_link *link, int classify, 
			}



			ata_eh_about_to_do(link, NULL, ATA_EH_RESET);

			trace_ata_link_softreset_begin(link, classes, deadline);

			rc = ata_do_reset(link, reset, classes, deadline, true);

			trace_ata_link_softreset_end(link, classes, rc);

			if (rc) {

				failed_link = link;

				goto fail;
@@ -2698,8 +2710,11 @@ int ata_eh_reset(struct ata_link *link, int classify, 
	 */

	if (postreset) {

		postreset(link, classes);

		if (slave)

		trace_ata_link_postreset(link, classes, rc);

		if (slave) {

			postreset(slave, classes);

			trace_ata_slave_postreset(slave, classes, rc);

		}

	}



	/*