From patchwork Sun Sep 4 08:01:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9312425 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 CDF5B600CA for ; Sun, 4 Sep 2016 08:07:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF8F7287DA for ; Sun, 4 Sep 2016 08:07:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B46AF28925; Sun, 4 Sep 2016 08:07:53 +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=-4.4 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 57A51287DA for ; Sun, 4 Sep 2016 08:07:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752259AbcIDIHv (ORCPT ); Sun, 4 Sep 2016 04:07:51 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33925 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436AbcIDIHk (ORCPT ); Sun, 4 Sep 2016 04:07:40 -0400 Received: by mail-wm0-f65.google.com with SMTP id v143so8664614wmv.1 for ; Sun, 04 Sep 2016 01:07:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:references:cc:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding; bh=w86LY+uVN+pVj/CWLsQaOc8jmeNUh2El63f/GzWJtJk=; b=fAmMRVzyzAU9YfILwqppzvNDFy3yQCkTtB1+ooIQR3HmGfM9jsJ+sM5IzKsY2AAnfk BgTilbf5h9kALhNXtGAuk6diPucWllfIQFTcXTNmheSorY28CO/lDNh+KKEaa4RhIY2y XrGDdRFxl+sOwwrFhnKolfHxwEItEzU+FCLDrCGNLuR1xDf8RVxX3+U2itax6fxOk4pb 3sfOB+n4CNpCcbGCwFPn5K2i11JNnrTiUI9itNq2Px2qm2Gr9cJ6+W5AHWZ+cfnH0T6+ bXBYTa0LUcUDiXfEvJv2EKLBTfXB0WxjbMNtX0XobJj1A08mYJakmZOHk9a2/zOFYpVV K8kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:references:cc:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding; bh=w86LY+uVN+pVj/CWLsQaOc8jmeNUh2El63f/GzWJtJk=; b=mFWXH8FYLz8Vj6p3be7x9uuYMBiVfwtx9Lp2Na//P0VY7fPRqxZbtmdoQ+8RL0g8Hn hYk/XHMaU3BQ2UQRmVPrkWtCz82B9ghWTtxxC1qi/UGzDZDYM9T6U1SB1VtUqC0rJkj5 L68h570wzU2tbxAbn1FN/tkH7a0dagNz5evxwVs8emy838LLmvBeGw8wsfggMJ/Pgy8R NbxOML3apEkMdwFS5xLFd51p9dqPCvxwPFsT+r9cbGCl41D9OETd2AsIcYMCxhNiMT5u 5HdI/jG6c3UrTrZg7pWgi6wCFc5TmZDiVK4SFn1MKsQk3pI7MJobhvKnnFBBXNNKi3gl /f1w== X-Gm-Message-State: AE9vXwPZ0eiE/3+pLmGL1RB2+Ps0GhAWovFPlrsxesmg4VrEHEGbB5biU91zOmXlmD2aDQ== X-Received: by 10.28.149.137 with SMTP id x131mr6290837wmd.79.1472976458977; Sun, 04 Sep 2016 01:07:38 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:c1f5:c528:a3d:f8c4? (p200300625F439500C1F5C5280A3DF8C4.dip0.t-ipconnect.de. [2003:62:5f43:9500:c1f5:c528:a3d:f8c4]) by smtp.googlemail.com with ESMTPSA id i80sm12984448wmf.11.2016.09.04.01.07.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Sep 2016 01:07:38 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH v2 13/18] spi: fsl-espi: improve the ISR frame To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: Date: Sun, 4 Sep 2016 10:01:45 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Improve the ISR frame: - move resetting the event bits to the ISR frame - change type of parameter irq to int - make sure that the event bits match at least one bit in the interrupt mask register Signed-off-by: Heiner Kallweit --- v2: - rebased --- drivers/spi/spi-fsl-espi.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c index 190ca5c..534dc14 100644 --- a/drivers/spi/spi-fsl-espi.c +++ b/drivers/spi/spi-fsl-espi.c @@ -451,17 +451,11 @@ static void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events) ®_base->event)) & SPIE_NF), 1000, 0); if (!ret) { dev_err(mspi->dev, "tired waiting for SPIE_NF\n"); - - /* Clear the SPIE bits */ - mpc8xxx_spi_write_reg(®_base->event, events); complete(&mspi->done); return; } } - /* Clear the events */ - mpc8xxx_spi_write_reg(®_base->event, events); - mspi->count -= 1; if (mspi->count) { u32 word = mspi->get_tx(mspi); @@ -472,23 +466,26 @@ static void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events) } } -static irqreturn_t fsl_espi_irq(s32 irq, void *context_data) +static irqreturn_t fsl_espi_irq(int irq, void *context_data) { struct mpc8xxx_spi *mspi = context_data; struct fsl_espi_reg *reg_base = mspi->reg_base; - irqreturn_t ret = IRQ_NONE; - u32 events; + u32 mask, events; - /* Get interrupt events(tx/rx) */ + /* Get interrupt mask and events and check that irq belongs to us */ + mask = mpc8xxx_spi_read_reg(®_base->mask); events = mpc8xxx_spi_read_reg(®_base->event); - if (events) - ret = IRQ_HANDLED; + if (!(mask & events)) + return IRQ_NONE; dev_vdbg(mspi->dev, "%s: events %x\n", __func__, events); fsl_espi_cpu_irq(mspi, events); - return ret; + /* Clear the events */ + mpc8xxx_spi_write_reg(®_base->event, events); + + return IRQ_HANDLED; } #ifdef CONFIG_PM