From patchwork Thu May 11 12:39:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 9721365 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0C319601E7 for ; Thu, 11 May 2017 12:39:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 015172865D for ; Thu, 11 May 2017 12:39:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E992028663; Thu, 11 May 2017 12:39:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 943E12865D for ; Thu, 11 May 2017 12:39:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932729AbdEKMjK (ORCPT ); Thu, 11 May 2017 08:39:10 -0400 Received: from mail-wr0-f178.google.com ([209.85.128.178]:34109 "EHLO mail-wr0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932708AbdEKMjI (ORCPT ); Thu, 11 May 2017 08:39:08 -0400 Received: by mail-wr0-f178.google.com with SMTP id l9so19527175wre.1 for ; Thu, 11 May 2017 05:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zkIisz2tZpoFASbESPqFCPM3gTo3CNsg17xHRg84wY4=; b=dbNPTAYIN1c/MZvXBK74lJ3xOY5cnwLc89MIkrz+ySYe7R6CIAShkew+oyrA5PHgyn Csw1hDHDrtKBsiW/YfvK7TWpfCb1/NGW3C733+vT9+3wtb5VPMZmOFNAn0mfzBmn5m7d 7fuGWvatM3znIT/vf3B0uJ+bcyXPvNWYrxM24= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zkIisz2tZpoFASbESPqFCPM3gTo3CNsg17xHRg84wY4=; b=UuJWYbSgQOb3LvA5Tpx7fiOB/1etv1+zlTTqonjNeGwFqcv2vHAvc3oGx3YAFhFx42 Q13dmAQGgqzHOa4haHLz5jNf3nmo4Zi7h513+I2XT8BiMyUiHHXO4bV+JRv3iFX9Q68g yaDNNTfTmQpKdw+Ha6UsQNWGmC+1FtPKeOGxVQgLsV0VACVBWcDKjuKtm22C0HM8YQHo MgKl6mz4EY1psr3Ci0KHa5MYwZoZfqKYt22No22HaTU0FY23t9fH5A04QdgbhZ+Bx0fG 00Mcy3NHf0FelYAr6XUcCJxenZaHOwY6zqUaJXjwu2zQqe58plRRfWkVo1DTjPFPwlEl h57w== X-Gm-Message-State: AODbwcAwzV3C784PhHD4xo7U0SOfucPeqPmoDDLpQ+A/OvEHzJGx429H G9Mn+Nn8FB7QJuqM X-Received: by 10.46.81.17 with SMTP id f17mr40451ljb.96.1494506347223; Thu, 11 May 2017 05:39:07 -0700 (PDT) Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id h13sm13935ljh.5.2017.05.11.05.39.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 May 2017 05:39:06 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jens Axboe , Paolo Valente , linux-block@vger.kernel.org, Linus Walleij , Mark Brown , Adrian Hunter Subject: [RFC PATCH 1/3] mmc: sdio: Don't use abort-able claim host method from SDIO IRQ thread Date: Thu, 11 May 2017 14:39:00 +0200 Message-Id: <1494506343-28572-2-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1494506343-28572-1-git-send-email-ulf.hansson@linaro.org> References: <1494506343-28572-1-git-send-email-ulf.hansson@linaro.org> Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In a step to simplify the use of the lock, mmc_claim|release_host(), let's change the SDIO IRQ thread to move away from using the abort-able claim host method. In the SDIO IRQ thread case, we can instead check the numbers of SDIO IRQs that are currently claimed via host->sdio_irqs, as this field is protected from updates unless the host is claimed. When host->sdio_irqs has become zero, it means the SDIO func driver(s) has released the SDIO IRQ, then we can bail out and stop running the SDIO IRQ thread. Signed-off-by: Ulf Hansson --- drivers/mmc/core/sdio_irq.c | 10 ++++++---- include/linux/mmc/host.h | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c index 6d4b720..95f7a09 100644 --- a/drivers/mmc/core/sdio_irq.c +++ b/drivers/mmc/core/sdio_irq.c @@ -137,9 +137,13 @@ static int sdio_irq_thread(void *_host) * holding of the host lock does not cover too much work * that doesn't require that lock to be held. */ - ret = __mmc_claim_host(host, &host->sdio_irq_thread_abort); - if (ret) + mmc_claim_host(host); + if (!host->sdio_irqs) { + ret = 1; + mmc_release_host(host); break; + } + ret = process_sdio_pending_irqs(host); host->sdio_irq_pending = false; mmc_release_host(host); @@ -195,7 +199,6 @@ static int sdio_card_irq_get(struct mmc_card *card) if (!host->sdio_irqs++) { if (!(host->caps2 & MMC_CAP2_SDIO_IRQ_NOTHREAD)) { - atomic_set(&host->sdio_irq_thread_abort, 0); host->sdio_irq_thread = kthread_run(sdio_irq_thread, host, "ksdioirqd/%s", mmc_hostname(host)); @@ -223,7 +226,6 @@ static int sdio_card_irq_put(struct mmc_card *card) if (!--host->sdio_irqs) { if (!(host->caps2 & MMC_CAP2_SDIO_IRQ_NOTHREAD)) { - atomic_set(&host->sdio_irq_thread_abort, 1); kthread_stop(host->sdio_irq_thread); } else if (host->caps & MMC_CAP_SDIO_IRQ) { host->ops->enable_sdio_irq(host, 0); diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h index 21385ac..8a4131f 100644 --- a/include/linux/mmc/host.h +++ b/include/linux/mmc/host.h @@ -359,7 +359,6 @@ struct mmc_host { unsigned int sdio_irqs; struct task_struct *sdio_irq_thread; bool sdio_irq_pending; - atomic_t sdio_irq_thread_abort; mmc_pm_flag_t pm_flags; /* requested pm features */