From: Sinan Kaya <okaya@codeaurora.org> To: dmaengine@vger.kernel.org, timur@codeaurora.org, devicetree@vger.kernel.org, cov@codeaurora.org, vinod.koul@intel.com, jcm@redhat.com Cc: eric.auger@linaro.org, agross@codeaurora.org, arnd@arndb.de, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Sinan Kaya <okaya@codeaurora.org>, Dan Williams <dan.j.williams@intel.com>, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] dmaengine: qcom_hidma: bring out interrupt cause Date: Mon, 18 Jul 2016 14:39:35 -0400 [thread overview] Message-ID: <1468867177-15007-9-git-send-email-okaya@codeaurora.org> (raw) In-Reply-To: <1468867177-15007-1-git-send-email-okaya@codeaurora.org> 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 <okaya@codeaurora.org> --- drivers/dma/qcom/hidma_ll.c | 60 ++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/dma/qcom/hidma_ll.c b/drivers/dma/qcom/hidma_ll.c index 2753210..eb78952 100644 --- a/drivers/dma/qcom/hidma_ll.c +++ b/drivers/dma/qcom/hidma_ll.c @@ -403,12 +403,18 @@ static void hidma_ll_abort(unsigned long arg) * 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, resetting...\n", + cause); + + /* Clear out pending interrupts */ + writel(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); + + tasklet_schedule(&lldev->rst_task); + return; + } /* * Fine tuned for this HW... @@ -418,40 +424,28 @@ 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, resetting...\n", - cause); - - /* Clear out pending interrupts */ - writel(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); - - tasklet_schedule(&lldev->rst_task); - goto out; - } - + while (atomic_read(&lldev->pending_tre_count)) { /* * Try to consume as many EVREs as possible. */ - hidma_handle_tre_completion(lldev); + hidma_handle_tre_completion(lldev, 0, 0); + } - /* 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; } -- 1.8.2.1
WARNING: multiple messages have this Message-ID (diff)
From: okaya@codeaurora.org (Sinan Kaya) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/10] dmaengine: qcom_hidma: bring out interrupt cause Date: Mon, 18 Jul 2016 14:39:35 -0400 [thread overview] Message-ID: <1468867177-15007-9-git-send-email-okaya@codeaurora.org> (raw) In-Reply-To: <1468867177-15007-1-git-send-email-okaya@codeaurora.org> 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 <okaya@codeaurora.org> --- drivers/dma/qcom/hidma_ll.c | 60 ++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 33 deletions(-) diff --git a/drivers/dma/qcom/hidma_ll.c b/drivers/dma/qcom/hidma_ll.c index 2753210..eb78952 100644 --- a/drivers/dma/qcom/hidma_ll.c +++ b/drivers/dma/qcom/hidma_ll.c @@ -403,12 +403,18 @@ static void hidma_ll_abort(unsigned long arg) * 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, resetting...\n", + cause); + + /* Clear out pending interrupts */ + writel(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); + + tasklet_schedule(&lldev->rst_task); + return; + } /* * Fine tuned for this HW... @@ -418,40 +424,28 @@ 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, resetting...\n", - cause); - - /* Clear out pending interrupts */ - writel(cause, lldev->evca + HIDMA_EVCA_IRQ_CLR_REG); - - tasklet_schedule(&lldev->rst_task); - goto out; - } - + while (atomic_read(&lldev->pending_tre_count)) { /* * Try to consume as many EVREs as possible. */ - hidma_handle_tre_completion(lldev); + hidma_handle_tre_completion(lldev, 0, 0); + } - /* 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; } -- 1.8.2.1
next prev parent reply other threads:[~2016-07-18 18:40 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-07-18 18:39 [PATCH 00/10] dmaengine: qcom_hidma: add MSI interrupt support Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-18 18:39 ` [PATCH 02/10] Documentation: DT: qcom_hidma: correct spelling mistakes Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-20 1:16 ` Rob Herring 2016-07-20 1:16 ` Rob Herring 2016-07-18 18:39 ` [PATCH 03/10] of: irq: make of_msi_configure accessible from modules Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya [not found] ` <1468867177-15007-4-git-send-email-okaya-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2016-07-18 21:24 ` Rob Herring 2016-07-18 21:24 ` Rob Herring 2016-07-18 21:24 ` Rob Herring 2016-07-19 21:40 ` Sinan Kaya 2016-07-19 21:40 ` Sinan Kaya 2016-07-19 21:40 ` Sinan Kaya 2016-07-18 18:39 ` [PATCH 04/10] dmaending: qcom_hidma: configure DMA and MSI for OF Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-24 6:33 ` Vinod Koul 2016-07-24 6:33 ` Vinod Koul 2016-07-24 6:33 ` Vinod Koul 2016-07-24 14:40 ` Sinan Kaya 2016-07-24 14:40 ` Sinan Kaya 2016-07-24 14:40 ` Sinan Kaya 2016-07-18 18:39 ` [PATCH 05/10] dmaengine: qcom_hidma: make pending_tre_count atomic Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-18 18:39 ` [PATCH 06/10] dmaengine: qcom_hidma: make error and success path common Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-18 18:39 ` [PATCH 07/10] dmaengine: qcom_hidma: eliminate processed variables Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya [this message] 2016-07-18 18:39 ` [PATCH 08/10] dmaengine: qcom_hidma: bring out interrupt cause Sinan Kaya 2016-07-18 18:39 ` [PATCH 09/10] dmaengine: qcom_hidma: add a common API to setup the interrupt Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya [not found] ` <1468867177-15007-1-git-send-email-okaya-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2016-07-18 18:39 ` [PATCH 01/10] Documentation: DT: qcom_hidma: update binding for MSI Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-19 10:37 ` Mark Rutland 2016-07-19 10:37 ` Mark Rutland 2016-07-19 12:42 ` Sinan Kaya 2016-07-19 12:42 ` Sinan Kaya 2016-07-18 18:39 ` [PATCH 10/10] dmaengine: qcom_hidma: add MSI support for interrupts Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-18 18:39 ` Sinan Kaya 2016-07-24 6:42 ` Vinod Koul 2016-07-24 6:42 ` Vinod Koul 2016-07-24 6:42 ` Vinod Koul 2016-07-24 14:38 ` Sinan Kaya 2016-07-24 14:38 ` Sinan Kaya 2016-07-24 14:38 ` Sinan Kaya 2016-08-04 12:46 ` Vinod Koul 2016-08-04 12:46 ` Vinod Koul 2016-08-04 12:46 ` Vinod Koul 2016-08-04 13:59 ` Sinan Kaya 2016-08-04 13:59 ` Sinan Kaya 2016-08-04 13:59 ` Sinan Kaya [not found] ` <497ddb6c-0233-657f-72c6-b844b798ff11-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2016-08-08 8:14 ` Vinod Koul 2016-08-08 8:14 ` Vinod Koul 2016-08-08 8:14 ` Vinod Koul 2016-08-08 11:48 ` okaya 2016-08-08 11:48 ` okaya at codeaurora.org
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1468867177-15007-9-git-send-email-okaya@codeaurora.org \ --to=okaya@codeaurora.org \ --cc=agross@codeaurora.org \ --cc=arnd@arndb.de \ --cc=cov@codeaurora.org \ --cc=dan.j.williams@intel.com \ --cc=devicetree@vger.kernel.org \ --cc=dmaengine@vger.kernel.org \ --cc=eric.auger@linaro.org \ --cc=jcm@redhat.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=timur@codeaurora.org \ --cc=vinod.koul@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.