From patchwork Fri May 13 09:27:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludovic Desroches X-Patchwork-Id: 9089721 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 840B19F1C1 for ; Fri, 13 May 2016 09:26:55 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B26CE201CE for ; Fri, 13 May 2016 09:26:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CF57520145 for ; Fri, 13 May 2016 09:26:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752828AbcEMJ0i (ORCPT ); Fri, 13 May 2016 05:26:38 -0400 Received: from eusmtp01.atmel.com ([212.144.249.243]:8730 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752718AbcEMJ0g (ORCPT ); Fri, 13 May 2016 05:26:36 -0400 Received: from ibiza.corp.atmel.com (10.161.101.13) by eusmtp01.atmel.com (10.161.101.31) with Microsoft SMTP Server id 14.3.235.1; Fri, 13 May 2016 11:26:22 +0200 From: Ludovic Desroches To: , CC: , , , Ludovic Desroches Subject: [RESEND PATCH] mmc: sdhci: fix wakeup configuration Date: Fri, 13 May 2016 11:27:02 +0200 Message-ID: <1463131622-6380-1-git-send-email-ludovic.desroches@atmel.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 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. Signed-off-by: Ludovic Desroches --- Hi, I just updated sdhci_enable_irq_wakeups() not sdhci_disable_irq_wakeups() because I don't think it is necessary to configure SDHCI_INT_ENABLE at this step, it will be done with sdhci_init() or sdhci_enable_card_detection(). While I was writing this patch, several questions came to my mind: - Is the naming correct? wakeup signal is not an irq. 'enable_irq_wakeups' can be a bit confusing. - If we want to wakeup from irq, we may have to set SDHCI_INT_ENABLE and SDHCI_SIGNAL_ENABLE and not rely on a previous configuration, isn't it? Regards Ludovic drivers/mmc/host/sdhci.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index b284924..6fc69ed 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2638,18 +2638,28 @@ 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. + */ 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; + u8 wakeup_val; + u8 wakeup_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 ; + wakeup_val = sdhci_readb(host, SDHCI_WAKE_UP_CONTROL); + wakeup_val |= wakeup_mask; /* Avoid fake wake up */ - if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) - val &= ~(SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE); - sdhci_writeb(host, val, SDHCI_WAKE_UP_CONTROL); + if (host->quirks & SDHCI_QUIRK_BROKEN_CARD_DETECTION) { + wakeup_val &= ~(SDHCI_WAKE_ON_INSERT | SDHCI_WAKE_ON_REMOVE); + irq_val &= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE); + } + sdhci_writeb(host, wakeup_val, SDHCI_WAKE_UP_CONTROL); + sdhci_writel(host, irq_val, SDHCI_INT_ENABLE); } EXPORT_SYMBOL_GPL(sdhci_enable_irq_wakeups);