From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B63FC43215 for ; Wed, 27 Nov 2019 21:41:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D92502075C for ; Wed, 27 Nov 2019 21:41:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574890878; bh=Cm8oqydL25NKOv9Ru7j+5HUTOOWMEduozul5gSK8JoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Znz+RnDLJ4vVB3zl8+QwKvuqPUY06sfnEzI5fbItom09AQ318ouqgJSeTxk8SEmXZ ag6IYO47kZ0z6AchGoGOaEQPzvrNEQi0TMPqzCSpt+/2v+C9hamdadrOpZuMNJXivt 2hiNBE3640ZjPuwK9YDZdA96/SAN17i1GBzSQPH8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729720AbfK0VlQ (ORCPT ); Wed, 27 Nov 2019 16:41:16 -0500 Received: from mail.kernel.org ([198.145.29.99]:47304 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729244AbfK0Ulp (ORCPT ); Wed, 27 Nov 2019 15:41:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DD11620863; Wed, 27 Nov 2019 20:41:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574887305; bh=Cm8oqydL25NKOv9Ru7j+5HUTOOWMEduozul5gSK8JoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NaTqFR7z3xozxKC/GwJlrBMzJ7Pl7ALMwxIuRNug2vBoSBoDavmMLRI3gca5j7r3s kzXoW93zLFQzxsUB0iFaql3bcOarD4vFzMgr7iAWSpdlTb7R5bnCRatibnA1w1F8Tk oiOZhEE/GBtfopW5k2Asf1tX5BIDMcY0Ua44UUnQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chaotian Jing , Ulf Hansson , Sasha Levin Subject: [PATCH 4.9 022/151] mmc: mediatek: fix cannot receive new request when msdc_cmd_is_ready fail Date: Wed, 27 Nov 2019 21:30:05 +0100 Message-Id: <20191127203014.226601301@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191127203000.773542911@linuxfoundation.org> References: <20191127203000.773542911@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chaotian Jing [ Upstream commit f38a9774ddde9d79b3487dd888edd8b8623552af ] when msdc_cmd_is_ready return fail, the req_timeout work has not been inited and cancel_delayed_work() will return false, then, the request return directly and never call mmc_request_done(). so need call mod_delayed_work() before msdc_cmd_is_ready() Signed-off-by: Chaotian Jing Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/mtk-sd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 6f9535e5e584b..7fc6ce3811421 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -870,6 +870,7 @@ static void msdc_start_command(struct msdc_host *host, WARN_ON(host->cmd); host->cmd = cmd; + mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT); if (!msdc_cmd_is_ready(host, mrq, cmd)) return; @@ -881,7 +882,6 @@ static void msdc_start_command(struct msdc_host *host, cmd->error = 0; rawcmd = msdc_cmd_prepare_raw_cmd(host, mrq, cmd); - mod_delayed_work(system_wq, &host->req_timeout, DAT_TIMEOUT); sdr_set_bits(host->base + MSDC_INTEN, cmd_ints_mask); writel(cmd->arg, host->base + SDC_ARG); -- 2.20.1