From patchwork Tue Jul 9 23:19:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doug Anderson X-Patchwork-Id: 2825476 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6544C9F9CF for ; Tue, 9 Jul 2013 23:20:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6386A20121 for ; Tue, 9 Jul 2013 23:20:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D2842013A for ; Tue, 9 Jul 2013 23:20:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754022Ab3GIXUl (ORCPT ); Tue, 9 Jul 2013 19:20:41 -0400 Received: from mail-gg0-f201.google.com ([209.85.161.201]:44736 "EHLO mail-gg0-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753541Ab3GIXTa (ORCPT ); Tue, 9 Jul 2013 19:19:30 -0400 Received: by mail-gg0-f201.google.com with SMTP id 21so553772ggh.0 for ; Tue, 09 Jul 2013 16:19:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=2/9k1/GllpQW7AvWPbUoyTYYqKLS5QzIAO03RvkI/iY=; b=aynRRJSiSTW/r76jozBE9NCteXWUpLBPKa1iWiJzKk3156uhJfhjdlf3PNRsLjjbGt CMjAqDTZPOxaKEN/8V2u2MKhSJ/h15ujO4Ln5iG6e8NnteT8skIStUTVhj7tF3Fa/MBD yzIObYVgeCJ7VZOVhnBdXS5c2gPDzaR/gtSMHioA8CJtpHsdYvbpM9VYwMXVziV3lrxD UqLGrWwg/9ren+Vxgxo7B+wv+Yk+lv8HfAZjBPiLvNBHChsV08gI6DEbStjeGVgkSt/9 R418i5D9I3n7ocrvm2dfzfYeL25ngN/QtVsHEnqEibSwUBDbB7QEdk/8z1tFuETdFCHE CKdA== X-Received: by 10.236.194.33 with SMTP id l21mr15328662yhn.42.1373411968916; Tue, 09 Jul 2013 16:19:28 -0700 (PDT) Received: from corp2gmr1-1.hot.corp.google.com (corp2gmr1-1.hot.corp.google.com [172.24.189.92]) by gmr-mx.google.com with ESMTPS id o24si198758yhm.1.2013.07.09.16.19.28 for (version=TLSv1.1 cipher=AES128-SHA bits=128/128); Tue, 09 Jul 2013 16:19:28 -0700 (PDT) Received: from tictac.mtv.corp.google.com (tictac.mtv.corp.google.com [172.22.162.34]) by corp2gmr1-1.hot.corp.google.com (Postfix) with ESMTP id A624E31C1BF; Tue, 9 Jul 2013 16:19:28 -0700 (PDT) Received: by tictac.mtv.corp.google.com (Postfix, from userid 121310) id 5822580980; Tue, 9 Jul 2013 16:19:28 -0700 (PDT) From: Doug Anderson To: Chris Ball Cc: Olof Johansson , Jaehoon Chung , Seungwon Jeon , James Hogan , Grant Grundler , Alim Akhtar , Abhilash Kesavan , Tomasz Figa , Doug Anderson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] mmc: dw_mmc: Add suspend_noirq/resume_noirq callbacks for dw_mmc-pltfm Date: Tue, 9 Jul 2013 16:19:18 -0700 Message-Id: <1373411961-23812-3-git-send-email-dianders@chromium.org> X-Mailer: git-send-email 1.8.3 In-Reply-To: <1373411961-23812-1-git-send-email-dianders@chromium.org> References: <1373391071-6312-1-git-send-email-dianders@chromium.org> <1373411961-23812-1-git-send-email-dianders@chromium.org> X-Gm-Message-State: ALoCoQlX/Dj3o5rkNpr7NMLF9hTRanTUhN8ZYrqBEO9JQCJrwXYMXoa5NyfHB9b5qBxTIEfjtogBd4OWuUUU+wkPWoQI3sbRfoi1AdDzUBoyFhw5izK23a/F3HHNV85Ce3cFqmbeTC1dMQ8Y+Q+T0qWdFHlTwtOvRoMKl2QwT9vpfaKGmtGtRtTHU/HTWCPYPpBM4tpXTEikmEKsAeq4Ra4dMuECxzb1Xg== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On some devices (like exynos5420) the dw_mmc controller may be in a strange state after we wake up from sleep. Add callbacks to allow for dealing with these quirks. We use the "_noirq" versions of the callbacks since in the case of exynos5420 the strange state caused interrupts to fire so we need to deal with it while interrupts are still off. At the moment this support is only added to dw_mmc-pltfm which calls straight to the callback, since nobody but exynos needs it. We can add some levels of indirection (a call into the generic dw_mmc code) when someone finds a need. Signed-off-by: Doug Anderson Reviewed-by: James Hogan --- Changes in v2: - Use suspend_noirq as per James Hogan. drivers/mmc/host/dw_mmc-pltfm.c | 37 ++++++++++++++++++++++++++++++++++--- drivers/mmc/host/dw_mmc.h | 4 ++++ 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c index 41c27b7..220568c 100644 --- a/drivers/mmc/host/dw_mmc-pltfm.c +++ b/drivers/mmc/host/dw_mmc-pltfm.c @@ -105,12 +105,43 @@ static int dw_mci_pltfm_resume(struct device *dev) return 0; } + +static int dw_mci_pltfm_suspend_noirq(struct device *dev) +{ + struct dw_mci *host = dev_get_drvdata(dev); + const struct dw_mci_drv_data *drv_data = host->drv_data; + + if (drv_data && drv_data->suspend_noirq) + return drv_data->suspend_noirq(host); + + return 0; +} + +static int dw_mci_pltfm_resume_noirq(struct device *dev) +{ + struct dw_mci *host = dev_get_drvdata(dev); + const struct dw_mci_drv_data *drv_data = host->drv_data; + + if (drv_data && drv_data->resume_noirq) + return drv_data->resume_noirq(host); + + return 0; +} + + #else -#define dw_mci_pltfm_suspend NULL -#define dw_mci_pltfm_resume NULL +#define dw_mci_pltfm_suspend NULL +#define dw_mci_pltfm_resume NULL +#define dw_mci_pltfm_suspend_noirq NULL +#define dw_mci_pltfm_resume_noirq NULL #endif /* CONFIG_PM_SLEEP */ -SIMPLE_DEV_PM_OPS(dw_mci_pltfm_pmops, dw_mci_pltfm_suspend, dw_mci_pltfm_resume); +const struct dev_pm_ops dw_mci_pltfm_pmops = { + SET_SYSTEM_SLEEP_PM_OPS(dw_mci_pltfm_suspend, dw_mci_pltfm_resume) + .suspend_noirq = dw_mci_pltfm_suspend_noirq, + .resume_noirq = dw_mci_pltfm_resume_noirq, +}; + EXPORT_SYMBOL_GPL(dw_mci_pltfm_pmops); static const struct of_device_id dw_mci_pltfm_match[] = { diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h index 0b74189..5d0398f 100644 --- a/drivers/mmc/host/dw_mmc.h +++ b/drivers/mmc/host/dw_mmc.h @@ -190,6 +190,8 @@ extern int dw_mci_resume(struct dw_mci *host); * @prepare_command: handle CMD register extensions. * @set_ios: handle bus specific extensions. * @parse_dt: parse implementation specific device tree properties. + * @suspend_noirq: called late in the suspend process + * @resume_noirq: called early in the resume process * * Provide controller implementation specific extensions. The usage of this * data structure is fully optional and usage of each member in this structure @@ -202,5 +204,7 @@ struct dw_mci_drv_data { void (*prepare_command)(struct dw_mci *host, u32 *cmdr); void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios); int (*parse_dt)(struct dw_mci *host); + int (*suspend_noirq)(struct dw_mci *host); + int (*resume_noirq)(struct dw_mci *host); }; #endif /* _DW_MMC_H_ */