From patchwork Tue Jul 9 15:44:05 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremie Samuel X-Patchwork-Id: 2825338 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.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3A0E29F7D6 for ; Tue, 9 Jul 2013 15:44:54 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DD731201B5 for ; Tue, 9 Jul 2013 15:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F7AC201BB for ; Tue, 9 Jul 2013 15:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751653Ab3GIPor (ORCPT ); Tue, 9 Jul 2013 11:44:47 -0400 Received: from co202.xi-lite.net ([149.6.83.202]:45913 "EHLO co202.xi-lite.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751843Ab3GIPop (ORCPT ); Tue, 9 Jul 2013 11:44:45 -0400 Received: from ONYX.xi-lite.lan (unknown [193.34.35.244]) by co202.xi-lite.net (Postfix) with ESMTPS id A480C168A7A; Tue, 9 Jul 2013 18:05:01 +0200 (CEST) Received: from jerk.parrot.biz (46.218.109.88) by mail.xi-lite.com (193.34.32.105) with Microsoft SMTP Server (TLS) id 8.1.336.0; Tue, 9 Jul 2013 16:45:38 +0100 From: Jeremie Samuel To: Chris Ball CC: , , , Jeremie Samuel , Anton Vorontsov Subject: [PATCH 1/8] sdhci: Turn timeout timer into delayed work Date: Tue, 9 Jul 2013 17:44:05 +0200 Message-ID: <1373384652-21958-2-git-send-email-jeremie.samuel.ext@parrot.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1373384652-21958-1-git-send-email-jeremie.samuel.ext@parrot.com> References: <1373384652-21958-1-git-send-email-jeremie.samuel.ext@parrot.com> 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=-7.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 There is no need for the timeout handler to run in the atomic context, so this patch turns timeout timeout into the delayed work. Note that the timeout handler still grabs an irqsave spinlock, we'll deal with it in a separate patch. Patch based on http://thread.gmane.org/gmane.linux.kernel.mmc/2579. Signed-off-by: Anton Vorontsov Signed-off-by: Jeremie Samuel --- drivers/mmc/host/sdhci.c | 13 +++++++------ include/linux/mmc/sdhci.h | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index a78bd4f..3fede60 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -13,6 +13,7 @@ * - JMicron (hardware and technical support) */ +#include #include #include #include @@ -1014,7 +1015,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) mdelay(1); } - mod_timer(&host->timer, jiffies + 10 * HZ); + schedule_delayed_work(&host->timeout_work, 10 * HZ); host->cmd = cmd; @@ -2132,7 +2133,7 @@ static void sdhci_tasklet_finish(unsigned long param) return; } - del_timer(&host->timer); + cancel_delayed_work(&host->timeout_work); mrq = host->mrq; @@ -2172,12 +2173,12 @@ static void sdhci_tasklet_finish(unsigned long param) sdhci_runtime_pm_put(host); } -static void sdhci_timeout_timer(unsigned long data) +static void sdhci_timeout_work(struct work_struct *wk) { struct sdhci_host *host; unsigned long flags; - host = (struct sdhci_host*)data; + host = container_of(wk, struct sdhci_host, timeout_work.work); spin_lock_irqsave(&host->lock, flags); @@ -3202,7 +3203,7 @@ int sdhci_add_host(struct sdhci_host *host) tasklet_init(&host->finish_tasklet, sdhci_tasklet_finish, (unsigned long)host); - setup_timer(&host->timer, sdhci_timeout_timer, (unsigned long)host); + INIT_DELAYED_WORK(&host->timeout_work, sdhci_timeout_work); if (host->version >= SDHCI_SPEC_300) { init_waitqueue_head(&host->buf_ready_int); @@ -3305,7 +3306,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK); free_irq(host->irq, host); - del_timer_sync(&host->timer); + flush_delayed_work(&host->timeout_work); tasklet_kill(&host->card_tasklet); tasklet_kill(&host->finish_tasklet); diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index e3c6a74..30ed613 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -12,6 +12,7 @@ #define LINUX_MMC_SDHCI_H #include +#include #include #include #include @@ -163,7 +164,7 @@ struct sdhci_host { struct tasklet_struct card_tasklet; /* Tasklet structures */ struct tasklet_struct finish_tasklet; - struct timer_list timer; /* Timer for timeouts */ + struct delayed_work timeout_work; /* Work for timeouts */ u32 caps; /* Alternative CAPABILITY_0 */ u32 caps1; /* Alternative CAPABILITY_1 */