From patchwork Tue May 31 20:33:27 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Per Forlin X-Patchwork-Id: 1689 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:54:25 -0000 Delivered-To: patches@linaro.org Received: by 10.52.110.9 with SMTP id hw9cs311765vdb; Tue, 31 May 2011 13:34:08 -0700 (PDT) Received: by 10.213.9.138 with SMTP id l10mr1483308ebl.5.1306874046816; Tue, 31 May 2011 13:34:06 -0700 (PDT) Received: from mail-ew0-f50.google.com (mail-ew0-f50.google.com [209.85.215.50]) by mx.google.com with ESMTPS id x46si1304180eea.8.2011.05.31.13.34.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 May 2011 13:34:06 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.50 is neither permitted nor denied by best guess record for domain of per.forlin@linaro.org) client-ip=209.85.215.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.215.50 is neither permitted nor denied by best guess record for domain of per.forlin@linaro.org) smtp.mail=per.forlin@linaro.org Received: by ewy10 with SMTP id 10so1955334ewy.37 for ; Tue, 31 May 2011 13:34:05 -0700 (PDT) Received: by 10.213.27.10 with SMTP id g10mr2603743ebc.135.1306874045152; Tue, 31 May 2011 13:34:05 -0700 (PDT) Received: from localhost.localdomain (c-3c7b71d5.029-82-6c756e10.cust.bredbandsbolaget.se [213.113.123.60]) by mx.google.com with ESMTPS id z1sm264420eeb.6.2011.05.31.13.34.03 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 May 2011 13:34:04 -0700 (PDT) From: Per Forlin To: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Pitre , linaro-dev@lists.linaro.org, Daniel Drake Cc: Chris Ball , Per Forlin Subject: [PATCH 1/2] sdio: add function to enable and disable sdio_single_irq optimization Date: Tue, 31 May 2011 22:33:27 +0200 Message-Id: <1306874008-28867-2-git-send-email-per.forlin@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1306874008-28867-1-git-send-email-per.forlin@linaro.org> References: <1306874008-28867-1-git-send-email-per.forlin@linaro.org> Make sdio single irq run time configurable, default is disable. This is due to an issue in libertas where the SDIO device seems to raise interrupt even if there are none function bits in CCCR_INTx set. This behaviour is not defined by the SDIO spec. Signed-off-by: Per Forlin --- drivers/mmc/core/sdio_irq.c | 17 ++++++++++++++++- include/linux/mmc/card.h | 1 + 2 files changed, 17 insertions(+), 1 deletions(-) diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c index 03ead02..2f81ddc 100644 --- a/drivers/mmc/core/sdio_irq.c +++ b/drivers/mmc/core/sdio_irq.c @@ -204,7 +204,8 @@ static void sdio_single_irq_set(struct mmc_card *card) int i; card->sdio_single_irq = NULL; - if ((card->host->caps & MMC_CAP_SDIO_IRQ) && + if (card->sdio_single_irq_en && + (card->host->caps & MMC_CAP_SDIO_IRQ) && card->host->sdio_irqs == 1) for (i = 0; i < card->sdio_funcs; i++) { func = card->sdio_func[i]; @@ -302,3 +303,17 @@ int sdio_release_irq(struct sdio_func *func) } EXPORT_SYMBOL_GPL(sdio_release_irq); +/** + * sdio_single_irq_enable - enable or disable SDIO single IRQ function + * @card: card to enable SDIO single irq + * @value: true to enable SDIO single irq function, false to disable + * + * If there is only 1 function interrupt registered and SDIO single IRQ + * is enable, the irq handler is called directly without reading + * the CCCR registers + */ +void sdio_single_irq_enable(struct mmc_card *card, bool value) +{ + card->sdio_single_irq_en = value; +} +EXPORT_SYMBOL_GPL(sdio_single_irq_enable); diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index 7b4fd7b..f8b0537 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -196,6 +196,7 @@ struct mmc_card { struct sdio_cis cis; /* common tuple info */ struct sdio_func *sdio_func[SDIO_MAX_FUNCS]; /* SDIO functions (devices) */ struct sdio_func *sdio_single_irq; /* SDIO function when only one IRQ active */ + bool sdio_single_irq_en; /* enable single irq */ unsigned num_info; /* number of info strings */ const char **info; /* info strings */ struct sdio_func_tuple *tuples; /* unknown common tuples */