From patchwork Tue Feb 14 20:07:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9572705 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 0D6D5601E7 for ; Tue, 14 Feb 2017 20:08:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A6C726E4D for ; Tue, 14 Feb 2017 20:08:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F37DB2840E; Tue, 14 Feb 2017 20:08:03 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 A810F26E4D for ; Tue, 14 Feb 2017 20:08:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754154AbdBNUIB (ORCPT ); Tue, 14 Feb 2017 15:08:01 -0500 Received: from mail-wr0-f196.google.com ([209.85.128.196]:35232 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754660AbdBNUHz (ORCPT ); Tue, 14 Feb 2017 15:07:55 -0500 Received: by mail-wr0-f196.google.com with SMTP id o16so28928009wra.2 for ; Tue, 14 Feb 2017 12:07:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=w8bEW1pI1tjiQoKMGaSKKm8TVd4aNUDDhLBPBQVca+c=; b=nYE+oq3XyB26bnRaJnqO9rMXm0zI4JZFYVrddn2xtEntTNnrF6MMNBVZvG+gsI5Sqb L6vcb7BfQS1bNdKYBcdBYpnvrb1sxbBeWJ0qJhpv61OhkaK21MZH85G2Uu7IE/cd0qaD f4F1M51fVEssd+7kh+BDbdrYuZn+v+YUcK+zwNeKTmfcvWzLjWO5PoEknVP2RjxlKIvT Z5dufNjtvlfZe9uuIzsHGTNFDozRtBGo43YRkkiPD821s86aU9gT+KrXEqVK4e//111H 1ly4dF3dBvkOgH72hZFKJtYC8Cn7yhTjLgk4NYwbjhZqcHC3I0XqTQgKkIC4CssrwP4c MnYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=w8bEW1pI1tjiQoKMGaSKKm8TVd4aNUDDhLBPBQVca+c=; b=Em/mxrZ11YiSZp25ib8eKMPUKTcDakeKbwWd/yG20wiBVlVxTq41qo+6F4/rzd11mt APVUQ6JCIjVrlz/VhOylrN1YyX/FGqp2kfXhgfZ5KX3sbFRb5WbpSEcyLxYO/Iqeov9c 9ir8kodYuE34yHYxN8NwyHFW4Aic+Jwjz43Iy46kfSkwMKXRdgmT/hCMu8UyUrcb5ok0 ZV7VYzONGdYl+PGuq8U14dSVP3To7+sm2w4mi0S/SALi3sm/CurZZVjElQ5G+a+y8ZWg X/ltEYBxSyOfLNkmrHzK3+koEHmhdCHSP2XYBARVF7EoKUNYV66nb2g7kXVFnbwL9QwR yMHg== X-Gm-Message-State: AMke39nUL6WN2ITyiTHVdVGOjERBidHswTl7uXxBu5f0uQtAOBfyJLprXrXnjsyy+Ynvag== X-Received: by 10.223.165.138 with SMTP id g10mr28060365wrc.105.1487102874353; Tue, 14 Feb 2017 12:07:54 -0800 (PST) Received: from ?IPv6:2003:c6:ebdc:4000:9533:a20:55f1:fb4b? (p200300C6EBDC400095330A2055F1FB4B.dip0.t-ipconnect.de. [2003:c6:ebdc:4000:9533:a20:55f1:fb4b]) by smtp.googlemail.com with ESMTPSA id o2sm2511876wmb.28.2017.02.14.12.07.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 12:07:53 -0800 (PST) From: Heiner Kallweit Subject: [PATCH 18/18] mmc: meson-gx: move handling of one case from threaded handler to main irq To: Ulf Hansson , Kevin Hilman References: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com> Cc: Carlo Caione , "linux-mmc@vger.kernel.org" , linux-amlogic@lists.infradead.org Message-ID: <625bbd38-6815-9d81-a480-e7ce0f4bc7eb@gmail.com> Date: Tue, 14 Feb 2017 21:07:17 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <420b75a9-b8c2-b3d7-ae60-3ed8a5a18ead@gmail.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If cmd->data is NULL there's nothing to do in the threaded handler. So we can handle this case in the main irq handler already. Signed-off-by: Heiner Kallweit --- drivers/mmc/host/meson-gx-mmc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c index 08ff29be..58b0add2 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -578,9 +578,10 @@ static irqreturn_t meson_mmc_irq(int irq, void *dev_id) if (status & IRQ_SDIO) dev_dbg(host->dev, "Unhandled IRQ: SDIO.\n"); - if (status & (IRQ_END_OF_CHAIN | IRQ_RESP_STATUS)) - ret = IRQ_WAKE_THREAD; - else { + if (status & (IRQ_END_OF_CHAIN | IRQ_RESP_STATUS)) { + if (cmd->data) + ret = IRQ_WAKE_THREAD; + } else { dev_warn(host->dev, "Unknown IRQ! status=0x%04x: MMC CMD%u arg=0x%08x flags=0x%08x stop=%d\n", status, cmd->opcode, cmd->arg, cmd->flags, cmd->mrq->stop ? 1 : 0); @@ -612,11 +613,11 @@ static irqreturn_t meson_mmc_irq_thread(int irq, void *dev_id) struct mmc_data *data; unsigned int xfer_bytes; - if (WARN_ON(!cmd)) + if (WARN_ON(!cmd || !cmd->data)) return IRQ_NONE; data = cmd->data; - if (data && data->flags & MMC_DATA_READ) { + if (data->flags & MMC_DATA_READ) { size_t len = sg_copy_from_buffer(data->sg, data->sg_len, host->bounce_buf, host->bounce_buf_size);