From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754499AbbESGga (ORCPT ); Tue, 19 May 2015 02:36:30 -0400 Received: from sci-ig2.spreadtrum.com ([222.66.158.135]:44328 "EHLO SHSQR01.spreadtrum.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753559AbbESGg0 (ORCPT ); Tue, 19 May 2015 02:36:26 -0400 From: =?utf-8?B?SnVzdGluIFdhbmcgKOeOi+S4gSk=?= To: "'ulf.hansson@linaro.org'" , "'kuninori.morimoto.gx@renesas.com'" , "'jh80.chung@samsung.com'" , "'akpm@linux-foundation.org'" , "'JBottomley@Odin.com'" , "'ben@decadent.org.uk'" , "'chuanxiao.dong@intel.com'" CC: "'linux-mmc@vger.kernel.org'" , "'linux-kernel@vger.kernel.org'" Subject: [PATCH] mmc: card: Fixup request missing in mmc_blk_issue_rw_rq Thread-Topic: [PATCH] mmc: card: Fixup request missing in mmc_blk_issue_rw_rq Thread-Index: AdCR/ZWktRgFsB0DTb+gZw4BZ2Qglw== Date: Tue, 19 May 2015 06:32:31 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.0.0.213] Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 X-MAIL: SHSQR01.spreadtrum.com t4J6XGli007744 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from base64 to 8bit by nfs id t4J6aXul031179 >>From 05849da563c80c20597ab6275d5881a8ed426f96 Mon Sep 17 00:00:00 2001 From: justin.wang Date: Mon, 18 May 2015 20:14:15 +0800 Subject: [PATCH] mmc: card: Fixup request missing in mmc_blk_issue_rw_rq The current handler of MMC_BLK_CMD_ERR in mmc_blk_issue_rw_rq function may cause new coming request permanent missing when the ongoing request (previoulsy started) complete end. This would cause the process related to the missing request stay at 'D' state forever. Signed-off-by: Ding Wang --- drivers/mmc/card/block.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 60f7141..f05cd1f 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1910,9 +1910,11 @@ static int mmc_blk_issue_rw_rq(struct mmc_queue *mq, struct request *rqc) break; case MMC_BLK_CMD_ERR: ret = mmc_blk_cmd_err(md, card, brq, req, ret); - if (!mmc_blk_reset(md, card->host, type)) - break; - goto cmd_abort; + if (mmc_blk_reset(md, card->host, type)) + goto cmd_abort; + if (!ret) + goto start_new_req; + break; case MMC_BLK_RETRY: if (retry++ < 5) break; -- 1.7.4.1 ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayºʇڙë,j­¢f£¢·hšïêÿ‘êçz_è®(­éšŽŠÝ¢j"ú¶m§ÿÿ¾«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^¶m§ÿÿà ÿ¶ìÿ¢¸?–I¥