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 06/10] dmaengine: qcom_hidma: make error and success path common Date: Mon, 18 Jul 2016 14:39:33 -0400 [thread overview] Message-ID: <1468867177-15007-7-git-send-email-okaya@codeaurora.org> (raw) In-Reply-To: <1468867177-15007-1-git-send-email-okaya@codeaurora.org> Remove code duplication by feeding the error code from outside into successful data transfer handler. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> --- drivers/dma/qcom/hidma_ll.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/drivers/dma/qcom/hidma_ll.c b/drivers/dma/qcom/hidma_ll.c index f564c92..a71f0c7 100644 --- a/drivers/dma/qcom/hidma_ll.c +++ b/drivers/dma/qcom/hidma_ll.c @@ -241,11 +241,11 @@ static int hidma_post_completed(struct hidma_lldev *lldev, int tre_iterator, * Return a positive number if there are pending TREs or EVREs. * Return 0 if there is nothing to consume or no pending TREs/EVREs found. */ -static int hidma_handle_tre_completion(struct hidma_lldev *lldev) +static int hidma_handle_tre_completion(struct hidma_lldev *lldev, u8 err_info, + u8 err_code) { u32 evre_ring_size = lldev->evre_ring_size; u32 tre_ring_size = lldev->tre_ring_size; - u32 err_info, err_code, evre_write_off; u32 tre_iterator, evre_iterator; u32 num_completed = 0; @@ -268,10 +268,13 @@ static int hidma_handle_tre_completion(struct hidma_lldev *lldev) u32 cfg; cfg = current_evre[HIDMA_EVRE_CFG_IDX]; - err_info = cfg >> HIDMA_EVRE_ERRINFO_BIT_POS; - err_info &= HIDMA_EVRE_ERRINFO_MASK; - err_code = - (cfg >> HIDMA_EVRE_CODE_BIT_POS) & HIDMA_EVRE_CODE_MASK; + if (!err_info) { + err_info = cfg >> HIDMA_EVRE_ERRINFO_BIT_POS; + err_info &= HIDMA_EVRE_ERRINFO_MASK; + } + if (!err_code) + err_code = (cfg >> HIDMA_EVRE_CODE_BIT_POS) & + HIDMA_EVRE_CODE_MASK; if (hidma_post_completed(lldev, tre_iterator, err_info, err_code)) @@ -314,27 +317,8 @@ static int hidma_handle_tre_completion(struct hidma_lldev *lldev) void hidma_cleanup_pending_tre(struct hidma_lldev *lldev, u8 err_info, u8 err_code) { - u32 tre_iterator; - u32 tre_ring_size = lldev->tre_ring_size; - int num_completed = 0; - u32 tre_read_off; - - tre_iterator = lldev->tre_processed_off; - while (atomic_read(&lldev->pending_tre_count)) { - if (hidma_post_completed(lldev, tre_iterator, err_info, - err_code)) - break; - HIDMA_INCREMENT_ITERATOR(tre_iterator, HIDMA_TRE_SIZE, - tre_ring_size); - num_completed++; - } - tre_read_off = (lldev->tre_processed_off + - HIDMA_TRE_SIZE * num_completed); - - tre_read_off = tre_read_off % tre_ring_size; - - /* record the last processed tre offset */ - lldev->tre_processed_off = tre_read_off; + while (atomic_read(&lldev->pending_tre_count)) + hidma_handle_tre_completion(lldev, err_info, err_code); } static int hidma_ll_reset(struct hidma_lldev *lldev) -- 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 06/10] dmaengine: qcom_hidma: make error and success path common Date: Mon, 18 Jul 2016 14:39:33 -0400 [thread overview] Message-ID: <1468867177-15007-7-git-send-email-okaya@codeaurora.org> (raw) In-Reply-To: <1468867177-15007-1-git-send-email-okaya@codeaurora.org> Remove code duplication by feeding the error code from outside into successful data transfer handler. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> --- drivers/dma/qcom/hidma_ll.c | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/drivers/dma/qcom/hidma_ll.c b/drivers/dma/qcom/hidma_ll.c index f564c92..a71f0c7 100644 --- a/drivers/dma/qcom/hidma_ll.c +++ b/drivers/dma/qcom/hidma_ll.c @@ -241,11 +241,11 @@ static int hidma_post_completed(struct hidma_lldev *lldev, int tre_iterator, * Return a positive number if there are pending TREs or EVREs. * Return 0 if there is nothing to consume or no pending TREs/EVREs found. */ -static int hidma_handle_tre_completion(struct hidma_lldev *lldev) +static int hidma_handle_tre_completion(struct hidma_lldev *lldev, u8 err_info, + u8 err_code) { u32 evre_ring_size = lldev->evre_ring_size; u32 tre_ring_size = lldev->tre_ring_size; - u32 err_info, err_code, evre_write_off; u32 tre_iterator, evre_iterator; u32 num_completed = 0; @@ -268,10 +268,13 @@ static int hidma_handle_tre_completion(struct hidma_lldev *lldev) u32 cfg; cfg = current_evre[HIDMA_EVRE_CFG_IDX]; - err_info = cfg >> HIDMA_EVRE_ERRINFO_BIT_POS; - err_info &= HIDMA_EVRE_ERRINFO_MASK; - err_code = - (cfg >> HIDMA_EVRE_CODE_BIT_POS) & HIDMA_EVRE_CODE_MASK; + if (!err_info) { + err_info = cfg >> HIDMA_EVRE_ERRINFO_BIT_POS; + err_info &= HIDMA_EVRE_ERRINFO_MASK; + } + if (!err_code) + err_code = (cfg >> HIDMA_EVRE_CODE_BIT_POS) & + HIDMA_EVRE_CODE_MASK; if (hidma_post_completed(lldev, tre_iterator, err_info, err_code)) @@ -314,27 +317,8 @@ static int hidma_handle_tre_completion(struct hidma_lldev *lldev) void hidma_cleanup_pending_tre(struct hidma_lldev *lldev, u8 err_info, u8 err_code) { - u32 tre_iterator; - u32 tre_ring_size = lldev->tre_ring_size; - int num_completed = 0; - u32 tre_read_off; - - tre_iterator = lldev->tre_processed_off; - while (atomic_read(&lldev->pending_tre_count)) { - if (hidma_post_completed(lldev, tre_iterator, err_info, - err_code)) - break; - HIDMA_INCREMENT_ITERATOR(tre_iterator, HIDMA_TRE_SIZE, - tre_ring_size); - num_completed++; - } - tre_read_off = (lldev->tre_processed_off + - HIDMA_TRE_SIZE * num_completed); - - tre_read_off = tre_read_off % tre_ring_size; - - /* record the last processed tre offset */ - lldev->tre_processed_off = tre_read_off; + while (atomic_read(&lldev->pending_tre_count)) + hidma_handle_tre_completion(lldev, err_info, err_code); } static int hidma_ll_reset(struct hidma_lldev *lldev) -- 1.8.2.1
next prev parent reply other threads:[~2016-07-18 18:39 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 ` Sinan Kaya [this message] 2016-07-18 18:39 ` [PATCH 06/10] dmaengine: qcom_hidma: make error and success path common 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 ` [PATCH 08/10] dmaengine: qcom_hidma: bring out interrupt cause Sinan Kaya 2016-07-18 18:39 ` 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-7-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.