Commit 45db2f6c authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

libata: move link onlineness check out of softreset methods 



Currently, SATA softresets should do link onlineness check before
actually performing SRST protocol but it doesn't really belong to
softreset.

This patch moves onlineness check in softreset to ata_eh_reset() and
ata_eh_followup_srst_needed() to clean up code and help future sata_mv
changes which need clear separation between SCR and TF accesses.

sata_fsl is peculiar in that its softreset really isn't softreset but
combination of hardreset and softreset.  This patch adds dummy private
->prereset to keep the current behavior but the driver really should
implement separate hard and soft resets and return -EAGAIN from
hardreset if it should be follwed by softreset.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 2a0c15ca

drivers/ata/ahci.c

+0 −6
Original line number Diff line number Diff line
@@ -1273,12 +1273,6 @@ static int ahci_softreset(struct ata_link *link, unsigned int *class, 


	DPRINTK("ENTER\n");



	if (ata_link_offline(link)) {

		DPRINTK("PHY reports no device\n");

		*class = ATA_DEV_NONE;

		return 0;

	}



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

	rc = ahci_kick_engine(ap, 1);

	if (rc && rc != -EOPNOTSUPP)

drivers/ata/libata-core.c

+4 −0
Original line number Diff line number Diff line
@@ -3541,6 +3541,10 @@ int ata_std_prereset(struct ata_link *link, unsigned long deadline) 
					"link for reset (errno=%d)\n", rc);

	}



	/* no point in trying softreset on offline link */

	if (ata_link_offline(link))

		ehc->i.action &= ~ATA_EH_SOFTRESET;



	return 0;

}

drivers/ata/libata-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -2065,7 +2065,7 @@ static int ata_eh_followup_srst_needed(struct ata_link *link, 
				       int rc, int classify,

				       const unsigned int *classes)

{

	if (link->flags & ATA_LFLAG_NO_SRST)

	if ((link->flags & ATA_LFLAG_NO_SRST) || ata_link_offline(link))

		return 0;

	if (rc == -EAGAIN) {

		if (classify)

drivers/ata/libata-sff.c

+0 −6
Original line number Diff line number Diff line
@@ -1889,11 +1889,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, 


	DPRINTK("ENTER\n");



	if (ata_link_offline(link)) {

		classes[0] = ATA_DEV_NONE;

		goto out;

	}



	/* determine if device 0/1 are present */

	if (ata_devchk(ap, 0))

		devmask |= (1 << 0);
@@ -1919,7 +1914,6 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, 
		classes[1] = ata_sff_dev_classify(&link->device[1],

						  devmask & (1 << 1), &err);



 out:

	DPRINTK("EXIT, classes[0]=%u [1]=%u\n", classes[0], classes[1]);

	return 0;

}

drivers/ata/pata_bf54x.c

+0 −6
Original line number Diff line number Diff line
@@ -1103,11 +1103,6 @@ static int bfin_softreset(struct ata_link *link, unsigned int *classes, 
	unsigned int devmask = 0, err_mask;

	u8 err;



	if (ata_link_offline(link)) {

		classes[0] = ATA_DEV_NONE;

		goto out;

	}



	/* determine if device 0/1 are present */

	if (bfin_devchk(ap, 0))

		devmask |= (1 << 0);
@@ -1132,7 +1127,6 @@ static int bfin_softreset(struct ata_link *link, unsigned int *classes, 
		classes[1] = ata_sff_dev_classify(&ap->link.device[1],

					devmask & (1 << 1), &err);



 out:

	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE