From patchwork Wed May 29 15:51:19 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Langsdorf X-Patchwork-Id: 247296 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4BA5D2C031A for ; Thu, 30 May 2013 01:52:37 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932934Ab3E2Pwg (ORCPT ); Wed, 29 May 2013 11:52:36 -0400 Received: from smtp111.dfw.emailsrvr.com ([67.192.241.111]:38344 "EHLO smtp111.dfw.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932651Ab3E2Pwf (ORCPT ); Wed, 29 May 2013 11:52:35 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp21.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTP id 1B4F81E0016 for ; Wed, 29 May 2013 11:52:35 -0400 (EDT) X-Virus-Scanned: OK Received: from smtp89.ord1c.emailsrvr.com (smtp89.ord1c.emailsrvr.com [108.166.43.89]) by smtp21.relay.dfw1a.emailsrvr.com (SMTP Server) with ESMTPS id 037152415DD for ; Wed, 29 May 2013 11:52:34 -0400 (EDT) Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp4.relay.ord1c.emailsrvr.com (SMTP Server) with ESMTP id 73F24140090; Wed, 29 May 2013 11:51:23 -0400 (EDT) X-Virus-Scanned: OK Received: by smtp4.relay.ord1c.emailsrvr.com (Authenticated sender: mark.langsdorf-AT-calxeda.com) with ESMTPSA id 21FD014008D; Wed, 29 May 2013 11:51:23 -0400 (EDT) From: Mark Langsdorf To: linux-kernel@vger.kernel.org, tj@kernel.org, linux-ide@vger.kernel.org Cc: Mark Langsdorf Subject: [PATCH] ata: increase retry count but shorten duration for Calxeda controller Date: Wed, 29 May 2013 10:51:19 -0500 Message-Id: <1369842679-9680-1-git-send-email-mark.langsdorf@calxeda.com> X-Mailer: git-send-email 1.8.1.2 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org The Calxeda SATA phy intermittently fails to bring up a link with Gen3 Retrying the phy hard reset can work around the issue, but the drive may fail again. In less than 150 out of 15000 test runs, it took more than 10 tries for the link to be established (but never more than 35). Increase the retry count to guarantee the link is established. Also, the default 2 second time-out on a failed drive is too long in this situation. Shorten it to 500 ms. This was also tested 15000 times on 24 drives and none of them experienced a time out. Signed-off-by: Mark Langsdorf --- drivers/ata/sata_highbank.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c index 0d7c4c2..536936f 100644 --- a/drivers/ata/sata_highbank.c +++ b/drivers/ata/sata_highbank.c @@ -199,7 +199,7 @@ static int highbank_initialize_phys(struct device *dev, void __iomem *addr) static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline) { - const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context); + unsigned long timing[] = { 5, 100, 500}; struct ata_port *ap = link->ap; struct ahci_port_priv *pp = ap->private_data; u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; @@ -207,7 +207,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, bool online; u32 sstatus; int rc; - int retry = 10; + int retry = 100; ahci_stop_engine(ap);