From 2065b9161134f2ac0f34a2cf7ea2aa2d140128ba Mon Sep 17 00:00:00 2001
From: Tejun Heo <htejun@gmail.com>
Date: Mon, 16 Jul 2007 14:29:38 +0900
Subject: [PATCH] --- yaml --- r: 61999 b: refs/heads/master c:
 2cbb79ebbd4be07041368da5379a64f89f8ad518 h: refs/heads/master i:   61997:
 84e7cfa34af5b134a0dd1a4a4a26ca0fcf5fc11c   61995:
 ba1ed4202015ed9d71cf3809e50cb9e31fb0f4a6   61991:
 5f667f2a14cbd7a29152aa62a034925b552d7613   61983:
 1526d45e0e425adf3573b93b2659459291695c57 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/ata/ahci.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dd031bc56f43..ac6e4b84802e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9977126c4b65c1396b665f7a0eeb8c7dede336f9
+refs/heads/master: 2cbb79ebbd4be07041368da5379a64f89f8ad518
diff --git a/trunk/drivers/ata/ahci.c b/trunk/drivers/ata/ahci.c
index 61c5b6e68de4..0451600bdcc6 100644
--- a/trunk/drivers/ata/ahci.c
+++ b/trunk/drivers/ata/ahci.c
@@ -976,6 +976,7 @@ static int ahci_softreset(struct ata_port *ap, unsigned int *class,
 	void __iomem *port_mmio = ahci_port_base(ap);
 	const u32 cmd_fis_len = 5; /* five dwords */
 	const char *reason = NULL;
+	unsigned long now, msecs;
 	struct ata_taskfile tf;
 	u32 tmp;
 	u8 *fis;
@@ -1016,6 +1017,11 @@ static int ahci_softreset(struct ata_port *ap, unsigned int *class,
 	fis = pp->cmd_tbl;
 
 	/* issue the first D2H Register FIS */
+	msecs = 0;
+	now = jiffies;
+	if (time_after(now, deadline))
+		msecs = jiffies_to_msecs(deadline - now);
+
 	ahci_fill_cmd_slot(pp, 0,
 			   cmd_fis_len | AHCI_CMD_RESET | AHCI_CMD_CLR_BUSY);
 
@@ -1024,7 +1030,7 @@ static int ahci_softreset(struct ata_port *ap, unsigned int *class,
 
 	writel(1, port_mmio + PORT_CMD_ISSUE);
 
-	tmp = ata_wait_register(port_mmio + PORT_CMD_ISSUE, 0x1, 0x1, 1, 500);
+	tmp = ata_wait_register(port_mmio + PORT_CMD_ISSUE, 0x1, 0x1, 1, msecs);
 	if (tmp & 0x1) {
 		rc = -EIO;
 		reason = "1st FIS failed";