From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chuanxiao Dong Subject: [PATCH v5 4/4]do HW reset after each read/write/erase if need Date: Thu, 9 Dec 2010 20:25:03 +0800 Message-ID: <20101209122503.GE13236@intel.com> Reply-To: Chuanxiao Dong Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mga09.intel.com ([134.134.136.24]:21287 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755366Ab0LIM2h (ORCPT ); Thu, 9 Dec 2010 07:28:37 -0500 Content-Disposition: inline Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: linux-mmc@vger.kernel.org Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, cjb@laptop.org, kmpark@infradead.org, leonard.mai@intel.com Driver can do a HW reset for eMMC card if read/write/erase occurs timeout error. Signed-off-by: Chuanxiao Dong --- drivers/mmc/card/block.c | 10 ++++++++++ drivers/mmc/core/core.c | 2 ++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 217f820..c50f94b 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -424,6 +424,16 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *req) mmc_wait_for_req(card->host, &brq.mrq); + /* + * Check if need to do HW reset. + */ + if (brq.cmd.error) + mmc_handle_timeout_error(card->host, brq.cmd.error); + else if (brq.data.error) + mmc_handle_timeout_error(card->host, brq.data.error); + else if (brq.stop.error) + mmc_handle_timeout_error(card->host, brq.stop.error); + mmc_queue_bounce_post(mq); /* diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 530fc35..731399e 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -1385,6 +1385,8 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, if (err) { printk(KERN_ERR "mmc_erase: erase error %d, status %#x\n", err, cmd.resp[0]); + /* Before return, check whether can do a HW reset */ + mmc_handle_timeout_error(card->host, cmd.error); err = -EIO; goto out; } -- 1.6.6.1