Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759021AbZDQIpm (ORCPT ); Fri, 17 Apr 2009 04:45:42 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756537AbZDQIpe (ORCPT ); Fri, 17 Apr 2009 04:45:34 -0400 Received: from bitbox.plus.com ([81.174.226.42]:42487 "EHLO pangolin.localnet" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755621AbZDQIpd (ORCPT ); Fri, 17 Apr 2009 04:45:33 -0400 X-Greylist: delayed 1382 seconds by postgrey-1.27 at vger.kernel.org; Fri, 17 Apr 2009 04:45:33 EDT Message-ID: <49E83C3D.8020404@bitbox.co.uk> Date: Fri, 17 Apr 2009 09:22:21 +0100 From: Peter Horton User-Agent: Thunderbird 2.0.0.21 (Windows/20090302) MIME-Version: 1.0 To: dedekind@infradead.org Cc: Peter Horton , dwmw2@infradead.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] mtd: fix timeout in M25P80 driver References: <20090413142633.GA1560@sloth.localnet> <1239953060.3390.239.camel@localhost.localdomain> In-Reply-To: <1239953060.3390.239.camel@localhost.localdomain> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1861 Lines: 47 Artem Bityutskiy wrote: > On Mon, 2009-04-13 at 15:26 +0100, Peter Horton wrote: >> Extend erase timeout in M25P80 SPI Flash driver. >> >> The M25P80 drivers fails erasing sectors on a M25P128 because the ready >> wait timeout is too short. Change the timeout from a simple loop count to a >> suitable number of seconds. >> >> Signed-off-by: Peter Horton >> --- >> Index: linux-2.6.29-git12/drivers/mtd/devices/m25p80.c >> =================================================================== >> --- linux-2.6.29-git12.orig/drivers/mtd/devices/m25p80.c 2009-04-12 21:41:16.000000000 +0000 >> +++ linux-2.6.29-git12/drivers/mtd/devices/m25p80.c 2009-04-12 21:43:01.000000000 +0000 >> @@ -54,7 +54,7 @@ >> #define SR_SRWD 0x80 /* SR write protect */ >> >> /* Define max times to check status register before we give up. */ >> -#define MAX_READY_WAIT_COUNT 100000 >> +#define MAX_READY_WAIT_JIFFIES (10 * HZ) /* eg. M25P128 specs 6s max sector erase */ >> #define CMD_SIZE 4 >> >> #ifdef CONFIG_M25PXX_USE_FAST_READ >> @@ -145,20 +145,20 @@ >> */ >> static int wait_till_ready(struct m25p *flash) >> { >> - int count; >> + unsigned long deadline; >> int sr; >> >> - /* one chip guarantees max 5 msec wait here after page writes, >> - * but potentially three seconds (!) after page erase. >> - */ > Why did you remove the comment? Is it wrong or useless? > I moved the comment up to the definition of MAX_READY_WAIT_JIFFIES. Looking through the code I missed the fact the driver can generate "chip erase", on the M25P128 the maximum ready timeout for this is 250s !!! P. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/