From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751756AbcETS3D (ORCPT ); Fri, 20 May 2016 14:29:03 -0400 Received: from mga03.intel.com ([134.134.136.65]:13797 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbcETS3A (ORCPT ); Fri, 20 May 2016 14:29:00 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.26,340,1459839600"; d="scan'208";a="981393900" Subject: Re: [PATCH v2] mmc: sdhci: fix wakeup configuration To: Ulf Hansson , Ludovic Desroches References: <1463145362-7773-1-git-send-email-ludovic.desroches@atmel.com> <573EF90B.7000109@intel.com> Cc: linux-mmc , "linux-kernel@vger.kernel.org" , Nicolas Ferre , Kevin Liu , Jialing Fu , Jisheng Zhang From: Adrian Hunter Message-ID: <573F5768.2070708@intel.com> Date: Fri, 20 May 2016 21:28:56 +0300 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. > > 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); >>> >>> >>