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 14/18] dmaengine/amba-pl08x: Choose peripheral bus as master bus
Date: Fri, 29 Jul 2011 16:19:24 +0530 [thread overview]
Message-ID: <c1cb9cd2abc64b4efdc3648896324a1821fdba3e.1311936524.git.viresh.kumar@st.com> (raw)
In-Reply-To: <cover.1311936523.git.viresh.kumar@st.com>
When we have DMA transfers between peripheral and memory, then we shouldn't
reduce width of peripheral at all, as that may be a strict requirement. But we
can always reduce width of memory access, with some compromise in performance.
Thus, we must select peripheral as master and not memory.
Also this rearranges code to make it shorter.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
---
drivers/dma/amba-pl08x.c | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 44f317a..6b0ca26 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -492,34 +492,24 @@ struct pl08x_lli_build_data {
/*
* Autoselect a master bus to use for the transfer
* - prefers the destination bus if both available
- * - if fixed address on one bus the other will be chosen
+ * - prefers bus with fixed address (i.e. peripheral)
*/
static void pl08x_choose_master_bus(struct pl08x_lli_build_data *bd,
struct pl08x_bus_data **mbus, struct pl08x_bus_data **sbus, u32 cctl)
{
if (!(cctl & PL080_CONTROL_DST_INCR)) {
- *mbus = &bd->srcbus;
- *sbus = &bd->dstbus;
- } else if (!(cctl & PL080_CONTROL_SRC_INCR)) {
*mbus = &bd->dstbus;
*sbus = &bd->srcbus;
+ } else if (!(cctl & PL080_CONTROL_SRC_INCR)) {
+ *mbus = &bd->srcbus;
+ *sbus = &bd->dstbus;
} else {
- if (bd->dstbus.buswidth == 4) {
- *mbus = &bd->dstbus;
- *sbus = &bd->srcbus;
- } else if (bd->srcbus.buswidth == 4) {
- *mbus = &bd->srcbus;
- *sbus = &bd->dstbus;
- } else if (bd->dstbus.buswidth == 2) {
+ if (bd->dstbus.buswidth >= bd->srcbus.buswidth) {
*mbus = &bd->dstbus;
*sbus = &bd->srcbus;
- } else if (bd->srcbus.buswidth == 2) {
+ } else {
*mbus = &bd->srcbus;
*sbus = &bd->dstbus;
- } else {
- /* bd->srcbus.buswidth == 1 */
- *mbus = &bd->dstbus;
- *sbus = &bd->srcbus;
}
}
}
--
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 14/18] dmaengine/amba-pl08x: Choose peripheral bus as master bus
Date: Fri, 29 Jul 2011 16:19:24 +0530 [thread overview]
Message-ID: <c1cb9cd2abc64b4efdc3648896324a1821fdba3e.1311936524.git.viresh.kumar@st.com> (raw)
In-Reply-To: <cover.1311936523.git.viresh.kumar@st.com>
When we have DMA transfers between peripheral and memory, then we shouldn't
reduce width of peripheral at all, as that may be a strict requirement. But we
can always reduce width of memory access, with some compromise in performance.
Thus, we must select peripheral as master and not memory.
Also this rearranges code to make it shorter.
Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
---
drivers/dma/amba-pl08x.c | 22 ++++++----------------
1 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/drivers/dma/amba-pl08x.c b/drivers/dma/amba-pl08x.c
index 44f317a..6b0ca26 100644
--- a/drivers/dma/amba-pl08x.c
+++ b/drivers/dma/amba-pl08x.c
@@ -492,34 +492,24 @@ struct pl08x_lli_build_data {
/*
* Autoselect a master bus to use for the transfer
* - prefers the destination bus if both available
- * - if fixed address on one bus the other will be chosen
+ * - prefers bus with fixed address (i.e. peripheral)
*/
static void pl08x_choose_master_bus(struct pl08x_lli_build_data *bd,
struct pl08x_bus_data **mbus, struct pl08x_bus_data **sbus, u32 cctl)
{
if (!(cctl & PL080_CONTROL_DST_INCR)) {
- *mbus = &bd->srcbus;
- *sbus = &bd->dstbus;
- } else if (!(cctl & PL080_CONTROL_SRC_INCR)) {
*mbus = &bd->dstbus;
*sbus = &bd->srcbus;
+ } else if (!(cctl & PL080_CONTROL_SRC_INCR)) {
+ *mbus = &bd->srcbus;
+ *sbus = &bd->dstbus;
} else {
- if (bd->dstbus.buswidth == 4) {
- *mbus = &bd->dstbus;
- *sbus = &bd->srcbus;
- } else if (bd->srcbus.buswidth == 4) {
- *mbus = &bd->srcbus;
- *sbus = &bd->dstbus;
- } else if (bd->dstbus.buswidth == 2) {
+ if (bd->dstbus.buswidth >= bd->srcbus.buswidth) {
*mbus = &bd->dstbus;
*sbus = &bd->srcbus;
- } else if (bd->srcbus.buswidth == 2) {
+ } else {
*mbus = &bd->srcbus;
*sbus = &bd->dstbus;
- } else {
- /* bd->srcbus.buswidth == 1 */
- *mbus = &bd->dstbus;
- *sbus = &bd->srcbus;
}
}
}
--
1.7.2.2
next prev parent reply other threads:[~2011-07-29 11:16 UTC|newest]
Thread overview: 204+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-29 10:49 [PATCH 00/18] dmaengine/amba-pl08x updates Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 10:49 ` [PATCH 01/18] ARM: asm/pl080.h: Protect against multiple inclusion of header file Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-30 22:16 ` Linus Walleij
2011-07-30 22:16 ` Linus Walleij
2011-07-29 10:49 ` [PATCH 02/18] dmaengine/amba-pl08x: Resolve formatting issues Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 11:00 ` Russell King - ARM Linux
2011-07-29 11:00 ` Russell King - ARM Linux
2011-07-29 11:21 ` viresh kumar
2011-07-29 11:21 ` viresh kumar
2011-07-29 12:05 ` Koul, Vinod
2011-07-29 12:05 ` Koul, Vinod
2011-07-29 15:25 ` viresh kumar
2011-07-29 15:25 ` viresh kumar
2011-07-29 10:49 ` [PATCH 03/18] dmaengine/amba-pl08x: Complete doc comment for struct pl08x_txd Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 10:49 ` [PATCH 04/18] dmaengine/amba-pl08x: Remove redundant comment and rewrite original Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 12:09 ` Koul, Vinod
2011-07-29 12:09 ` Koul, Vinod
2011-07-29 15:47 ` viresh kumar
2011-07-29 15:47 ` viresh kumar
2011-07-29 16:34 ` Russell King - ARM Linux
2011-07-29 16:34 ` Russell King - ARM Linux
2011-07-30 22:32 ` Linus Walleij
2011-07-30 22:32 ` Linus Walleij
2011-07-30 22:57 ` Russell King - ARM Linux
2011-07-30 22:57 ` Russell King - ARM Linux
2011-07-30 23:37 ` Linus Walleij
2011-07-30 23:37 ` Linus Walleij
2011-07-31 5:51 ` viresh kumar
2011-07-31 5:51 ` viresh kumar
2011-07-31 9:06 ` Russell King - ARM Linux
2011-07-31 9:06 ` Russell King - ARM Linux
2011-07-29 10:49 ` [PATCH 05/18] dmaengine/amba-pl08x: Changing few prints to dev_dbg from dev_info Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-30 22:34 ` Linus Walleij
2011-07-30 22:34 ` Linus Walleij
2011-07-29 10:49 ` [PATCH 06/18] dmaengine/amba-pl08x: Simplify pl08x_ensure_on() Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-30 22:36 ` Linus Walleij
2011-07-30 22:36 ` Linus Walleij
2011-07-29 10:49 ` [PATCH 07/18] dmaengine/amba-pl08x: Enable/Disable amba_pclk with channel requests Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-30 12:07 ` Russell King - ARM Linux
2011-07-30 12:07 ` Russell King - ARM Linux
2011-07-30 13:05 ` Russell King - ARM Linux
2011-07-30 13:05 ` Russell King - ARM Linux
2011-07-30 23:53 ` Linus Walleij
2011-07-30 23:53 ` Linus Walleij
2011-07-31 0:04 ` Linus Walleij
2011-07-31 0:04 ` Linus Walleij
2011-07-31 17:04 ` Russell King - ARM Linux
2011-07-31 17:04 ` Russell King - ARM Linux
2011-08-02 9:05 ` Linus Walleij
2011-08-02 9:05 ` Linus Walleij
2011-08-03 12:55 ` Russell King - ARM Linux
2011-08-03 12:55 ` Russell King - ARM Linux
2011-08-09 19:50 ` Linus Walleij
2011-08-09 19:50 ` Linus Walleij
2011-07-29 10:49 ` [PATCH 08/18] dmaengine/amba-pl08x: No need to check "ch->signal < 0" Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-31 0:09 ` Linus Walleij
2011-07-31 0:09 ` Linus Walleij
2011-07-29 10:49 ` [PATCH 09/18] dmaengine/amba-pl08x: Schedule tasklet in case of error interrupt Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 12:16 ` Koul, Vinod
2011-07-29 12:16 ` Koul, Vinod
2011-07-29 13:02 ` Russell King - ARM Linux
2011-07-29 13:02 ` Russell King - ARM Linux
2011-07-29 15:30 ` viresh kumar
2011-07-29 15:30 ` viresh kumar
2011-08-04 4:25 ` Koul, Vinod
2011-08-04 4:25 ` Koul, Vinod
2011-08-04 5:54 ` viresh kumar
2011-08-04 5:54 ` viresh kumar
2011-08-04 5:32 ` Koul, Vinod
2011-08-04 5:32 ` Koul, Vinod
2011-08-14 8:29 ` Russell King - ARM Linux
2011-08-14 8:29 ` Russell King - ARM Linux
2011-07-31 0:19 ` Linus Walleij
2011-07-31 0:19 ` Linus Walleij
2011-07-31 5:33 ` viresh kumar
2011-07-31 5:33 ` viresh kumar
2011-07-29 10:49 ` [PATCH 10/18] dmaengine/amba-pl08x: Get rid of pl08x_pre_boundary() Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 11:05 ` Russell King - ARM Linux
2011-07-29 11:05 ` Russell King - ARM Linux
2011-07-29 12:32 ` Koul, Vinod
2011-07-29 12:32 ` Koul, Vinod
2011-07-29 15:58 ` viresh kumar
2011-07-29 15:58 ` viresh kumar
2011-07-29 12:19 ` Koul, Vinod
2011-07-29 12:19 ` Koul, Vinod
2011-07-29 15:40 ` viresh kumar
2011-07-29 15:40 ` viresh kumar
2011-07-31 0:24 ` Linus Walleij
2011-07-31 0:24 ` Linus Walleij
2011-07-29 10:49 ` [PATCH 11/18] dmaengine/amba-pl08x: max_bytes_per_lli is TRANSFER_SIZE * src_width (not MIN(width)) Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-31 0:27 ` Linus Walleij
2011-07-31 0:27 ` Linus Walleij
2011-07-31 9:09 ` Russell King - ARM Linux
2011-07-31 9:09 ` Russell King - ARM Linux
2011-07-29 10:49 ` [PATCH 12/18] dmaengine/amba-pl08x: Add prep_single_byte_llis() routine Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 11:06 ` Russell King - ARM Linux
2011-07-29 11:06 ` Russell King - ARM Linux
2011-07-29 11:30 ` viresh kumar
2011-07-29 11:30 ` viresh kumar
2011-07-29 10:49 ` [PATCH 13/18] dmaengine/amba-pl08x: Align lli_len to max(src.width, dst.width) Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 12:43 ` Koul, Vinod
2011-07-29 12:43 ` Koul, Vinod
2011-07-29 15:39 ` viresh kumar
2011-07-29 15:39 ` viresh kumar
2011-07-31 0:30 ` Linus Walleij
2011-07-31 0:30 ` Linus Walleij
2011-07-29 10:49 ` Viresh Kumar [this message]
2011-07-29 10:49 ` [PATCH 14/18] dmaengine/amba-pl08x: Choose peripheral bus as master bus Viresh Kumar
2011-07-31 0:36 ` Linus Walleij
2011-07-31 0:36 ` Linus Walleij
2011-07-29 10:49 ` [PATCH 15/18] dmaengine/amba-pl08x: Pass flow controller information with slave channel data Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 11:10 ` Russell King - ARM Linux
2011-07-29 11:10 ` Russell King - ARM Linux
2011-07-29 11:31 ` viresh kumar
2011-07-29 11:31 ` viresh kumar
2011-07-31 0:40 ` Linus Walleij
2011-07-31 0:40 ` Linus Walleij
2011-07-31 5:36 ` viresh kumar
2011-07-31 5:36 ` viresh kumar
2011-07-29 10:49 ` [PATCH 16/18] dmaengine/amba-pl08x: Add support for sg len greater than one for slave transfers Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-31 0:41 ` Linus Walleij
2011-07-31 0:41 ` Linus Walleij
2011-08-14 8:36 ` Russell King - ARM Linux
2011-08-14 8:36 ` Russell King - ARM Linux
2011-08-15 10:11 ` Linus Walleij
2011-08-15 10:11 ` Linus Walleij
2011-08-18 8:38 ` Viresh Kumar
2011-08-18 8:38 ` Viresh Kumar
2011-08-21 8:33 ` Russell King - ARM Linux
2011-08-21 8:33 ` Russell King - ARM Linux
2011-08-23 4:22 ` Viresh Kumar
2011-08-23 4:22 ` Viresh Kumar
2011-08-23 5:20 ` Koul, Vinod
2011-08-23 5:20 ` Koul, Vinod
2011-08-26 3:41 ` Viresh Kumar
2011-08-26 3:41 ` Viresh Kumar
2011-08-26 8:03 ` Linus Walleij
2011-08-26 8:03 ` Linus Walleij
2011-08-26 8:51 ` Viresh Kumar
2011-08-26 8:51 ` Viresh Kumar
2011-09-01 10:07 ` Viresh Kumar
2011-09-01 10:07 ` Viresh Kumar
2011-09-07 18:42 ` Koul, Vinod
2011-09-07 18:42 ` Koul, Vinod
2011-09-07 23:01 ` Linus Walleij
2011-09-07 23:01 ` Linus Walleij
2011-09-08 3:50 ` Viresh Kumar
2011-09-08 3:50 ` Viresh Kumar
2011-09-08 10:29 ` Linus Walleij
2011-09-08 10:29 ` Linus Walleij
2011-09-08 21:54 ` [PATCH 16/18] dmaengine/ambhe rest oa-pl08x: " Vinod Koul
2011-09-08 21:54 ` Vinod Koul
2011-09-20 6:19 ` Vinod Koul
2011-09-20 6:19 ` Vinod Koul
2011-09-20 6:27 ` Viresh Kumar
2011-09-20 6:27 ` Viresh Kumar
2011-09-20 8:08 ` Vinod Koul
2011-09-20 8:08 ` Vinod Koul
2011-07-29 10:49 ` [PATCH 17/18] dmaengine/amba-pl08x: Check txd->llis_va before freeing dma_pool Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-31 0:44 ` Linus Walleij
2011-07-31 0:44 ` Linus Walleij
2011-07-29 10:49 ` [PATCH 18/18] dmaengine/amba-pl08x: Call pl08x_free_txd() instead of calling kfree() directly Viresh Kumar
2011-07-29 10:49 ` Viresh Kumar
2011-07-29 11:15 ` Russell King - ARM Linux
2011-07-29 11:15 ` Russell King - ARM Linux
2011-07-29 11:38 ` viresh kumar
2011-07-29 11:38 ` viresh kumar
2011-07-31 0:45 ` Linus Walleij
2011-07-31 0:45 ` Linus Walleij
2011-07-31 5:39 ` viresh kumar
2011-07-31 5:39 ` viresh kumar
2011-07-29 10:57 ` [PATCH 00/18] dmaengine/amba-pl08x updates Russell King - ARM Linux
2011-07-29 10:57 ` Russell King - ARM Linux
2011-07-29 11:14 ` viresh kumar
2011-07-29 11:14 ` viresh kumar
2011-07-29 11:19 ` Russell King - ARM Linux
2011-07-29 11:19 ` Russell King - ARM Linux
2011-07-29 11:23 ` viresh kumar
2011-07-29 11:23 ` viresh kumar
2011-07-29 12:43 ` Russell King - ARM Linux
2011-07-29 12:43 ` Russell King - ARM Linux
2011-07-29 15:22 ` viresh kumar
2011-07-29 15:22 ` viresh kumar
2011-07-29 11:58 ` Koul, Vinod
2011-07-29 11:58 ` Koul, Vinod
2011-08-01 5:30 ` viresh kumar
2011-08-01 5:30 ` 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=c1cb9cd2abc64b4efdc3648896324a1821fdba3e.1311936524.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: link
Be 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.