From: Viresh Kumar <viresh.kumar@st.com> To: <linus.walleij@linaro.org> Cc: <vinod.koul@intel.com>, <dan.j.williams@intel.com>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, <linux@arm.linux.org.uk>, <armando.visconti@st.com>, <shiraz.hashim@st.com>, <vipin.kumar@st.com>, <rajeev-dlh.kumar@st.com>, <deepak.sikri@st.com>, <vipulkumar.samar@st.com>, <amit.virdi@st.com>, <viresh.kumar@st.com>, <pratyush.anand@st.com>, <bhupesh.sharma@st.com>, <viresh.linux@gmail.com> Subject: [PATCH V2 14/20] dmaengine/amba-pl08x: Add prep_single_byte_llis() routine Date: Mon, 1 Aug 2011 15:07:24 +0530 [thread overview] Message-ID: <9d3d9fcd8c6268b6bfc85f0d150a46e60d7fc4c5.1312190881.git.viresh.kumar@st.com> (raw) In-Reply-To: <cover.1312190881.git.viresh.kumar@st.com> Code for creating single byte llis is present at several places. Create a routine to avoid code redundancy. Also, we don't need one lli per single byte transfer, we can have single lli to do all single byte transfer. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> --- drivers/dma/amba-pl08x.c | 61 +++++++++++++++++++++++++--------------------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index c29e55c..0bdf3b8 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -556,6 +556,14 @@ static void pl08x_fill_lli_for_desc(struct pl08x_lli_build_data *bd, bd->remainder -= len; } +static inline void prep_byte_width_lli(struct pl08x_lli_build_data *bd, + u32 *cctl, u32 len, int num_llis, size_t *total_bytes) +{ + *cctl = pl08x_cctl_bits(*cctl, 1, 1, len); + pl08x_fill_lli_for_desc(bd, num_llis, len, *cctl); + (*total_bytes) += len; +} + /* * This fills in the table of LLIs for the transfer descriptor * Note that we assume we never have to change the burst sizes @@ -567,7 +575,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, struct pl08x_bus_data *mbus, *sbus; struct pl08x_lli_build_data bd; int num_llis = 0; - u32 cctl; + u32 cctl, early_bytes = 0; size_t max_bytes_per_lli, total_bytes = 0; struct pl08x_lli *llis_va; @@ -616,29 +624,27 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, mbus == &bd.srcbus ? "src" : "dst", sbus == &bd.srcbus ? "src" : "dst"); - if (txd->len < mbus->buswidth) { - /* Less than a bus width available - send as single bytes */ - while (bd.remainder) { - dev_vdbg(&pl08x->adev->dev, - "%s single byte LLIs for a transfer of " - "less than a bus width (remain 0x%08x)\n", - __func__, bd.remainder); - cctl = pl08x_cctl_bits(cctl, 1, 1, 1); - pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl); - total_bytes++; - } - } else { - /* Make one byte LLIs until master bus is aligned */ - while ((mbus->addr) % (mbus->buswidth)) { - dev_vdbg(&pl08x->adev->dev, - "%s adjustment lli for less than bus width " - "(remain 0x%08x)\n", - __func__, bd.remainder); - cctl = pl08x_cctl_bits(cctl, 1, 1, 1); - pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl); - total_bytes++; - } + /* + * Send byte by byte for following cases + * - Less than a bus width available + * - until master bus is aligned + */ + if (bd.remainder < mbus->buswidth) + early_bytes = bd.remainder; + else if ((mbus->addr) % (mbus->buswidth)) { + early_bytes = mbus->buswidth - (mbus->addr) % (mbus->buswidth); + if ((bd.remainder - early_bytes) < mbus->buswidth) + early_bytes = bd.remainder; + } + + if (early_bytes) { + dev_vdbg(&pl08x->adev->dev, "%s byte width LLIs " + "(remain 0x%08x)\n", __func__, bd.remainder); + prep_byte_width_lli(&bd, &cctl, early_bytes, num_llis++, + &total_bytes); + } + if (bd.remainder) { /* * Master now aligned * - if slave is not then we must set its width down @@ -689,13 +695,12 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, /* * Send any odd bytes */ - while (bd.remainder) { - cctl = pl08x_cctl_bits(cctl, 1, 1, 1); + if (bd.remainder) { dev_vdbg(&pl08x->adev->dev, - "%s align with boundary, single odd byte (remain %zu)\n", + "%s align with boundary, send odd bytes (remain %zu)\n", __func__, bd.remainder); - pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl); - total_bytes++; + prep_byte_width_lli(&bd, &cctl, bd.remainder, + num_llis++, &total_bytes); } } -- 1.7.2.2
WARNING: multiple messages have this Message-ID (diff)
From: viresh.kumar@st.com (Viresh Kumar) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V2 14/20] dmaengine/amba-pl08x: Add prep_single_byte_llis() routine Date: Mon, 1 Aug 2011 15:07:24 +0530 [thread overview] Message-ID: <9d3d9fcd8c6268b6bfc85f0d150a46e60d7fc4c5.1312190881.git.viresh.kumar@st.com> (raw) In-Reply-To: <cover.1312190881.git.viresh.kumar@st.com> Code for creating single byte llis is present at several places. Create a routine to avoid code redundancy. Also, we don't need one lli per single byte transfer, we can have single lli to do all single byte transfer. Signed-off-by: Viresh Kumar <viresh.kumar@st.com> --- drivers/dma/amba-pl08x.c | 61 +++++++++++++++++++++++++--------------------- 1 files changed, 33 insertions(+), 28 deletions(-) diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c index c29e55c..0bdf3b8 100644 --- a/drivers/dma/amba-pl08x.c +++ b/drivers/dma/amba-pl08x.c @@ -556,6 +556,14 @@ static void pl08x_fill_lli_for_desc(struct pl08x_lli_build_data *bd, bd->remainder -= len; } +static inline void prep_byte_width_lli(struct pl08x_lli_build_data *bd, + u32 *cctl, u32 len, int num_llis, size_t *total_bytes) +{ + *cctl = pl08x_cctl_bits(*cctl, 1, 1, len); + pl08x_fill_lli_for_desc(bd, num_llis, len, *cctl); + (*total_bytes) += len; +} + /* * This fills in the table of LLIs for the transfer descriptor * Note that we assume we never have to change the burst sizes @@ -567,7 +575,7 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, struct pl08x_bus_data *mbus, *sbus; struct pl08x_lli_build_data bd; int num_llis = 0; - u32 cctl; + u32 cctl, early_bytes = 0; size_t max_bytes_per_lli, total_bytes = 0; struct pl08x_lli *llis_va; @@ -616,29 +624,27 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, mbus == &bd.srcbus ? "src" : "dst", sbus == &bd.srcbus ? "src" : "dst"); - if (txd->len < mbus->buswidth) { - /* Less than a bus width available - send as single bytes */ - while (bd.remainder) { - dev_vdbg(&pl08x->adev->dev, - "%s single byte LLIs for a transfer of " - "less than a bus width (remain 0x%08x)\n", - __func__, bd.remainder); - cctl = pl08x_cctl_bits(cctl, 1, 1, 1); - pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl); - total_bytes++; - } - } else { - /* Make one byte LLIs until master bus is aligned */ - while ((mbus->addr) % (mbus->buswidth)) { - dev_vdbg(&pl08x->adev->dev, - "%s adjustment lli for less than bus width " - "(remain 0x%08x)\n", - __func__, bd.remainder); - cctl = pl08x_cctl_bits(cctl, 1, 1, 1); - pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl); - total_bytes++; - } + /* + * Send byte by byte for following cases + * - Less than a bus width available + * - until master bus is aligned + */ + if (bd.remainder < mbus->buswidth) + early_bytes = bd.remainder; + else if ((mbus->addr) % (mbus->buswidth)) { + early_bytes = mbus->buswidth - (mbus->addr) % (mbus->buswidth); + if ((bd.remainder - early_bytes) < mbus->buswidth) + early_bytes = bd.remainder; + } + + if (early_bytes) { + dev_vdbg(&pl08x->adev->dev, "%s byte width LLIs " + "(remain 0x%08x)\n", __func__, bd.remainder); + prep_byte_width_lli(&bd, &cctl, early_bytes, num_llis++, + &total_bytes); + } + if (bd.remainder) { /* * Master now aligned * - if slave is not then we must set its width down @@ -689,13 +695,12 @@ static int pl08x_fill_llis_for_desc(struct pl08x_driver_data *pl08x, /* * Send any odd bytes */ - while (bd.remainder) { - cctl = pl08x_cctl_bits(cctl, 1, 1, 1); + if (bd.remainder) { dev_vdbg(&pl08x->adev->dev, - "%s align with boundary, single odd byte (remain %zu)\n", + "%s align with boundary, send odd bytes (remain %zu)\n", __func__, bd.remainder); - pl08x_fill_lli_for_desc(&bd, num_llis++, 1, cctl); - total_bytes++; + prep_byte_width_lli(&bd, &cctl, bd.remainder, + num_llis++, &total_bytes); } } -- 1.7.2.2
next prev parent reply other threads:[~2011-08-01 9:41 UTC|newest] Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top 2011-08-01 9:37 [PATCH V2 00/20] dmaengine/amba-pl08x updates Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 01/20] ARM: asm/pl080.h: Protect against multiple inclusion of header file Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 02/20] dmaengine/amba-pl08x: Resolve formatting issues Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 03/20] dmaengine/amba-pl08x: Rearrange inclusion of header files in ascending order Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:52 ` Sergei Shtylyov 2011-08-01 9:52 ` Sergei Shtylyov 2011-08-01 10:34 ` viresh kumar 2011-08-01 10:34 ` viresh kumar 2011-08-01 9:37 ` [PATCH V2 04/20] dmaengine/amba-pl08x: pass (*ptr) to sizeof() instead of (struct xyz) Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 05/20] dmaengine/amba-pl08x: Complete doc comment for struct pl08x_txd Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 06/20] dmaengine/amba-pl08x: Remove redundant comment and rewrite original Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 07/20] dmaengine/amba-pl08x: Changing few prints to dev_dbg from dev_info Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-04 8:28 ` Koul, Vinod 2011-08-04 8:28 ` Koul, Vinod 2011-08-04 9:25 ` viresh kumar 2011-08-04 9:25 ` viresh kumar 2011-08-04 8:53 ` Koul, Vinod 2011-08-04 8:53 ` Koul, Vinod 2011-08-01 9:37 ` [PATCH V2 08/20] dmaengine/amba-pl08x: support runtime PM Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 10:26 ` Russell King - ARM Linux 2011-08-01 10:26 ` Russell King - ARM Linux 2011-08-01 11:55 ` viresh kumar 2011-08-01 11:55 ` viresh kumar 2011-08-03 12:39 ` Russell King - ARM Linux 2011-08-03 12:39 ` Russell King - ARM Linux 2011-08-04 5:19 ` viresh kumar 2011-08-04 5:19 ` viresh kumar 2011-08-04 5:36 ` Koul, Vinod 2011-08-04 5:36 ` Koul, Vinod 2011-08-04 6:31 ` viresh kumar 2011-08-04 6:31 ` viresh kumar 2011-08-04 7:28 ` Koul, Vinod 2011-08-04 7:28 ` Koul, Vinod 2011-08-04 8:42 ` viresh kumar 2011-08-04 8:42 ` viresh kumar 2011-08-01 9:37 ` [PATCH V2 09/20] dmaengine/amba-pl08x: Simplify pl08x_ensure_on() Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 10/20] dmaengine/amba-pl08x: No need to check "ch->signal < 0" Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 11/20] dmaengine/amba-pl08x: Schedule tasklet in case of error interrupt Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 12/20] dmaengine/amba-pl08x: Get rid of pl08x_pre_boundary() Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 13/20] dmaengine/amba-pl08x: max_bytes_per_lli is TRANSFER_SIZE * src_width (not MIN(width)) Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar [this message] 2011-08-01 9:37 ` [PATCH V2 14/20] dmaengine/amba-pl08x: Add prep_single_byte_llis() routine Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 15/20] dmaengine/amba-pl08x: Align lli_len to max(src.width, dst.width) Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 16/20] dmaengine/amba-pl08x: Choose peripheral bus as master bus Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 17/20] dmaengine/amba-pl08x: Pass flow controller information with slave channel data Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 18/20] dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-04 10:27 ` viresh kumar 2011-08-04 10:27 ` viresh kumar 2011-08-01 9:37 ` [PATCH V2 19/20] dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 9:37 ` [PATCH V2 20/20] dmaengine/amba-pl08x: Call pl08x_free_txd() instead of calling kfree() directly Viresh Kumar 2011-08-01 9:37 ` Viresh Kumar 2011-08-01 11:56 ` [PATCH V3 08/20] dmaengine/amba-pl08x: support runtime PM Viresh Kumar 2011-08-01 11:56 ` Viresh Kumar 2011-08-04 8:52 ` Koul, Vinod 2011-08-04 8:52 ` Koul, Vinod 2011-08-04 9:41 ` viresh kumar 2011-08-04 9:41 ` viresh kumar
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=9d3d9fcd8c6268b6bfc85f0d150a46e60d7fc4c5.1312190881.git.viresh.kumar@st.com \ --to=viresh.kumar@st.com \ --cc=amit.virdi@st.com \ --cc=armando.visconti@st.com \ --cc=bhupesh.sharma@st.com \ --cc=dan.j.williams@intel.com \ --cc=deepak.sikri@st.com \ --cc=linus.walleij@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=pratyush.anand@st.com \ --cc=rajeev-dlh.kumar@st.com \ --cc=shiraz.hashim@st.com \ --cc=vinod.koul@intel.com \ --cc=vipin.kumar@st.com \ --cc=vipulkumar.samar@st.com \ --cc=viresh.linux@gmail.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.