From patchwork Thu Aug 25 04:50:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 9298637 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 164D160757 for ; Thu, 25 Aug 2016 04:54:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 052C528EC0 for ; Thu, 25 Aug 2016 04:54:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EDCC0291C6; Thu, 25 Aug 2016 04:54:46 +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.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, 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 8C5E528EC0 for ; Thu, 25 Aug 2016 04:54:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754771AbcHYEyp (ORCPT ); Thu, 25 Aug 2016 00:54:45 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34839 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754597AbcHYExa (ORCPT ); Thu, 25 Aug 2016 00:53:30 -0400 Received: by mail-wm0-f65.google.com with SMTP id i5so5640299wmg.2 for ; Wed, 24 Aug 2016 21:53:30 -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=/EEmYzY+oe92Njsfl1Hxqgno7qFvWJKwOhSJ/gUmsVo=; b=PSGvzJ1ienJ3sbJ6PAf24wkXkIwIDD9cp2gtdB64ITKsK+dG3mVcWacMDQE/+ILelf HiWobWgBaF0NcDYpTk9YJF/7fAilPsPAKA3gfxj1DbbQbKjD7sWQTg4xP5EZq16mywL/ Licl5sJ9v4/ksf2nK96RmT787znQDJim0t/oXekHyRm0Y3nGThz+pgc2soY6moc+9LH+ hnEUZuRdGjPGwpRISbo6Qt0Sk40XxkHcmqMSOUQu6c/Xe0kAB9OZOPcvcjnmr36vCKqz V7f5nfnaNbr0UCPe9aAWbC/szLjmWCmZS0+UqFNuIo67RxO1dnZRfVmoB87lz2aKBGwK 0eLA== 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=/EEmYzY+oe92Njsfl1Hxqgno7qFvWJKwOhSJ/gUmsVo=; b=N0GQ4rIxRaflXkR7R9vrFKR0b0GPxZsg6sloF1W9ybExqo+BAfHX1MAd1PqxlMODqs zXL6FR5Dbrgofbe64LMb9UMJyLUFjduFwJkroOKqXcggU9MscaDocXFA3OCHG6vaY9dn vFIXdgucoGs5qGmXCQ9PHViogOHmzDerNnM9FD6uH2JKUg3mNQUXaROtNUYKs+oPoxvM 2teTFDTHjHfsd4/AoLcXk8oLuDTj2jf8GyZ3S+hyWByzLuDQ3pv1bt9y4QxSq87FDfpK mb3cSCo9IbenONWpWwhx57cFpYCkYOVtWdDBPrmYcxVT4qSaM4m9/bu6RKa7RMNpU8xF rUXA== X-Gm-Message-State: AEkoouu1lX6CbS7k4Z6n88RAACZ72KmEqqRRifbpbZBrY3bsV536jC4FR8dGEZy/GUzSjw== X-Received: by 10.194.120.164 with SMTP id ld4mr5521788wjb.81.1472100809336; Wed, 24 Aug 2016 21:53:29 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:9500:dd82:2805:e44f:720e? (p200300625F439500DD822805E44F720E.dip0.t-ipconnect.de. [2003:62:5f43:9500:dd82:2805:e44f:720e]) by smtp.googlemail.com with ESMTPSA id q139sm36781328wmb.18.2016.08.24.21.53.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Aug 2016 21:53:29 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 17/23] spi: fsl-espi: improve the ISR frame To: Mark Brown References: Cc: "linux-spi@vger.kernel.org" Message-ID: Date: Thu, 25 Aug 2016 06:50:21 +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 --- 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 ee4e778..8d5bebc 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