From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753863AbcEZMaW (ORCPT ); Thu, 26 May 2016 08:30:22 -0400 Received: from eusmtp01.atmel.com ([212.144.249.242]:5441 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753262AbcEZMaV (ORCPT ); Thu, 26 May 2016 08:30:21 -0400 Date: Thu, 26 May 2016 14:30:09 +0200 From: Ludovic Desroches To: Adrian Hunter CC: Ulf Hansson , Ludovic Desroches , linux-mmc , "linux-kernel@vger.kernel.org" , Nicolas Ferre , Kevin Liu , Jialing Fu , Jisheng Zhang Subject: Re: [PATCH v2] mmc: sdhci: fix wakeup configuration Message-ID: <20160526123009.GA6744@odux.rfo.atmel.com> Mail-Followup-To: Adrian Hunter , Ulf Hansson , linux-mmc , "linux-kernel@vger.kernel.org" , Nicolas Ferre , Kevin Liu , Jialing Fu , Jisheng Zhang References: <1463145362-7773-1-git-send-email-ludovic.desroches@atmel.com> <573EF90B.7000109@intel.com> <573F5768.2070708@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <573F5768.2070708@intel.com> User-Agent: Mutt/1.6.0 (2016-04-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, May 20, 2016 at 09:28:56PM +0300, Adrian Hunter wrote: > On 20/05/2016 4:39 p.m., Ulf Hansson wrote: > > On 20 May 2016 at 13:46, Adrian Hunter wrote: > > > On 13/05/16 16:16, Ludovic Desroches wrote: > > > > Activating wakeup event is not enough to get a wakeup signal. The > > > > corresponding events have to be enabled in the Interrupt Status Enable > > > > Register too. It follows the specification and is needed at least by > > > > sdhci-of-at91. > > > > > > > > Signed-off-by: Ludovic Desroches > > > > > > Acked-by: Adrian Hunter > > > > Is this material for stable and as a fix for 4.6? > > Not as far as I know. > System PM code for the Atmel SDHCI has not been submitted yet so no need to take it as a fix. Regards Ludovic > > > > Kind regards > > Uffe > > > > > > > > > > > > --- > > > > drivers/mmc/host/sdhci.c | 15 ++++++++++++++- > > > > 1 file changed, 14 insertions(+), 1 deletion(-) > > > > > > > > Changes: > > > > - v2: > > > > - update commit message and comments > > > > - do not rename val and mask variables > > > > > > > > diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c > > > > index e010ea4..e351859 100644 > > > > --- a/drivers/mmc/host/sdhci.c > > > > +++ b/drivers/mmc/host/sdhci.c > > > > @@ -2605,18 +2605,31 @@ static irqreturn_t sdhci_thread_irq(int irq, void *dev_id) > > > > \*****************************************************************************/ > > > > > > > > #ifdef CONFIG_PM > > > > +/* > > > > + * To enable wakeup events, the corresponding events have to be enabled in > > > > + * the Interrupt Status Enable register too. See 'Table 1-6: Wakeup Signal > > > > + * Table' in the SD Host Controller Standard Specification. > > > > + * It is useless to restore SDHCI_INT_ENABLE state in > > > > + * sdhci_disable_irq_wakeups() since it will be set by > > > > + * sdhci_enable_card_detection() or sdhci_init(). > > > > + */ > > > > void sdhci_enable_irq_wakeups(struct sdhci_host *host) > > > > { > > > > u8 val; > > > > u8 mask = SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE > > > > | SDHCI_WAKE_ON_INT; > > > > + u32 irq_val = SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE | > > > > + SDHCI_INT_CARD_INT; > > > > > > > > val = sdhci_readb(host, SDHCI_WAKE_UP_CONTROL); > > > > val |= mask ; > > > > /* Avoid fake wake up */ > > > > - if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) > > > > + if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) { > > > > val &= ~(SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE); > > > > + irq_val &= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE); > > > > + } > > > > sdhci_writeb(host, val, SDHCI_WAKE_UP_CONTROL); > > > > + sdhci_writel(host, irq_val, SDHCI_INT_ENABLE); > > > > } > > > > EXPORT_SYMBOL_GPL(sdhci_enable_irq_wakeups); > > > > > > > > > > >