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=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 67957C433E0 for ; Tue, 2 Mar 2021 13:46:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 32F9B64F40 for ; Tue, 2 Mar 2021 13:46:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1446287AbhCBNkT (ORCPT ); Tue, 2 Mar 2021 08:40:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:48572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350404AbhCBMVN (ORCPT ); Tue, 2 Mar 2021 07:21:13 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D51DC64F99; Tue, 2 Mar 2021 11:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686322; bh=t8QnT/aIpcXuRhRM9tNQFdbNjsC4v3IZvlSbKSH24fU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SlU3RyFeA4tgvBAlS6VZWaSH28VUjrDuIq6cE2MStPM/O2ftQU0UccJM+cEbeVO/Q +Z4rxVJLqed2s23jM0KvXihVWX74oaunwar4hmo6Wjww06I+hxTxXQFmBtMFcM45TL 4n6yPXsURd+yVXAC1geFydovwt+Jw+Nh1Mc8Ez5THTbfzo4fhb5MXTtX85N4yssiFu Zygx9LKUqHJjdE9JwuVnWdJkV9hxzZffHt+5Ang8b90df2kqk+xj/0MHBtHVprMQ/7 67fRic8CEEoN3xvOz4PwZ6bKrxR2N6is6cMQlrs3jbmRdM/cHcK3oKEH3GON4vG7DY yU+6iCWRTlLvg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chaotian Jing , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 05/21] mmc: mediatek: fix race condition between msdc_request_timeout and irq Date: Tue, 2 Mar 2021 06:58:19 -0500 Message-Id: <20210302115835.63269-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115835.63269-1-sashal@kernel.org> References: <20210302115835.63269-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chaotian Jing [ Upstream commit 0354ca6edd464a2cf332f390581977b8699ed081 ] when get request SW timeout, if CMD/DAT xfer done irq coming right now, then there is race between the msdc_request_timeout work and irq handler, and the host->cmd and host->data may set to NULL in irq handler. also, current flow ensure that only one path can go to msdc_request_done(), so no need check the return value of cancel_delayed_work(). Signed-off-by: Chaotian Jing Link: https://lore.kernel.org/r/20201218071611.12276-1-chaotian.jing@mediatek.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/mtk-sd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 9ecf86ba4bb0..967e47770af6 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -928,13 +928,13 @@ static void msdc_track_cmd_data(struct msdc_host *host, static void msdc_request_done(struct msdc_host *host, struct mmc_request *mrq) { unsigned long flags; - bool ret; - ret = cancel_delayed_work(&host->req_timeout); - if (!ret) { - /* delay work already running */ - return; - } + /* + * No need check the return value of cancel_delayed_work, as only ONE + * path will go here! + */ + cancel_delayed_work(&host->req_timeout); + spin_lock_irqsave(&host->lock, flags); host->mrq = NULL; spin_unlock_irqrestore(&host->lock, flags); @@ -952,7 +952,7 @@ static bool msdc_cmd_done(struct msdc_host *host, int events, bool done = false; bool sbc_error; unsigned long flags; - u32 *rsp = cmd->resp; + u32 *rsp; if (mrq->sbc && cmd == mrq->cmd && (events & (MSDC_INT_ACMDRDY | MSDC_INT_ACMDCRCERR @@ -973,6 +973,7 @@ static bool msdc_cmd_done(struct msdc_host *host, int events, if (done) return true; + rsp = cmd->resp; sdr_clr_bits(host->base + MSDC_INTEN, cmd_ints_mask); @@ -1154,7 +1155,7 @@ static void msdc_data_xfer_next(struct msdc_host *host, static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, struct mmc_request *mrq, struct mmc_data *data) { - struct mmc_command *stop = data->stop; + struct mmc_command *stop; unsigned long flags; bool done; unsigned int check_data = events & @@ -1170,6 +1171,7 @@ static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, if (done) return true; + stop = data->stop; if (check_data || (stop && stop->error)) { dev_dbg(host->dev, "DMA status: 0x%8X\n", -- 2.30.1 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 E5B09C433E6 for ; Wed, 3 Mar 2021 14:07:44 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6AF5164E68 for ; Wed, 3 Mar 2021 14:07:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6AF5164E68 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=38GqWm9N+1uGDV0oH8vlJHOD3wkVhr29VRpjEplKuz4=; b=eGMGgNISxZ93nryHYmYbYiIJA 7a+RPhHurvyNHRS4P8OcG1N9fkrIu6XA6wVg93Zp8YdN2OJG9XXdlpT+hctMK9BpBwtDKFweTWBkN f7r0fyAmh1lByF70BGB7Vj6A06OqHKMUMhxUi0Ox1Ru6SCJYOwsJiK1t25/66RFo1lfudvBgKhNA5 JxWLN2MmzZ6ztAi/QzUyxnmO7k6/ykDrvyKtQ10t3N1Mki2ucpS8T7NKP8AJgbceubnWsQs8MJI9+ lHE3SWlW/gAT+PCPbISC4haqJk317358MBZ57A/S9mo3wUm0NPqnObnogUDIwQgfH5uZa/oRhshvL bmDBIfTpQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHSA0-0053pC-Sn; Wed, 03 Mar 2021 14:07:33 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHS4s-00523V-HB; Wed, 03 Mar 2021 14:02:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=E3M/IArGPOkzwDddzOw/cHETJqlDeqQXEflqiDG56ws=; b=pI5TRng7NT/WBHFC8VYq07nSVR 1NkymPbXydeZDPZoYFSFE/73ev11gtBHIMnQcmmfA0osLeofIxneGf2YGKpxsZqw/GKQPb/VOsZ07 2sWfQv5KVM8sSFnL0Y6BplI5wWDWQiiZ6ES8Wm61pw8v8IOaRx5g38sOqmvUMkqehHHA5rDt5+G2s bkWAmkknS6GgXnieihIzXx7a25ppvNRJ5iBujuWiEIzDmL1qqNqlXRdkLm31WRlwZcGzKCUzxkNOv m0qwae05e5540zrI0cYwhVjYWSSFoF3YEOW7r6aK6o+752uNY6oJ8/I9GdIqzj0qGQUvVwW/BWMvY PBRx6VWA==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lH3fo-00H3Oo-Lm; Tue, 02 Mar 2021 11:58:47 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D51DC64F99; Tue, 2 Mar 2021 11:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686322; bh=t8QnT/aIpcXuRhRM9tNQFdbNjsC4v3IZvlSbKSH24fU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SlU3RyFeA4tgvBAlS6VZWaSH28VUjrDuIq6cE2MStPM/O2ftQU0UccJM+cEbeVO/Q +Z4rxVJLqed2s23jM0KvXihVWX74oaunwar4hmo6Wjww06I+hxTxXQFmBtMFcM45TL 4n6yPXsURd+yVXAC1geFydovwt+Jw+Nh1Mc8Ez5THTbfzo4fhb5MXTtX85N4yssiFu Zygx9LKUqHJjdE9JwuVnWdJkV9hxzZffHt+5Ang8b90df2kqk+xj/0MHBtHVprMQ/7 67fRic8CEEoN3xvOz4PwZ6bKrxR2N6is6cMQlrs3jbmRdM/cHcK3oKEH3GON4vG7DY yU+6iCWRTlLvg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chaotian Jing , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 05/21] mmc: mediatek: fix race condition between msdc_request_timeout and irq Date: Tue, 2 Mar 2021 06:58:19 -0500 Message-Id: <20210302115835.63269-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115835.63269-1-sashal@kernel.org> References: <20210302115835.63269-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_115847_973464_3662FBBB X-CRM114-Status: GOOD ( 11.29 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+linux-mediatek=archiver.kernel.org@lists.infradead.org From: Chaotian Jing [ Upstream commit 0354ca6edd464a2cf332f390581977b8699ed081 ] when get request SW timeout, if CMD/DAT xfer done irq coming right now, then there is race between the msdc_request_timeout work and irq handler, and the host->cmd and host->data may set to NULL in irq handler. also, current flow ensure that only one path can go to msdc_request_done(), so no need check the return value of cancel_delayed_work(). Signed-off-by: Chaotian Jing Link: https://lore.kernel.org/r/20201218071611.12276-1-chaotian.jing@mediatek.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/mtk-sd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 9ecf86ba4bb0..967e47770af6 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -928,13 +928,13 @@ static void msdc_track_cmd_data(struct msdc_host *host, static void msdc_request_done(struct msdc_host *host, struct mmc_request *mrq) { unsigned long flags; - bool ret; - ret = cancel_delayed_work(&host->req_timeout); - if (!ret) { - /* delay work already running */ - return; - } + /* + * No need check the return value of cancel_delayed_work, as only ONE + * path will go here! + */ + cancel_delayed_work(&host->req_timeout); + spin_lock_irqsave(&host->lock, flags); host->mrq = NULL; spin_unlock_irqrestore(&host->lock, flags); @@ -952,7 +952,7 @@ static bool msdc_cmd_done(struct msdc_host *host, int events, bool done = false; bool sbc_error; unsigned long flags; - u32 *rsp = cmd->resp; + u32 *rsp; if (mrq->sbc && cmd == mrq->cmd && (events & (MSDC_INT_ACMDRDY | MSDC_INT_ACMDCRCERR @@ -973,6 +973,7 @@ static bool msdc_cmd_done(struct msdc_host *host, int events, if (done) return true; + rsp = cmd->resp; sdr_clr_bits(host->base + MSDC_INTEN, cmd_ints_mask); @@ -1154,7 +1155,7 @@ static void msdc_data_xfer_next(struct msdc_host *host, static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, struct mmc_request *mrq, struct mmc_data *data) { - struct mmc_command *stop = data->stop; + struct mmc_command *stop; unsigned long flags; bool done; unsigned int check_data = events & @@ -1170,6 +1171,7 @@ static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, if (done) return true; + stop = data->stop; if (check_data || (stop && stop->error)) { dev_dbg(host->dev, "DMA status: 0x%8X\n", -- 2.30.1 _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 D42DDC433E0 for ; Wed, 3 Mar 2021 14:09:17 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 440BF64E89 for ; Wed, 3 Mar 2021 14:09:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 440BF64E89 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=TUQlVxhOgJlw+Hd94FR34hEzde+K1XRET88wador+YU=; b=NdvGpFBxXizqU5kOvCI3oBYFz l7NzE91kwdPGQb+XOzT+aW21Xrn770ZCn2EU6OfVanUsb068+wQB8c+W77K6ryuHAJrp88Nr8QKjI SBYK3DHgy6nB8HOnouBsaazPJsjgsKevDsLDWSDg1mrqq1bpcmpgEi/Z1I5k7BnkV2QpPo53/PRXu WPZY89ijOSO80sX/76LpRxQpeV28J7OELUG59sLdVqCpLDYjCLLzyEuQxvpxgK0oRbDxWI0IP/ibE Gn1o7WNSEjDt1657DZC1jLdUzn0oMgjstCOt5Jz3/h+A89I51lkr8Cg0zFBP25zxDv11dX5GLJlcV 3Tsre59RA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHS9h-0053hp-4B; Wed, 03 Mar 2021 14:07:13 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHS4s-00523V-HB; Wed, 03 Mar 2021 14:02:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=E3M/IArGPOkzwDddzOw/cHETJqlDeqQXEflqiDG56ws=; b=pI5TRng7NT/WBHFC8VYq07nSVR 1NkymPbXydeZDPZoYFSFE/73ev11gtBHIMnQcmmfA0osLeofIxneGf2YGKpxsZqw/GKQPb/VOsZ07 2sWfQv5KVM8sSFnL0Y6BplI5wWDWQiiZ6ES8Wm61pw8v8IOaRx5g38sOqmvUMkqehHHA5rDt5+G2s bkWAmkknS6GgXnieihIzXx7a25ppvNRJ5iBujuWiEIzDmL1qqNqlXRdkLm31WRlwZcGzKCUzxkNOv m0qwae05e5540zrI0cYwhVjYWSSFoF3YEOW7r6aK6o+752uNY6oJ8/I9GdIqzj0qGQUvVwW/BWMvY PBRx6VWA==; Received: from mail.kernel.org ([198.145.29.99]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lH3fo-00H3Oo-Lm; Tue, 02 Mar 2021 11:58:47 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D51DC64F99; Tue, 2 Mar 2021 11:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614686322; bh=t8QnT/aIpcXuRhRM9tNQFdbNjsC4v3IZvlSbKSH24fU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SlU3RyFeA4tgvBAlS6VZWaSH28VUjrDuIq6cE2MStPM/O2ftQU0UccJM+cEbeVO/Q +Z4rxVJLqed2s23jM0KvXihVWX74oaunwar4hmo6Wjww06I+hxTxXQFmBtMFcM45TL 4n6yPXsURd+yVXAC1geFydovwt+Jw+Nh1Mc8Ez5THTbfzo4fhb5MXTtX85N4yssiFu Zygx9LKUqHJjdE9JwuVnWdJkV9hxzZffHt+5Ang8b90df2kqk+xj/0MHBtHVprMQ/7 67fRic8CEEoN3xvOz4PwZ6bKrxR2N6is6cMQlrs3jbmRdM/cHcK3oKEH3GON4vG7DY yU+6iCWRTlLvg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Chaotian Jing , Ulf Hansson , Sasha Levin , linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH AUTOSEL 4.19 05/21] mmc: mediatek: fix race condition between msdc_request_timeout and irq Date: Tue, 2 Mar 2021 06:58:19 -0500 Message-Id: <20210302115835.63269-5-sashal@kernel.org> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210302115835.63269-1-sashal@kernel.org> References: <20210302115835.63269-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210302_115847_973464_3662FBBB X-CRM114-Status: GOOD ( 11.29 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Chaotian Jing [ Upstream commit 0354ca6edd464a2cf332f390581977b8699ed081 ] when get request SW timeout, if CMD/DAT xfer done irq coming right now, then there is race between the msdc_request_timeout work and irq handler, and the host->cmd and host->data may set to NULL in irq handler. also, current flow ensure that only one path can go to msdc_request_done(), so no need check the return value of cancel_delayed_work(). Signed-off-by: Chaotian Jing Link: https://lore.kernel.org/r/20201218071611.12276-1-chaotian.jing@mediatek.com Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/host/mtk-sd.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c index 9ecf86ba4bb0..967e47770af6 100644 --- a/drivers/mmc/host/mtk-sd.c +++ b/drivers/mmc/host/mtk-sd.c @@ -928,13 +928,13 @@ static void msdc_track_cmd_data(struct msdc_host *host, static void msdc_request_done(struct msdc_host *host, struct mmc_request *mrq) { unsigned long flags; - bool ret; - ret = cancel_delayed_work(&host->req_timeout); - if (!ret) { - /* delay work already running */ - return; - } + /* + * No need check the return value of cancel_delayed_work, as only ONE + * path will go here! + */ + cancel_delayed_work(&host->req_timeout); + spin_lock_irqsave(&host->lock, flags); host->mrq = NULL; spin_unlock_irqrestore(&host->lock, flags); @@ -952,7 +952,7 @@ static bool msdc_cmd_done(struct msdc_host *host, int events, bool done = false; bool sbc_error; unsigned long flags; - u32 *rsp = cmd->resp; + u32 *rsp; if (mrq->sbc && cmd == mrq->cmd && (events & (MSDC_INT_ACMDRDY | MSDC_INT_ACMDCRCERR @@ -973,6 +973,7 @@ static bool msdc_cmd_done(struct msdc_host *host, int events, if (done) return true; + rsp = cmd->resp; sdr_clr_bits(host->base + MSDC_INTEN, cmd_ints_mask); @@ -1154,7 +1155,7 @@ static void msdc_data_xfer_next(struct msdc_host *host, static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, struct mmc_request *mrq, struct mmc_data *data) { - struct mmc_command *stop = data->stop; + struct mmc_command *stop; unsigned long flags; bool done; unsigned int check_data = events & @@ -1170,6 +1171,7 @@ static bool msdc_data_xfer_done(struct msdc_host *host, u32 events, if (done) return true; + stop = data->stop; if (check_data || (stop && stop->error)) { dev_dbg(host->dev, "DMA status: 0x%8X\n", -- 2.30.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel