From patchwork Thu Oct 3 15:52:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 175136 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp560632ill; Thu, 3 Oct 2019 09:32:37 -0700 (PDT) X-Google-Smtp-Source: APXvYqxH4DCqAoSpUjv4Ko+6jRXL/GDDZNRcsDnp4l1a4gbVtE6qEOIehBe3k7T+w9emfO+jevzs X-Received: by 2002:aa7:cf81:: with SMTP id z1mr10514742edx.224.1570120356736; Thu, 03 Oct 2019 09:32:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570120356; cv=none; d=google.com; s=arc-20160816; b=l2SPXxh4iG444wzlsyXNzzRCMb/6bnBlgA7W6TZPo9bIQjuMGP8bTvkZOLZtTvIAaJ svbSMwyC/ip0MOQkj4wgbT3jlJ0QkOOiuxNCV3vcVZWl5FRRPi5OaEB58xJTO7Nwed66 +zsZDs/vVBmytEFVRHPU9fGdjxb4cKVXfsstpAot+BCkvOtwCgTg814nzCfPJgBvsKWK XF0LYpA0x5z8nOAP+K1M3QhJd/Nj+OoTc9KoidKkqV+8Mr99cP94V9g17Eg2+azXZXo8 JeV6v0faoCV/f8TZODUlv1It1HtiBfhPrDPAl7Z0Rf3SOJF/+cYh5Y2qHYJgaeEyWUlu PrnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mKDF4/IDSTYzmqsX0rxU0TV1RTgahsdAvW/TkZ4Yg3k=; b=BiO1aQ41YGVl5R4Wp+yUyZUFGGHwpYoRc00u7Npp0XHvR+f3gil9uKX4CHOFoPgv8j ipGkmSNLyeddTcaBfKrYhLhhc5bp05ljtSm5mdhyzEoLMMnMUZSpti68/STM7xt3hhHg GR1L5fUb3FS2AilPAcuYW/APFi9/E0u/6ZwiiBIcuG9MZ3Vq2J/bHCmn+Xz9Gs6oo5E9 2xaikmGaaOsI9TKjSGuSXRGQLRytCv7JIndt3u+OaYF1mPqVYJagbiXypOgyIlo/tznD ohnpfa3mctyxxAputQ17Xl10P3zB0x6OYGkwrA5354mP5DHZsYddtUO0uQc9cc0p/XGU GdbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yfdRg5Ui; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h15si1937032eda.284.2019.10.03.09.32.35; Thu, 03 Oct 2019 09:32:36 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=yfdRg5Ui; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403947AbfJCQce (ORCPT + 27 others); Thu, 3 Oct 2019 12:32:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:40128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391939AbfJCQcd (ORCPT ); Thu, 3 Oct 2019 12:32:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 642632070B; Thu, 3 Oct 2019 16:32:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120351; bh=fP7mtkBeozDd3ru7q/dWJl8QsplEw+feOxj/O/dCgDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yfdRg5Ui+Ww+HB2GCKVPd8+n/lJL7IN2s5TeiVIC/kPHR8zRIcWGuvHWwgfCyEpon QJkZOIxO/wKvBTPsTJKEyIXAm4wB4uKQlkVoYeYayQgn2F90UQSgkTnD3sVuWvbOYQ evsLOMB2/6caTdkODXlBdLU13DtbY/DmSqj7sOBU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matthias Kaehlcke , Ulf Hansson , Douglas Anderson , Sasha Levin Subject: [PATCH 5.2 189/313] mmc: core: Clarify sdio_irq_pending flag for MMC_CAP2_SDIO_IRQ_NOTHREAD Date: Thu, 3 Oct 2019 17:52:47 +0200 Message-Id: <20191003154551.610578633@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ulf Hansson [ Upstream commit 36d57efb4af534dd6b442ea0b9a04aa6dfa37abe ] The sdio_irq_pending flag is used to let host drivers indicate that it has signaled an IRQ. If that is the case and we only have a single SDIO func that have claimed an SDIO IRQ, our assumption is that we can avoid reading the SDIO_CCCR_INTx register and just call the SDIO func irq handler immediately. This makes sense, but the flag is set/cleared in a somewhat messy order, let's fix that up according to below. First, the flag is currently set in sdio_run_irqs(), which is executed as a work that was scheduled from sdio_signal_irq(). To make it more implicit that the host have signaled an IRQ, let's instead immediately set the flag in sdio_signal_irq(). This also makes the behavior consistent with host drivers that uses the legacy, mmc_signal_sdio_irq() API. This have no functional impact, because we don't expect host drivers to call sdio_signal_irq() until after the work (sdio_run_irqs()) have been executed anyways. Second, currently we never clears the flag when using the sdio_run_irqs() work, but only when using the sdio_irq_thread(). Let make the behavior consistent, by moving the flag to be cleared inside the common process_sdio_pending_irqs() function. Additionally, tweak the behavior of the flag slightly, by avoiding to clear it unless we processed the SDIO IRQ. The purpose with this at this point, is to keep the information about whether there have been an SDIO IRQ signaled by the host, so at system resume we can decide to process it without reading the SDIO_CCCR_INTx register. Tested-by: Matthias Kaehlcke Reviewed-by: Matthias Kaehlcke Signed-off-by: Ulf Hansson Reviewed-by: Douglas Anderson Signed-off-by: Ulf Hansson Signed-off-by: Sasha Levin --- drivers/mmc/core/sdio_irq.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/mmc/core/sdio_irq.c b/drivers/mmc/core/sdio_irq.c index 9f54a259a1b36..e4823ef0a0de9 100644 --- a/drivers/mmc/core/sdio_irq.c +++ b/drivers/mmc/core/sdio_irq.c @@ -31,6 +31,7 @@ static int process_sdio_pending_irqs(struct mmc_host *host) { struct mmc_card *card = host->card; int i, ret, count; + bool sdio_irq_pending = host->sdio_irq_pending; unsigned char pending; struct sdio_func *func; @@ -38,13 +39,16 @@ static int process_sdio_pending_irqs(struct mmc_host *host) if (mmc_card_suspended(card)) return 0; + /* Clear the flag to indicate that we have processed the IRQ. */ + host->sdio_irq_pending = false; + /* * Optimization, if there is only 1 function interrupt registered * and we know an IRQ was signaled then call irq handler directly. * Otherwise do the full probe. */ func = card->sdio_single_irq; - if (func && host->sdio_irq_pending) { + if (func && sdio_irq_pending) { func->irq_handler(func); return 1; } @@ -96,7 +100,6 @@ void sdio_run_irqs(struct mmc_host *host) { mmc_claim_host(host); if (host->sdio_irqs) { - host->sdio_irq_pending = true; process_sdio_pending_irqs(host); if (host->ops->ack_sdio_irq) host->ops->ack_sdio_irq(host); @@ -115,6 +118,7 @@ void sdio_irq_work(struct work_struct *work) void sdio_signal_irq(struct mmc_host *host) { + host->sdio_irq_pending = true; queue_delayed_work(system_wq, &host->sdio_irq_work, 0); } EXPORT_SYMBOL_GPL(sdio_signal_irq); @@ -160,7 +164,6 @@ static int sdio_irq_thread(void *_host) if (ret) break; ret = process_sdio_pending_irqs(host); - host->sdio_irq_pending = false; mmc_release_host(host); /*