From patchwork Tue May 3 20:51:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Per Forlin X-Patchwork-Id: 751662 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p43KplNi013332 for ; Tue, 3 May 2011 20:51:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755086Ab1ECUvr (ORCPT ); Tue, 3 May 2011 16:51:47 -0400 Received: from mail-ey0-f174.google.com ([209.85.215.174]:34599 "EHLO mail-ey0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754962Ab1ECUvq (ORCPT ); Tue, 3 May 2011 16:51:46 -0400 Received: by eyx24 with SMTP id 24so155733eyx.19 for ; Tue, 03 May 2011 13:51:45 -0700 (PDT) Received: by 10.213.108.195 with SMTP id g3mr1631798ebp.132.1304455904873; Tue, 03 May 2011 13:51:44 -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 y18sm328131eeh.1.2011.05.03.13.51.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 May 2011 13:51:44 -0700 (PDT) From: Per Forlin To: linux-mmc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-dev@lists.linaro.org Cc: Chris Ball , Stefan Nilsson XK , Per Forlin Subject: [PATCH resend] sdio: optimized SDIO IRQ handling for single function Date: Tue, 3 May 2011 22:51:21 +0200 Message-Id: <1304455881-10010-1-git-send-email-per.forlin@linaro.org> X-Mailer: git-send-email 1.7.4.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 03 May 2011 20:51:47 +0000 (UTC) From: Stefan Nilsson XK If there is only 1 function registered it is possible to improve performance by avoiding the overhead of reading the CCCR registers and directly call the function handler. Signed-off-by: Stefan Nilsson XK Signed-off-by: Per Forlin --- drivers/mmc/core/sdio_irq.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c index b300161..25291bf 100644 --- a/drivers/mmc/core/sdio_irq.c +++ b/drivers/mmc/core/sdio_irq.c @@ -32,6 +32,20 @@ static int process_sdio_pending_irqs(struct mmc_card *card) int i, ret, count; unsigned char pending; + /* + * If there is only 1 function registered + * call irq directly without checking the CCCR registers. + */ + if ((card->host->caps & MMC_CAP_SDIO_IRQ) && + card->host->sdio_irqs && (card->sdio_funcs == 1)) + for (i = 0; i < SDIO_MAX_FUNCS; i++) { + struct sdio_func *func = card->sdio_func[i]; + if (func && func->irq_handler) { + func->irq_handler(func); + return 1; + } + } + ret = mmc_io_rw_direct(card, 0, 0, SDIO_CCCR_INTx, 0, &pending); if (ret) { printk(KERN_DEBUG "%s: error %d reading SDIO_CCCR_INTx\n",