linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/1] AHCI: disabled FBS prior to issuing software reset
@ 2013-09-28 11:13 Xiangliang Yu
  2013-09-28 11:49 ` Tejun Heo
  2013-09-28 15:23 ` Sergei Shtylyov
  0 siblings, 2 replies; 14+ messages in thread
From: Xiangliang Yu @ 2013-09-28 11:13 UTC (permalink / raw)
  To: tj; +Cc: linux-ide, linux-kernel, Xiangliang Yu

If device is attached to port multiplier, the detection process
look like this:
	ahci_hardreset(link, class, deadline)
	if (class == ATA_DEV_PMP) {
		sata_pmp_attach(dev)    /* will enable FBS */
		sata_pmp_init_links(ap, nr_ports);
		ata_for_each_link(link, ap, EDGE) {
			sata_std_hardreset(link, class, deadline);
			if (link_is_online)
				ahci_softreset(link, class, deadline);
		}
	}
But, according to chapter 9.3.9 in AHCI spec: Prior to issuing software reset,
software shall clear PxCMD.ST to '0' and then clear PxFBS.EN to '0'.

Signed-off-by: Xiangliang Yu <yxlraid@gmail.com>
---
 drivers/ata/libahci.c |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index acfd0f7..8d024a4 100644
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1267,9 +1267,11 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
 {
 	struct ata_port *ap = link->ap;
 	struct ahci_host_priv *hpriv = ap->host->private_data;
+	struct ahci_port_priv *pp = ap->private_data;
 	const char *reason = NULL;
 	unsigned long now, msecs;
 	struct ata_taskfile tf;
+	bool flag = FALSE;
 	int rc;
 
 	DPRINTK("ENTER\n");
@@ -1279,6 +1281,11 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
 	if (rc && rc != -EOPNOTSUPP)
 		ata_link_warn(link, "failed to reset engine (errno=%d)\n", rc);
 
+	if (!ata_is_host_link(link) && pp->fbs_enabled) {
+		ahci_disable_fbs(ap);
+		flag = TRUE;
+	}
+
 	ata_tf_init(link->device, &tf);
 
 	/* issue the first D2H Register FIS */
@@ -1319,6 +1326,9 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,
 	} else
 		*class = ahci_dev_classify(ap);
 
+	if (flag)
+		ahci_enable_fbs(ap);
+
 	DPRINTK("EXIT, class=%u\n", *class);
 	return 0;
 
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 14+ messages in thread
end of thread, other threads:[~2013-11-14  5:25 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <CAP0P+NUQSByVNquY-zP3S-6GKhSvQXgq_4dDCTd2R8FM=YC_Gg@mail.gmail.com>
2013-10-27 11:57 ` [PATCH 1/1] AHCI: disabled FBS prior to issuing software reset Tejun Heo
2013-10-28  1:48   ` xiangliang yu
2013-11-14  0:26   ` xiangliang yu
2013-11-14  5:25     ` Tejun Heo
2013-09-28 11:13 Xiangliang Yu
2013-09-28 11:49 ` Tejun Heo
2013-09-28 13:04   ` xiangliang yu
2013-09-28 13:10     ` Tejun Heo
2013-10-12  6:56       ` xiangliang yu
2013-10-13 19:57         ` Tejun Heo
2013-10-14  1:48           ` xiangliang yu
2013-10-15  3:40           ` xiangliang yu
2013-10-15 12:50             ` Tejun Heo
2013-09-28 15:23 ` Sergei Shtylyov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).