From patchwork Tue Nov 15 10:12:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jaehoon Chung X-Patchwork-Id: 9429279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BF7086047D for ; Tue, 15 Nov 2016 10:12:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9D9D286B7 for ; Tue, 15 Nov 2016 10:12:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9EA7528700; Tue, 15 Nov 2016 10:12:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36B3E286F7 for ; Tue, 15 Nov 2016 10:12:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941615AbcKOKMu (ORCPT ); Tue, 15 Nov 2016 05:12:50 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:60899 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S941563AbcKOKMq (ORCPT ); Tue, 15 Nov 2016 05:12:46 -0500 Received: from epcpsbgm1new.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGO00AFZHOSER70@mailout1.samsung.com>; Tue, 15 Nov 2016 19:12:35 +0900 (KST) X-AuditID: cbfee61a-f79916d0000062de-b5-582adf92f5e1 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 95.CF.25310.29FDA285; Tue, 15 Nov 2016 19:12:35 +0900 (KST) Received: from localhost.localdomain ([10.113.62.216]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OGO004CZHOYWN60@mmp1.samsung.com>; Tue, 15 Nov 2016 19:12:34 +0900 (KST) From: Jaehoon Chung To: linux-mmc@vger.kernel.org Cc: devicetree@vger.kernel.org, ulf.hansson@linaro.org, heiko@sntech.de, shawn.lin@rock-chips.com, robh+dt@kernel.org, Jaehoon Chung Subject: [PATCHv2 05/10] mmc: dw_mmc: call the dw_mci_prep_stop_abort() by default Date: Tue, 15 Nov 2016 19:12:27 +0900 Message-id: <20161115101232.3854-6-jh80.chung@samsung.com> X-Mailer: git-send-email 2.10.1 In-reply-to: <20161115101232.3854-1-jh80.chung@samsung.com> References: <20161115101232.3854-1-jh80.chung@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrILMWRmVeSWpSXmKPExsVy+t9jAd3J97UiDJavYrGYf+Qcq8X/R69Z LW78amO1OPK/n9Gide8Rdos7T9azWhxfG+7A7rFpVSebx51re9g8/s7az+LRt2UVo8f2a/OY PT5vkgtgi3KzyUhNTEktUkjNS85PycxLt1UKDXHTtVBSyEvMTbVVitD1DQlSUihLzCkF8owM 0ICDc4B7sJK+XYJbxu0/R1gKdghX9Pc/Y21gvMTfxcjJISFgIrH18ilmCFtM4sK99WxdjFwc QgJLGSXmXljNCuH8YJSY8/EBG0gVm4COxPZvx5lAbBEBWYmffy6AxZkFFjJKvHyRCGILC4RI HJl8lgXEZhFQldg7bydYDa+AlcTyHyvYILbJS1y4egqshlPAWuL4s4OMILYQUM2vZz2MExh5 FzAyrGKUSC1ILihOSs81zEst1ytOzC0uzUvXS87P3cQIDu5nUjsYD+5yP8QowMGoxMMb6K0V IcSaWFZcmXuIUYKDWUmE1/waUIg3JbGyKrUoP76oNCe1+BCjKdBhE5mlRJPzgZGXVxJvaGJu Ym5sYGFuaWlipCTO2zj7WbiQQHpiSWp2ampBahFMHxMHp1QDo+/OM5P+K0/8vXRn71ohyXt/ rrlNPXHuQBj3j58LpHZnNGzfUBd6Vb/LcW5D15M3vrPdN3GVfuWL3DthsoNd5icm1az6VY8K T+VWmGXdfHyvYgvXlWtek07deVPZdO2V3uOVb749ye8WfXHwvkx75oTXnJx57a3zHZfuiJp6 5Oce9S1N+fGf3kcosRRnJBpqMRcVJwIAYdF5MIQCAAA= X-MTR: 20000000000000000@CPGS Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP stop_cmdr should be set to values relevant to stop command. It migth be assigned to values whatever there is mrq->stop or not. Then it doesn't need to use dw_mci_prepare_command(). It's enough to use the prep_stop_abort for preparing stop command. Signed-off-by: Jaehoon Chung Tested-by: Heiko Stuebner --- drivers/mmc/host/dw_mmc.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 3cda68c..12e1107 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -385,7 +385,7 @@ static void dw_mci_start_command(struct dw_mci *host, static inline void send_stop_abort(struct dw_mci *host, struct mmc_data *data) { - struct mmc_command *stop = data->stop ? data->stop : &host->stop_abort; + struct mmc_command *stop = &host->stop_abort; dw_mci_start_command(host, stop, host->stop_cmdr); } @@ -1277,10 +1277,7 @@ static void __dw_mci_start_request(struct dw_mci *host, spin_unlock_irqrestore(&host->irq_lock, irqflags); } - if (mrq->stop) - host->stop_cmdr = dw_mci_prepare_command(slot->mmc, mrq->stop); - else - host->stop_cmdr = dw_mci_prep_stop_abort(host, cmd); + host->stop_cmdr = dw_mci_prep_stop_abort(host, cmd); } static void dw_mci_start_request(struct dw_mci *host, @@ -1890,8 +1887,7 @@ static void dw_mci_tasklet_func(unsigned long priv) if (test_and_clear_bit(EVENT_DATA_ERROR, &host->pending_events)) { dw_mci_stop_dma(host); - if (data->stop || - !(host->data_status & (SDMMC_INT_DRTO | + if (!(host->data_status & (SDMMC_INT_DRTO | SDMMC_INT_EBE))) send_stop_abort(host, data); state = STATE_DATA_ERROR; @@ -1927,8 +1923,7 @@ static void dw_mci_tasklet_func(unsigned long priv) if (test_and_clear_bit(EVENT_DATA_ERROR, &host->pending_events)) { dw_mci_stop_dma(host); - if (data->stop || - !(host->data_status & (SDMMC_INT_DRTO | + if (!(host->data_status & (SDMMC_INT_DRTO | SDMMC_INT_EBE))) send_stop_abort(host, data); state = STATE_DATA_ERROR; @@ -2004,7 +1999,7 @@ static void dw_mci_tasklet_func(unsigned long priv) host->cmd = NULL; host->data = NULL; - if (mrq->stop) + if (!mrq->sbc && mrq->stop) dw_mci_command_complete(host, mrq->stop); else host->cmd_status = 0;