From patchwork Tue Jul 9 15:44:07 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremie Samuel X-Patchwork-Id: 2825336 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AD773C0AB2 for ; Tue, 9 Jul 2013 15:44:51 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 39D14201B5 for ; Tue, 9 Jul 2013 15:44:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AEA8820107 for ; Tue, 9 Jul 2013 15:44:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752051Ab3GIPoq (ORCPT ); Tue, 9 Jul 2013 11:44:46 -0400 Received: from co202.xi-lite.net ([149.6.83.202]:45918 "EHLO co202.xi-lite.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722Ab3GIPop (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 508EC168A7C; Tue, 9 Jul 2013 18:05:02 +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:39 +0100 From: Jeremie Samuel To: Chris Ball CC: , , , Jeremie Samuel , Anton Vorontsov Subject: [PATCH 3/8] sdhci: Use work structs instead of tasklets Date: Tue, 9 Jul 2013 17:44:07 +0200 Message-ID: <1373384652-21958-4-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 The driver can happily live without an atomic context and tasklets, so turn the tasklets into the work structs. Tasklets handlers still grab irqsave spinlocks, but 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 | 55 +++++++++++++++++++++------------------------ include/linux/mmc/sdhci.h | 4 ++-- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 06ad0bb..ab635d5 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -979,7 +979,7 @@ static void sdhci_finish_data(struct sdhci_host *host) sdhci_send_command(host, data->stop); } else - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); } static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) @@ -1008,7 +1008,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) "inhibit bit(s).\n", mmc_hostname(host->mmc)); sdhci_dumpregs(host); cmd->error = -EIO; - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); return; } timeout--; @@ -1029,7 +1029,7 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) pr_err("%s: Unsupported response type!\n", mmc_hostname(host->mmc)); cmd->error = -EINVAL; - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); return; } @@ -1090,7 +1090,7 @@ static void sdhci_finish_command(struct sdhci_host *host) sdhci_finish_data(host); if (!host->cmd->data) - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); host->cmd = NULL; } @@ -1374,7 +1374,7 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq) if (!present || host->flags & SDHCI_DEVICE_DEAD) { host->mrq->cmd->error = -ENOMEDIUM; - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); } else { u32 present_state; @@ -2081,7 +2081,7 @@ static void sdhci_card_event(struct mmc_host *mmc) sdhci_reset(host, SDHCI_RESET_DATA); host->mrq->cmd->error = -ENOMEDIUM; - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); } spin_unlock_irqrestore(&host->lock, flags); @@ -2106,29 +2106,30 @@ static const struct mmc_host_ops sdhci_ops = { * * \*****************************************************************************/ -static void sdhci_tasklet_card(unsigned long param) +static void sdhci_card_detect_work(struct work_struct *wk) { - struct sdhci_host *host = (struct sdhci_host*)param; + struct sdhci_host *host = container_of(wk, struct sdhci_host, + card_detect_work); sdhci_card_event(host->mmc); mmc_detect_change(host->mmc, msecs_to_jiffies(200)); } -static void sdhci_tasklet_finish(unsigned long param) +static void sdhci_finish_work(struct work_struct *wk) { struct sdhci_host *host; unsigned long flags; struct mmc_request *mrq; - host = (struct sdhci_host*)param; + host = container_of(wk, struct sdhci_host, finish_work); spin_lock_irqsave(&host->lock, flags); - /* - * If this tasklet gets rescheduled while running, it will - * be run again afterwards but without any active request. - */ + /* + * If this work gets rescheduled while running, it will + * be run again afterwards but without any active request. + */ if (!host->mrq) { spin_unlock_irqrestore(&host->lock, flags); return; @@ -2197,7 +2198,7 @@ static void sdhci_timeout_work(struct work_struct *wk) else host->mrq->cmd->error = -ETIMEDOUT; - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); } } @@ -2244,7 +2245,7 @@ static void sdhci_cmd_irq(struct sdhci_host *host, u32 intmask) host->cmd->error = -EILSEQ; if (host->cmd->error) { - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); return; } @@ -2453,7 +2454,7 @@ again: sdhci_writel(host, intmask & (SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE), SDHCI_INT_STATUS); intmask &= ~(SDHCI_INT_CARD_INSERT | SDHCI_INT_CARD_REMOVE); - tasklet_schedule(&host->card_tasklet); + schedule_work(&host->card_detect_work); } if (intmask & SDHCI_INT_CMD_MASK) { @@ -3197,12 +3198,10 @@ int sdhci_add_host(struct sdhci_host *host) mmc->max_blk_count = (host->quirks & SDHCI_QUIRK_NO_MULTIBLOCK) ? 1 : 65535; /* - * Init tasklets. + * Init work structs. */ - tasklet_init(&host->card_tasklet, - sdhci_tasklet_card, (unsigned long)host); - tasklet_init(&host->finish_tasklet, - sdhci_tasklet_finish, (unsigned long)host); + INIT_WORK(&host->card_detect_work, sdhci_card_detect_work); + INIT_WORK(&host->finish_work, sdhci_finish_work); INIT_DELAYED_WORK(&host->timeout_work, sdhci_timeout_work); @@ -3219,7 +3218,7 @@ int sdhci_add_host(struct sdhci_host *host) if (ret) { pr_err("%s: Failed to request IRQ %d: %d\n", mmc_hostname(mmc), host->irq, ret); - goto untasklet; + return ret; } sdhci_init(host, 0); @@ -3263,10 +3262,6 @@ reset: sdhci_mask_irqs(host, SDHCI_INT_ALL_MASK); free_irq(host->irq, host); #endif -untasklet: - tasklet_kill(&host->card_tasklet); - tasklet_kill(&host->finish_tasklet); - return ret; } @@ -3286,7 +3281,7 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) " transfer!\n", mmc_hostname(host->mmc)); host->mrq->cmd->error = -ENOMEDIUM; - tasklet_schedule(&host->finish_tasklet); + schedule_work(&host->finish_work); } spin_unlock_irqrestore(&host->lock, flags); @@ -3308,8 +3303,8 @@ void sdhci_remove_host(struct sdhci_host *host, int dead) flush_delayed_work(&host->timeout_work); - tasklet_kill(&host->card_tasklet); - tasklet_kill(&host->finish_tasklet); + flush_work(&host->card_detect_work); + flush_work(&host->finish_work); if (host->vmmc) { regulator_disable(host->vmmc); diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index 33efb73..0cc97ce 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -161,8 +161,8 @@ struct sdhci_host { dma_addr_t adma_addr; /* Mapped ADMA descr. table */ dma_addr_t align_addr; /* Mapped bounce buffer */ - struct tasklet_struct card_tasklet; /* Tasklet structures */ - struct tasklet_struct finish_tasklet; + struct work_struct card_detect_work; + struct work_struct finish_work; struct delayed_work timeout_work; /* Work for timeouts */