From patchwork Thu Sep 29 02:12:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sinan Kaya X-Patchwork-Id: 9355573 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 E172F608A1 for ; Thu, 29 Sep 2016 02:17:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D1EDE297B5 for ; Thu, 29 Sep 2016 02:17:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6B17297B8; Thu, 29 Sep 2016 02:17:36 +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_SIGNED, 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 50159297B5 for ; Thu, 29 Sep 2016 02:17:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755226AbcI2CR1 (ORCPT ); Wed, 28 Sep 2016 22:17:27 -0400 Received: from smtp.codeaurora.org ([198.145.29.96]:60629 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753639AbcI2CRS (ORCPT ); Wed, 28 Sep 2016 22:17:18 -0400 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 8902161716; Thu, 29 Sep 2016 02:17:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1475115436; bh=iQSzVUILpRkfRlUiDNKIfYqEjeefJ+vLx+ucIX8txnw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P6oinfEA9NqD7lVr5334HRK7+/ohgoeoJXMfsvmShThJ08fqiI5rNHoDX3XUZhjFA OshwSilssYzFColBS80350y/IhjJClSsTSvi8zydWo6NKZvvz24HhiFYbTt3Tx35A0 vPhY3Ee/gBJfV4cqQ07VdTv087zcJ/pgKXvor58w= Received: from drakthul.qualcomm.com (global_nat1_iad_fw.qualcomm.com [129.46.232.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: okaya@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 92128611EE; Thu, 29 Sep 2016 02:17:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1475115436; bh=iQSzVUILpRkfRlUiDNKIfYqEjeefJ+vLx+ucIX8txnw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P6oinfEA9NqD7lVr5334HRK7+/ohgoeoJXMfsvmShThJ08fqiI5rNHoDX3XUZhjFA OshwSilssYzFColBS80350y/IhjJClSsTSvi8zydWo6NKZvvz24HhiFYbTt3Tx35A0 vPhY3Ee/gBJfV4cqQ07VdTv087zcJ/pgKXvor58w= DMARC-Filter: OpenDMARC Filter v1.3.1 smtp.codeaurora.org 92128611EE Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=pass smtp.mailfrom=okaya@codeaurora.org From: Sinan Kaya To: dmaengine@vger.kernel.org, timur@codeaurora.org, devicetree@vger.kernel.org, cov@codeaurora.org, vinod.koul@intel.com, jcm@redhat.com Cc: agross@codeaurora.org, arnd@arndb.de, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya , Dan Williams , linux-kernel@vger.kernel.org Subject: [PATCH V4 07/10] dmaengine: qcom_hidma: bring out interrupt cause Date: Wed, 28 Sep 2016 22:12:44 -0400 Message-Id: <1475115167-5898-8-git-send-email-okaya@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1475115167-5898-1-git-send-email-okaya@codeaurora.org> References: <1475115167-5898-1-git-send-email-okaya@codeaurora.org> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Bring out the interrupt cause to the top level so that MSI interrupts can be hooked at a later stage. Signed-off-by: Sinan Kaya --- drivers/dma/qcom/hidma_ll.c | 72 +++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 38 deletions(-) diff --git a/drivers/dma/qcom/hidma_ll.c b/drivers/dma/qcom/hidma_ll.c index c911ca2..088935f 100644 --- a/drivers/dma/qcom/hidma_ll.c +++ b/drivers/dma/qcom/hidma_ll.c @@ -397,12 +397,24 @@ static int hidma_ll_reset(struct hidma_lldev *lldev) * requests traditionally to the destination, this concept does not apply * here for this HW. */ -irqreturn_t hidma_ll_inthandler(int chirq, void *arg) +static void hidma_ll_int_handler_internal(struct hidma_lldev *lldev, int cause) { - struct hidma_lldev *lldev = arg; - u32 status; - u32 enable; - u32 cause; + if (cause & HIDMA_ERR_INT_MASK) { + dev_err(lldev->dev, "error 0x%x, disabling...\n", + cause); + + /* Clear out pending interrupts */ + writel(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); + + /* No further submissions. */ + hidma_ll_disable(lldev); + + /* Driver completes the txn and intimates the client.*/ + hidma_cleanup_pending_tre(lldev, 0xFF, + HIDMA_EVRE_STATUS_ERROR); + + return; + } /* * Fine tuned for this HW... @@ -412,45 +424,29 @@ irqreturn_t hidma_ll_inthandler(int chirq, void *arg) * interrupt delivery guarantees. Do not copy this code blindly and * expect that to work. */ - status = readl_relaxed(lldev->evca + HIDMA_EVCA_IRQ_STAT_REG); - enable = readl_relaxed(lldev->evca + HIDMA_EVCA_IRQ_EN_REG); - cause = status & enable; - - while (cause) { - if (cause & HIDMA_ERR_INT_MASK) { - dev_err(lldev->dev, "error 0x%x, disabling...\n", - cause); - - /* Clear out pending interrupts */ - writel(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); - - /* No further submissions. */ - hidma_ll_disable(lldev); - - /* Driver completes the txn and intimates the client.*/ - hidma_cleanup_pending_tre(lldev, 0xFF, - HIDMA_EVRE_STATUS_ERROR); - goto out; - } - + while (atomic_read(&lldev->pending_tre_count)) { /* * Try to consume as many EVREs as possible. */ - hidma_handle_tre_completion(lldev); + if (hidma_handle_tre_completion(lldev, 0, 0)) + break; + } - /* We consumed TREs or there are pending TREs or EVREs. */ - writel_relaxed(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); + /* We consumed TREs or there are pending TREs or EVREs. */ + writel_relaxed(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); +} - /* - * Another interrupt might have arrived while we are - * processing this one. Read the new cause. - */ - status = readl_relaxed(lldev->evca + HIDMA_EVCA_IRQ_STAT_REG); - enable = readl_relaxed(lldev->evca + HIDMA_EVCA_IRQ_EN_REG); - cause = status & enable; - } +irqreturn_t hidma_ll_inthandler(int chirq, void *arg) +{ + struct hidma_lldev *lldev = arg; + u32 status; + u32 enable; + u32 cause; -out: + status = readl_relaxed(lldev->evca + HIDMA_EVCA_IRQ_STAT_REG); + enable = readl_relaxed(lldev->evca + HIDMA_EVCA_IRQ_EN_REG); + cause = status & enable; + hidma_ll_int_handler_internal(lldev, cause); return IRQ_HANDLED; }