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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 8F126C2D0E4 for ; Mon, 23 Nov 2020 16:07:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 359482076E for ; Mon, 23 Nov 2020 16:07:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Cd9H8Fy/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389880AbgKWQHd (ORCPT ); Mon, 23 Nov 2020 11:07:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730059AbgKWQHc (ORCPT ); Mon, 23 Nov 2020 11:07:32 -0500 Received: from mail-vk1-xa42.google.com (mail-vk1-xa42.google.com [IPv6:2607:f8b0:4864:20::a42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99F22C0613CF for ; Mon, 23 Nov 2020 08:07:32 -0800 (PST) Received: by mail-vk1-xa42.google.com with SMTP id s135so4065521vkh.6 for ; Mon, 23 Nov 2020 08:07:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=UNsop+cjEneyR6Ql2hsZCZcsflP0cbZhcL6E3kTgIJE=; b=Cd9H8Fy/EEy2EVXyMtJdIYyP/IYtfyQfGwJCqk0fyc4pG+Ri//S5+3ZvYM5glp1ZJ4 ZVpOc3/9mHF17iULTB1oum8mS8BTwOcqNPsBrBr5KOopK58JAPYG3ZtH5Cfh7EM02SfW u8v9dh/qskdFaQxe+oZy5GeJzKFJOVzMzvIpfXw6+2isPqbRi+/GT7kpplRCoBpQNKEh vluYENBYiw7UwIlqIKR8In3xPatHHeYpCB/CRhdg1R6sNQrRsUOftWmJzz2bxj5PDcHV edfTUtm9iAr2BidHf1KMyEU4zK35Rhw7pNGjat+i42krW9SDkcKf9jtgwNbyEGOwpVU7 8vZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UNsop+cjEneyR6Ql2hsZCZcsflP0cbZhcL6E3kTgIJE=; b=VANTpZ5I2JPY4UlPOEiXq3wCqMjFspszv7+LcJEbtNRMARs91Wurb4jYK/XvCyRxUy qmy+/iQ6ea9tqycJRx46Nk+pR9zj1cFls8I7OF4KyGhTjP491WKvXeT0hCUVu8lH+cuy p1XqfqiabZTuZTR6G88Y5RAua4SqBj4wDIywvAkamF66hoD95YgjaHdUSsFdQULiZuN9 mn2MTFs7Mq6nmKJ2/yu29FvD87medH2G9j+cit7qS7W3NPq7RgHWm9e5WGXaXRU34Og8 I37hIyNGh7n0Pt60FNbxrbtqbvJO/xUMiWFjgCWu6AL7pYIOvRIEWj709r4P7LzJX2d4 ZO1g== X-Gm-Message-State: AOAM532F3rFrdF0JMoh+OeOlIIbQZzzb5aCdKKUVkI4E0b9UGNWk9T2H TPhvjYGESK9xdS4hwhOonvojsGIXNeIXNqBImX6BBQ== X-Google-Smtp-Source: ABdhPJyOs8N3MeZsp7FriWdMaHZTpzFrInprCKZugi76ui1r4JwfNeV5VLB6ZZQVRdgjqtC5UIQahxENrMD8YMjwo74= X-Received: by 2002:a1f:9889:: with SMTP id a131mr456205vke.15.1606147650704; Mon, 23 Nov 2020 08:07:30 -0800 (PST) MIME-Version: 1.0 References: <20201118063405.24906-1-wenbin.mei@mediatek.com> In-Reply-To: <20201118063405.24906-1-wenbin.mei@mediatek.com> From: Ulf Hansson Date: Mon, 23 Nov 2020 17:06:53 +0100 Message-ID: Subject: Re: [PATCH] mmc: mediatek: Add system suspend/resume interface To: Wenbin Mei Cc: Chaotian Jing , Matthias Brugger , "linux-mmc@vger.kernel.org" , Linux ARM , "moderated list:ARM/Mediatek SoC support" , Linux Kernel Mailing List , srv_heupstream Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 18 Nov 2020 at 07:34, Wenbin Mei wrote: > > Before we got these errors on MT8192 platform: > [ 59.153891] Restarting tasks ... > [ 59.154540] done. > [ 59.159175] PM: suspend exit > [ 59.218724] mtk-msdc 11f60000.mmc: phase: [map:fffffffe] [maxlen:31] > [final:16] > [ 119.776083] mmc0: cqhci: timeout for tag 9 > [ 119.780196] mmc0: cqhci: ============ CQHCI REGISTER DUMP =========== > [ 119.786709] mmc0: cqhci: Caps: 0x100020b6 | Version: 0x00000510 > [ 119.793225] mmc0: cqhci: Config: 0x00000101 | Control: 0x00000000 > [ 119.799706] mmc0: cqhci: Int stat: 0x00000000 | Int enab: 0x00000000 > [ 119.806177] mmc0: cqhci: Int sig: 0x00000000 | Int Coal: 0x00000000 > [ 119.812670] mmc0: cqhci: TDL base: 0x00000000 | TDL up32: 0x00000000 > [ 119.819149] mmc0: cqhci: Doorbell: 0x003ffc00 | TCN: 0x00000200 > [ 119.825656] mmc0: cqhci: Dev queue: 0x00000000 | Dev Pend: 0x00000000 > [ 119.832155] mmc0: cqhci: Task clr: 0x00000000 | SSC1: 0x00001000 > [ 119.838627] mmc0: cqhci: SSC2: 0x00000000 | DCMD rsp: 0x00000000 > [ 119.845174] mmc0: cqhci: RED mask: 0xfdf9a080 | TERRI: 0x0000891c > [ 119.851654] mmc0: cqhci: Resp idx: 0x00000000 | Resp arg: 0x00000000 > [ 119.865773] mmc0: cqhci: : =========================================== > [ 119.872358] mmc0: running CQE recovery > From these logs, we found TDL base was back to the default value. > > After suspend, the mmc host is powered off by HW, and bring CQE register > to the default value, so we add system suspend/resume interface, then bring > CQE to deactivated state before suspend, it will be enabled by CQE first > request after resume. > > Signed-off-by: Wenbin Mei I took the liberty of renaming msdc_sys_suspend|resume to msdc_suspend|resume, as I think the "_sys" is a bit superfluous. Additionally, I added a fixes+stable tag, then I applied this for fixes, thanks! Please tell me, if there is anything you would like me to change. Kind regards Uffe > --- > drivers/mmc/host/mtk-sd.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index fc5ee5df91ad..c5f9cd6fc951 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -2758,11 +2758,29 @@ static int msdc_runtime_resume(struct device *dev) > msdc_restore_reg(host); > return 0; > } > + > +static int msdc_sys_suspend(struct device *dev) > +{ > + struct mmc_host *mmc = dev_get_drvdata(dev); > + int ret; > + > + if (mmc->caps2 & MMC_CAP2_CQE) { > + ret = cqhci_suspend(mmc); > + if (ret) > + return ret; > + } > + > + return pm_runtime_force_suspend(dev); > +} > + > +static int msdc_sys_resume(struct device *dev) > +{ > + return pm_runtime_force_resume(dev); > +} > #endif > > static const struct dev_pm_ops msdc_dev_pm_ops = { > - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, > - pm_runtime_force_resume) > + SET_SYSTEM_SLEEP_PM_OPS(msdc_sys_suspend, msdc_sys_resume) > SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, NULL) > }; > > -- > 2.18.0 > 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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 D8345C2D0E4 for ; Mon, 23 Nov 2020 16:07:46 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 429C82080A for ; Mon, 23 Nov 2020 16:07:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HGDXTxRd"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Cd9H8Fy/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 429C82080A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=WNlEn7f+9OyPtcMssItrH+2lhONNU0VdPxHP7SMU8uo=; b=HGDXTxRdUxEK8LCevjTqip25+ Y0IGcprDt2yRh1TXdt02UTcF/GnTIyqNkvVMs+T+xYM+oywgAyfdOBpk5vuCQSIE4/5nuOvi3wBCY FKN9bp4j+SZ+ae0+3kMauqtM1ecCcmVxB02C0fY0gyE7uZn91oLTKnvzUKW6IWwUWSsiNtRDTADY6 DX3gUZVSacteH5xiuliuQaJc8fqCx5u6kgLVZt95UprkEplpfaBqoMqaytOwOoEbv9ixJeoGaLr0p gDRm/o3O23dMVqwjWcGVG19jrohTtJVrj8rBMS1M48Jqc8Ski48Jvo+KNc3TnO+eYhzmJQjOf0Hlc 9PV3jW3LQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khENM-0003FB-Uo; Mon, 23 Nov 2020 16:07:36 +0000 Received: from mail-vk1-xa41.google.com ([2607:f8b0:4864:20::a41]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khENJ-0003E4-RX for linux-mediatek@lists.infradead.org; Mon, 23 Nov 2020 16:07:35 +0000 Received: by mail-vk1-xa41.google.com with SMTP id b190so4064985vka.0 for ; Mon, 23 Nov 2020 08:07:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=UNsop+cjEneyR6Ql2hsZCZcsflP0cbZhcL6E3kTgIJE=; b=Cd9H8Fy/EEy2EVXyMtJdIYyP/IYtfyQfGwJCqk0fyc4pG+Ri//S5+3ZvYM5glp1ZJ4 ZVpOc3/9mHF17iULTB1oum8mS8BTwOcqNPsBrBr5KOopK58JAPYG3ZtH5Cfh7EM02SfW u8v9dh/qskdFaQxe+oZy5GeJzKFJOVzMzvIpfXw6+2isPqbRi+/GT7kpplRCoBpQNKEh vluYENBYiw7UwIlqIKR8In3xPatHHeYpCB/CRhdg1R6sNQrRsUOftWmJzz2bxj5PDcHV edfTUtm9iAr2BidHf1KMyEU4zK35Rhw7pNGjat+i42krW9SDkcKf9jtgwNbyEGOwpVU7 8vZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UNsop+cjEneyR6Ql2hsZCZcsflP0cbZhcL6E3kTgIJE=; b=jkHrRzAGtEAZtxvwOWY+tKxekcU/TnzUuNN46KLSNWCi3Y7iliUEuYGQzNrwJNcInr kxjf8vx4NwY6A6qiIzfV8VMKIn0NRrrh7HEwEZhcHqzXBeFmxGG4IpdBud/b0Va1nTk0 G00XCAz5AoWgDPh5Yhu3syvablxPj60P2uzhVhvCcUlrpgjRQMkLg3YabM6N3clMAZFx GcgsVPU0++qCS6Z+jb9soByuKqnMpD/X9J553RIEtCCsqaYJhGiLv30LS6vVFuHt9RSB HEJJHYHkaLHwhSJaTlaIUUtzkulGbjVMIFeUHQpDxbdfSnGQhbRsY0338zogcLU6E6Tu GEXA== X-Gm-Message-State: AOAM532QmdpXkHhbiHNtdg0b6x+I1h195TNrptz1Z0W/DqmfyVteVW/V 7yYpEd0DJQjueNPkRioSBHaH5XA1LYsXntQTNijFyw== X-Google-Smtp-Source: ABdhPJyOs8N3MeZsp7FriWdMaHZTpzFrInprCKZugi76ui1r4JwfNeV5VLB6ZZQVRdgjqtC5UIQahxENrMD8YMjwo74= X-Received: by 2002:a1f:9889:: with SMTP id a131mr456205vke.15.1606147650704; Mon, 23 Nov 2020 08:07:30 -0800 (PST) MIME-Version: 1.0 References: <20201118063405.24906-1-wenbin.mei@mediatek.com> In-Reply-To: <20201118063405.24906-1-wenbin.mei@mediatek.com> From: Ulf Hansson Date: Mon, 23 Nov 2020 17:06:53 +0100 Message-ID: Subject: Re: [PATCH] mmc: mediatek: Add system suspend/resume interface To: Wenbin Mei X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201123_110734_307365_4C8B7A7F X-CRM114-Status: GOOD ( 22.84 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: srv_heupstream , "linux-mmc@vger.kernel.org" , Linux Kernel Mailing List , "moderated list:ARM/Mediatek SoC support" , Chaotian Jing , Matthias Brugger , Linux ARM 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 On Wed, 18 Nov 2020 at 07:34, Wenbin Mei wrote: > > Before we got these errors on MT8192 platform: > [ 59.153891] Restarting tasks ... > [ 59.154540] done. > [ 59.159175] PM: suspend exit > [ 59.218724] mtk-msdc 11f60000.mmc: phase: [map:fffffffe] [maxlen:31] > [final:16] > [ 119.776083] mmc0: cqhci: timeout for tag 9 > [ 119.780196] mmc0: cqhci: ============ CQHCI REGISTER DUMP =========== > [ 119.786709] mmc0: cqhci: Caps: 0x100020b6 | Version: 0x00000510 > [ 119.793225] mmc0: cqhci: Config: 0x00000101 | Control: 0x00000000 > [ 119.799706] mmc0: cqhci: Int stat: 0x00000000 | Int enab: 0x00000000 > [ 119.806177] mmc0: cqhci: Int sig: 0x00000000 | Int Coal: 0x00000000 > [ 119.812670] mmc0: cqhci: TDL base: 0x00000000 | TDL up32: 0x00000000 > [ 119.819149] mmc0: cqhci: Doorbell: 0x003ffc00 | TCN: 0x00000200 > [ 119.825656] mmc0: cqhci: Dev queue: 0x00000000 | Dev Pend: 0x00000000 > [ 119.832155] mmc0: cqhci: Task clr: 0x00000000 | SSC1: 0x00001000 > [ 119.838627] mmc0: cqhci: SSC2: 0x00000000 | DCMD rsp: 0x00000000 > [ 119.845174] mmc0: cqhci: RED mask: 0xfdf9a080 | TERRI: 0x0000891c > [ 119.851654] mmc0: cqhci: Resp idx: 0x00000000 | Resp arg: 0x00000000 > [ 119.865773] mmc0: cqhci: : =========================================== > [ 119.872358] mmc0: running CQE recovery > From these logs, we found TDL base was back to the default value. > > After suspend, the mmc host is powered off by HW, and bring CQE register > to the default value, so we add system suspend/resume interface, then bring > CQE to deactivated state before suspend, it will be enabled by CQE first > request after resume. > > Signed-off-by: Wenbin Mei I took the liberty of renaming msdc_sys_suspend|resume to msdc_suspend|resume, as I think the "_sys" is a bit superfluous. Additionally, I added a fixes+stable tag, then I applied this for fixes, thanks! Please tell me, if there is anything you would like me to change. Kind regards Uffe > --- > drivers/mmc/host/mtk-sd.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index fc5ee5df91ad..c5f9cd6fc951 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -2758,11 +2758,29 @@ static int msdc_runtime_resume(struct device *dev) > msdc_restore_reg(host); > return 0; > } > + > +static int msdc_sys_suspend(struct device *dev) > +{ > + struct mmc_host *mmc = dev_get_drvdata(dev); > + int ret; > + > + if (mmc->caps2 & MMC_CAP2_CQE) { > + ret = cqhci_suspend(mmc); > + if (ret) > + return ret; > + } > + > + return pm_runtime_force_suspend(dev); > +} > + > +static int msdc_sys_resume(struct device *dev) > +{ > + return pm_runtime_force_resume(dev); > +} > #endif > > static const struct dev_pm_ops msdc_dev_pm_ops = { > - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, > - pm_runtime_force_resume) > + SET_SYSTEM_SLEEP_PM_OPS(msdc_sys_suspend, msdc_sys_resume) > SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, NULL) > }; > > -- > 2.18.0 > _______________________________________________ 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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 83F79C56202 for ; Mon, 23 Nov 2020 16:08:21 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 229C92076E for ; Mon, 23 Nov 2020 16:08:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="xUVw7Zb/"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Cd9H8Fy/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 229C92076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=LJ2ORf+FQ3jSEgzSE8NdBlNH/cYSUG/ulztM6t+Yuuo=; b=xUVw7Zb/urT7/cr5PT1aPtiw6 DwR7lS8NpeV3h5sZ4MeCSva8nMUDZhB/OFFeiJke4Hk2E2WG9os2YzJBnQgoEUl/np4yH8pCRnXrC k0s3LtY1el/Hd2ppWfaADHBcdLg5HcVkWzO9lp45xKOm1ug/OctVca4ADh6+QsH2g+GYrvGxpvNWD kK1VyL9wAWGpWeDhMwJKoqunW/Pq0O7fcVGsFeGf8Ggyn6tYtogR55X+aFY/1+mPpFigaaqIA/mGP BxJLU1S3+kyljqIlAAdFt68YjCByvAm+piTEJBsrdh36+H5P9cdmv2liNZppEnlhbwGCa5Mza3grG 1dMZEGISg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1khENO-0003FK-3S; Mon, 23 Nov 2020 16:07:38 +0000 Received: from mail-vk1-xa41.google.com ([2607:f8b0:4864:20::a41]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1khENJ-0003E3-RV for linux-arm-kernel@lists.infradead.org; Mon, 23 Nov 2020 16:07:35 +0000 Received: by mail-vk1-xa41.google.com with SMTP id v5so4052784vkn.12 for ; Mon, 23 Nov 2020 08:07:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=UNsop+cjEneyR6Ql2hsZCZcsflP0cbZhcL6E3kTgIJE=; b=Cd9H8Fy/EEy2EVXyMtJdIYyP/IYtfyQfGwJCqk0fyc4pG+Ri//S5+3ZvYM5glp1ZJ4 ZVpOc3/9mHF17iULTB1oum8mS8BTwOcqNPsBrBr5KOopK58JAPYG3ZtH5Cfh7EM02SfW u8v9dh/qskdFaQxe+oZy5GeJzKFJOVzMzvIpfXw6+2isPqbRi+/GT7kpplRCoBpQNKEh vluYENBYiw7UwIlqIKR8In3xPatHHeYpCB/CRhdg1R6sNQrRsUOftWmJzz2bxj5PDcHV edfTUtm9iAr2BidHf1KMyEU4zK35Rhw7pNGjat+i42krW9SDkcKf9jtgwNbyEGOwpVU7 8vZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UNsop+cjEneyR6Ql2hsZCZcsflP0cbZhcL6E3kTgIJE=; b=Bk3B5lMyxr0L4pk5lSG5k8YU+lasmmYIjQnvEJKHrg1DUCzlUZX45P1uWq/Vf0q1Mi GtIK0PBrEU+DwT2x9mZAhmgokx0DnoXwtlLcvMKj4sbCzVRoz/fdR4dNjmnr/UAlvBSb o2zaXfaOSnYgWxT0yqjCvATL69AX04JYiurxxj+wyK/Tm5DVArLkgT43wvxWCP3ZcMHQ 7rnqTQTJNdjSJ8gYuWDbS9OqozT7Eevg8zwarAqBpK3eEQ0T6cc0Vlx8RL13rqVWxgh7 WE5rakBB5YmSMsFNqdoD7MFv13rLcs8f0USASWnOMsi3AB64+u9uNQsfC0bq9EyC6oL2 PCYg== X-Gm-Message-State: AOAM532nGEll04MS4dh32/7kUebOGvZyBcNryBragm9yrfNsfwYMw6ll r1Mzylm6B5BCeAvaNHMfrCRHlmBr9xxWRZ1VZ/Hv3A== X-Google-Smtp-Source: ABdhPJyOs8N3MeZsp7FriWdMaHZTpzFrInprCKZugi76ui1r4JwfNeV5VLB6ZZQVRdgjqtC5UIQahxENrMD8YMjwo74= X-Received: by 2002:a1f:9889:: with SMTP id a131mr456205vke.15.1606147650704; Mon, 23 Nov 2020 08:07:30 -0800 (PST) MIME-Version: 1.0 References: <20201118063405.24906-1-wenbin.mei@mediatek.com> In-Reply-To: <20201118063405.24906-1-wenbin.mei@mediatek.com> From: Ulf Hansson Date: Mon, 23 Nov 2020 17:06:53 +0100 Message-ID: Subject: Re: [PATCH] mmc: mediatek: Add system suspend/resume interface To: Wenbin Mei X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201123_110734_306944_6709AD82 X-CRM114-Status: GOOD ( 24.34 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: srv_heupstream , "linux-mmc@vger.kernel.org" , Linux Kernel Mailing List , "moderated list:ARM/Mediatek SoC support" , Chaotian Jing , Matthias Brugger , Linux ARM 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 On Wed, 18 Nov 2020 at 07:34, Wenbin Mei wrote: > > Before we got these errors on MT8192 platform: > [ 59.153891] Restarting tasks ... > [ 59.154540] done. > [ 59.159175] PM: suspend exit > [ 59.218724] mtk-msdc 11f60000.mmc: phase: [map:fffffffe] [maxlen:31] > [final:16] > [ 119.776083] mmc0: cqhci: timeout for tag 9 > [ 119.780196] mmc0: cqhci: ============ CQHCI REGISTER DUMP =========== > [ 119.786709] mmc0: cqhci: Caps: 0x100020b6 | Version: 0x00000510 > [ 119.793225] mmc0: cqhci: Config: 0x00000101 | Control: 0x00000000 > [ 119.799706] mmc0: cqhci: Int stat: 0x00000000 | Int enab: 0x00000000 > [ 119.806177] mmc0: cqhci: Int sig: 0x00000000 | Int Coal: 0x00000000 > [ 119.812670] mmc0: cqhci: TDL base: 0x00000000 | TDL up32: 0x00000000 > [ 119.819149] mmc0: cqhci: Doorbell: 0x003ffc00 | TCN: 0x00000200 > [ 119.825656] mmc0: cqhci: Dev queue: 0x00000000 | Dev Pend: 0x00000000 > [ 119.832155] mmc0: cqhci: Task clr: 0x00000000 | SSC1: 0x00001000 > [ 119.838627] mmc0: cqhci: SSC2: 0x00000000 | DCMD rsp: 0x00000000 > [ 119.845174] mmc0: cqhci: RED mask: 0xfdf9a080 | TERRI: 0x0000891c > [ 119.851654] mmc0: cqhci: Resp idx: 0x00000000 | Resp arg: 0x00000000 > [ 119.865773] mmc0: cqhci: : =========================================== > [ 119.872358] mmc0: running CQE recovery > From these logs, we found TDL base was back to the default value. > > After suspend, the mmc host is powered off by HW, and bring CQE register > to the default value, so we add system suspend/resume interface, then bring > CQE to deactivated state before suspend, it will be enabled by CQE first > request after resume. > > Signed-off-by: Wenbin Mei I took the liberty of renaming msdc_sys_suspend|resume to msdc_suspend|resume, as I think the "_sys" is a bit superfluous. Additionally, I added a fixes+stable tag, then I applied this for fixes, thanks! Please tell me, if there is anything you would like me to change. Kind regards Uffe > --- > drivers/mmc/host/mtk-sd.c | 22 ++++++++++++++++++++-- > 1 file changed, 20 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c > index fc5ee5df91ad..c5f9cd6fc951 100644 > --- a/drivers/mmc/host/mtk-sd.c > +++ b/drivers/mmc/host/mtk-sd.c > @@ -2758,11 +2758,29 @@ static int msdc_runtime_resume(struct device *dev) > msdc_restore_reg(host); > return 0; > } > + > +static int msdc_sys_suspend(struct device *dev) > +{ > + struct mmc_host *mmc = dev_get_drvdata(dev); > + int ret; > + > + if (mmc->caps2 & MMC_CAP2_CQE) { > + ret = cqhci_suspend(mmc); > + if (ret) > + return ret; > + } > + > + return pm_runtime_force_suspend(dev); > +} > + > +static int msdc_sys_resume(struct device *dev) > +{ > + return pm_runtime_force_resume(dev); > +} > #endif > > static const struct dev_pm_ops msdc_dev_pm_ops = { > - SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, > - pm_runtime_force_resume) > + SET_SYSTEM_SLEEP_PM_OPS(msdc_sys_suspend, msdc_sys_resume) > SET_RUNTIME_PM_OPS(msdc_runtime_suspend, msdc_runtime_resume, NULL) > }; > > -- > 2.18.0 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel