* [PATCH 2/5] dmaengine: ste_dma40: Assign memcpy channels in the driver
2013-04-08 15:23 [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Lee Jones
@ 2013-04-08 15:23 ` Lee Jones
2013-04-08 16:13 ` Arnd Bergmann
2013-04-08 15:23 ` [PATCH 3/5] dmaengine: ste_dma40: Move default memcpy configs into " Lee Jones
` (4 subsequent siblings)
5 siblings, 1 reply; 17+ messages in thread
From: Lee Jones @ 2013-04-08 15:23 UTC (permalink / raw)
To: linux-arm-kernel
The channels reserved for memcpy are the same for all currently
supported platforms. With this in mind, we can ease the platform
data passing requirement by moving these assignments out from
platform code and place them directly into the driver.
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Per Forlin <per.forlin@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/devices-db8500.c | 12 ------------
drivers/dma/ste_dma40.c | 19 ++++++++++++++-----
include/linux/platform_data/dma-ste-dma40.h | 4 ----
3 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index a7c0e521..2a63c19 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -146,22 +146,10 @@ static const dma_addr_t dma40_rx_map[DB8500_DMA_NR_DEV] = {
[DB8500_DMA_DEV48_CAC1_RX] = U8500_CRYP1_BASE + CRYP1_RX_REG_OFFSET,
};
-/* Reserved event lines for memcpy only */
-static int dma40_memcpy_event[] = {
- DB8500_DMA_MEMCPY_TX_0,
- DB8500_DMA_MEMCPY_TX_1,
- DB8500_DMA_MEMCPY_TX_2,
- DB8500_DMA_MEMCPY_TX_3,
- DB8500_DMA_MEMCPY_TX_4,
- DB8500_DMA_MEMCPY_TX_5,
-};
-
static struct stedma40_platform_data dma40_plat_data = {
.dev_len = DB8500_DMA_NR_DEV,
.dev_rx = dma40_rx_map,
.dev_tx = dma40_tx_map,
- .memcpy = dma40_memcpy_event,
- .memcpy_len = ARRAY_SIZE(dma40_memcpy_event),
.memcpy_conf_phy = &dma40_memcpy_conf_phy,
.memcpy_conf_log = &dma40_memcpy_conf_log,
.disabled_channels = {-1},
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 35f97d2..3ae5f99 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -56,6 +56,16 @@
#define MAX(a, b) (((a) < (b)) ? (b) : (a))
+/* Reserved event lines for memcpy only. */
+static int dma40_memcpy_channels[] = {
+ DB8500_DMA_MEMCPY_TX_0,
+ DB8500_DMA_MEMCPY_TX_1,
+ DB8500_DMA_MEMCPY_TX_2,
+ DB8500_DMA_MEMCPY_TX_3,
+ DB8500_DMA_MEMCPY_TX_4,
+ DB8500_DMA_MEMCPY_TX_5,
+};
+
/**
* enum 40_command - The different commands and/or statuses.
*
@@ -2015,8 +2025,7 @@ static int d40_config_memcpy(struct d40_chan *d40c)
if (dma_has_cap(DMA_MEMCPY, cap) && !dma_has_cap(DMA_SLAVE, cap)) {
d40c->dma_cfg = *d40c->base->plat_data->memcpy_conf_log;
d40c->dma_cfg.src_dev_type = STEDMA40_DEV_SRC_MEMORY;
- d40c->dma_cfg.dst_dev_type = d40c->base->plat_data->
- memcpy[d40c->chan.chan_id];
+ d40c->dma_cfg.dst_dev_type = dma40_memcpy_channels[d40c->chan.chan_id];
} else if (dma_has_cap(DMA_MEMCPY, cap) &&
dma_has_cap(DMA_SLAVE, cap)) {
@@ -2928,7 +2937,7 @@ static int __init d40_dmaengine_init(struct d40_base *base,
}
d40_chan_init(base, &base->dma_memcpy, base->log_chans,
- base->num_log_chans, base->plat_data->memcpy_len);
+ base->num_log_chans, ARRAY_SIZE(dma40_memcpy_channels));
dma_cap_zero(base->dma_memcpy.cap_mask);
dma_cap_set(DMA_MEMCPY, base->dma_memcpy.cap_mask);
@@ -3216,7 +3225,7 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
num_log_chans++;
base = kzalloc(ALIGN(sizeof(struct d40_base), 4) +
- (num_phy_chans + num_log_chans + plat_data->memcpy_len) *
+ (num_phy_chans + num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) *
sizeof(struct d40_chan), GFP_KERNEL);
if (base == NULL) {
@@ -3277,7 +3286,7 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
if (!base->lookup_phy_chans)
goto failure;
- if (num_log_chans + plat_data->memcpy_len) {
+ if (num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) {
/*
* The max number of logical channels are event lines for all
* src devices and dst devices
diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h
index 4b78101..a808784 100644
--- a/include/linux/platform_data/dma-ste-dma40.h
+++ b/include/linux/platform_data/dma-ste-dma40.h
@@ -141,8 +141,6 @@ struct stedma40_chan_cfg {
* @dev_len: length of dev_tx and dev_rx
* @dev_tx: mapping between destination event line and io address
* @dev_rx: mapping between source event line and io address
- * @memcpy: list of memcpy event lines
- * @memcpy_len: length of memcpy
* @memcpy_conf_phy: default configuration of physical channel memcpy
* @memcpy_conf_log: default configuration of logical channel memcpy
* @disabled_channels: A vector, ending with -1, that marks physical channels
@@ -162,8 +160,6 @@ struct stedma40_platform_data {
u32 dev_len;
const dma_addr_t *dev_tx;
const dma_addr_t *dev_rx;
- int *memcpy;
- u32 memcpy_len;
struct stedma40_chan_cfg *memcpy_conf_phy;
struct stedma40_chan_cfg *memcpy_conf_log;
int disabled_channels[STEDMA40_MAX_PHYS];
--
1.7.10.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 3/5] dmaengine: ste_dma40: Move default memcpy configs into the driver
2013-04-08 15:23 [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Lee Jones
2013-04-08 15:23 ` [PATCH 2/5] dmaengine: ste_dma40: Assign memcpy channels in the driver Lee Jones
@ 2013-04-08 15:23 ` Lee Jones
2013-04-08 16:14 ` Arnd Bergmann
2013-04-08 15:23 ` [PATCH 4/5] dmaengine: ste_dma40: Only configure a channel during a configure request Lee Jones
` (3 subsequent siblings)
5 siblings, 1 reply; 17+ messages in thread
From: Lee Jones @ 2013-04-08 15:23 UTC (permalink / raw)
To: linux-arm-kernel
There are only two default memcpy configurations used for the DMA40
driver; one for physical memcpy and one for logical memcpy. Instead
of invariably passing the same configurations though platform data,
we're moving them into the driver instead.
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Per Forlin <per.forlin@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/mach-ux500/devices-db8500.c | 28 -----------------------
drivers/dma/ste_dma40.c | 32 +++++++++++++++++++++++++--
include/linux/platform_data/dma-ste-dma40.h | 4 ----
3 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 2a63c19..c7da6e1 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -42,32 +42,6 @@ static struct resource dma40_resources[] = {
}
};
-/* Default configuration for physcial memcpy */
-struct stedma40_chan_cfg dma40_memcpy_conf_phy = {
- .mode = STEDMA40_MODE_PHYSICAL,
- .dir = STEDMA40_MEM_TO_MEM,
-
- .src_info.data_width = STEDMA40_BYTE_WIDTH,
- .src_info.psize = STEDMA40_PSIZE_PHY_1,
- .src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,
-
- .dst_info.data_width = STEDMA40_BYTE_WIDTH,
- .dst_info.psize = STEDMA40_PSIZE_PHY_1,
- .dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,
-};
-/* Default configuration for logical memcpy */
-struct stedma40_chan_cfg dma40_memcpy_conf_log = {
- .dir = STEDMA40_MEM_TO_MEM,
-
- .src_info.data_width = STEDMA40_BYTE_WIDTH,
- .src_info.psize = STEDMA40_PSIZE_LOG_1,
- .src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,
-
- .dst_info.data_width = STEDMA40_BYTE_WIDTH,
- .dst_info.psize = STEDMA40_PSIZE_LOG_1,
- .dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,
-};
-
/*
* Mapping between destination event lines and physical device address.
* The event line is tied to a device and therefore the address is constant.
@@ -150,8 +124,6 @@ static struct stedma40_platform_data dma40_plat_data = {
.dev_len = DB8500_DMA_NR_DEV,
.dev_rx = dma40_rx_map,
.dev_tx = dma40_tx_map,
- .memcpy_conf_phy = &dma40_memcpy_conf_phy,
- .memcpy_conf_log = &dma40_memcpy_conf_log,
.disabled_channels = {-1},
};
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 3ae5f99..ecca492 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -66,6 +66,34 @@ static int dma40_memcpy_channels[] = {
DB8500_DMA_MEMCPY_TX_5,
};
+/* Default configuration for physcial memcpy */
+struct stedma40_chan_cfg dma40_memcpy_conf_phy = {
+ .mode = STEDMA40_MODE_PHYSICAL,
+ .dir = STEDMA40_MEM_TO_MEM,
+
+ .src_info.data_width = STEDMA40_BYTE_WIDTH,
+ .src_info.psize = STEDMA40_PSIZE_PHY_1,
+ .src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,
+
+ .dst_info.data_width = STEDMA40_BYTE_WIDTH,
+ .dst_info.psize = STEDMA40_PSIZE_PHY_1,
+ .dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,
+};
+
+/* Default configuration for logical memcpy */
+struct stedma40_chan_cfg dma40_memcpy_conf_log = {
+ .mode = STEDMA40_MODE_LOGICAL,
+ .dir = STEDMA40_MEM_TO_MEM,
+
+ .src_info.data_width = STEDMA40_BYTE_WIDTH,
+ .src_info.psize = STEDMA40_PSIZE_LOG_1,
+ .src_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,
+
+ .dst_info.data_width = STEDMA40_BYTE_WIDTH,
+ .dst_info.psize = STEDMA40_PSIZE_LOG_1,
+ .dst_info.flow_ctrl = STEDMA40_NO_FLOW_CTRL,
+};
+
/**
* enum 40_command - The different commands and/or statuses.
*
@@ -2023,13 +2051,13 @@ static int d40_config_memcpy(struct d40_chan *d40c)
dma_cap_mask_t cap = d40c->chan.device->cap_mask;
if (dma_has_cap(DMA_MEMCPY, cap) && !dma_has_cap(DMA_SLAVE, cap)) {
- d40c->dma_cfg = *d40c->base->plat_data->memcpy_conf_log;
+ d40c->dma_cfg = dma40_memcpy_conf_log;
d40c->dma_cfg.src_dev_type = STEDMA40_DEV_SRC_MEMORY;
d40c->dma_cfg.dst_dev_type = dma40_memcpy_channels[d40c->chan.chan_id];
} else if (dma_has_cap(DMA_MEMCPY, cap) &&
dma_has_cap(DMA_SLAVE, cap)) {
- d40c->dma_cfg = *d40c->base->plat_data->memcpy_conf_phy;
+ d40c->dma_cfg = dma40_memcpy_conf_phy;
} else {
chan_err(d40c, "No memcpy\n");
return -EINVAL;
diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h
index a808784..869c571 100644
--- a/include/linux/platform_data/dma-ste-dma40.h
+++ b/include/linux/platform_data/dma-ste-dma40.h
@@ -141,8 +141,6 @@ struct stedma40_chan_cfg {
* @dev_len: length of dev_tx and dev_rx
* @dev_tx: mapping between destination event line and io address
* @dev_rx: mapping between source event line and io address
- * @memcpy_conf_phy: default configuration of physical channel memcpy
- * @memcpy_conf_log: default configuration of logical channel memcpy
* @disabled_channels: A vector, ending with -1, that marks physical channels
* that are for different reasons not available for the driver.
* @soft_lli_chans: A vector, that marks physical channels will use LLI by SW
@@ -160,8 +158,6 @@ struct stedma40_platform_data {
u32 dev_len;
const dma_addr_t *dev_tx;
const dma_addr_t *dev_rx;
- struct stedma40_chan_cfg *memcpy_conf_phy;
- struct stedma40_chan_cfg *memcpy_conf_log;
int disabled_channels[STEDMA40_MAX_PHYS];
int *soft_lli_chans;
int num_of_soft_lli_chans;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 4/5] dmaengine: ste_dma40: Only configure a channel during a configure request
2013-04-08 15:23 [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Lee Jones
2013-04-08 15:23 ` [PATCH 2/5] dmaengine: ste_dma40: Assign memcpy channels in the driver Lee Jones
2013-04-08 15:23 ` [PATCH 3/5] dmaengine: ste_dma40: Move default memcpy configs into " Lee Jones
@ 2013-04-08 15:23 ` Lee Jones
2013-04-08 16:19 ` Arnd Bergmann
2013-04-09 7:11 ` [PATCH 4/5] dmaengine: ste_dma40: Do not configure channels during an channel allocation Lee Jones
2013-04-08 15:23 ` [PATCH 5/5] dmaengine: ste_dma40: Move LCPA allocation and real-time config Lee Jones
` (2 subsequent siblings)
5 siblings, 2 replies; 17+ messages in thread
From: Lee Jones @ 2013-04-08 15:23 UTC (permalink / raw)
To: linux-arm-kernel
According to the DMA documentation allocating a channel and configuring
it are two separate actions. By moving the configuration code into the
correct code path we lighten the burden on the information required to
successfully allocate a channel.
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Per Forlin <per.forlin@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/dma/ste_dma40.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index ecca492..3543ea4 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2471,16 +2471,10 @@ static int d40_alloc_chan_resources(struct dma_chan *chan)
}
pm_runtime_get_sync(d40c->base->dev);
- /* Fill in basic CFG register values */
- d40_phy_cfg(&d40c->dma_cfg, &d40c->src_def_cfg,
- &d40c->dst_def_cfg, chan_is_logical(d40c));
d40_set_prio_realtime(d40c);
if (chan_is_logical(d40c)) {
- d40_log_cfg(&d40c->dma_cfg,
- &d40c->log_def.lcsp1, &d40c->log_def.lcsp3);
-
if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM)
d40c->lcpa = d40c->base->lcpa_base +
d40c->dma_cfg.src_dev_type * D40_LCPA_CHAN_SIZE;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 4/5] dmaengine: ste_dma40: Only configure a channel during a configure request
2013-04-08 15:23 ` [PATCH 4/5] dmaengine: ste_dma40: Only configure a channel during a configure request Lee Jones
@ 2013-04-08 16:19 ` Arnd Bergmann
2013-04-09 7:11 ` [PATCH 4/5] dmaengine: ste_dma40: Do not configure channels during an channel allocation Lee Jones
1 sibling, 0 replies; 17+ messages in thread
From: Arnd Bergmann @ 2013-04-08 16:19 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 08 April 2013, Lee Jones wrote:
> According to the DMA documentation allocating a channel and configuring
> it are two separate actions. By moving the configuration code into the
> correct code path we lighten the burden on the information required to
> successfully allocate a channel.
>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <djbw@fb.com>
> Cc: Per Forlin <per.forlin@stericsson.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
I think the patch doesn't match the description. You only remove
the calls to configure the channel but don't add it in a proper
place.
Arnd
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/5] dmaengine: ste_dma40: Do not configure channels during an channel allocation
2013-04-08 15:23 ` [PATCH 4/5] dmaengine: ste_dma40: Only configure a channel during a configure request Lee Jones
2013-04-08 16:19 ` Arnd Bergmann
@ 2013-04-09 7:11 ` Lee Jones
2013-04-09 9:36 ` Arnd Bergmann
2013-04-09 10:28 ` Arnd Bergmann
1 sibling, 2 replies; 17+ messages in thread
From: Lee Jones @ 2013-04-09 7:11 UTC (permalink / raw)
To: linux-arm-kernel
According to the DMA documentation allocating a channel and configuring
it are two separate actions. By removing the configuration code from the
channel allocation path we lighten the burden on the information required to
successfully allocate a channel.
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Per Forlin <per.forlin@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/dma/ste_dma40.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index ecca492..3543ea4 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2471,16 +2471,10 @@ static int d40_alloc_chan_resources(struct dma_chan *chan)
}
pm_runtime_get_sync(d40c->base->dev);
- /* Fill in basic CFG register values */
- d40_phy_cfg(&d40c->dma_cfg, &d40c->src_def_cfg,
- &d40c->dst_def_cfg, chan_is_logical(d40c));
d40_set_prio_realtime(d40c);
if (chan_is_logical(d40c)) {
- d40_log_cfg(&d40c->dma_cfg,
- &d40c->log_def.lcsp1, &d40c->log_def.lcsp3);
-
if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM)
d40c->lcpa = d40c->base->lcpa_base +
d40c->dma_cfg.src_dev_type * D40_LCPA_CHAN_SIZE;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 4/5] dmaengine: ste_dma40: Do not configure channels during an channel allocation
2013-04-09 7:11 ` [PATCH 4/5] dmaengine: ste_dma40: Do not configure channels during an channel allocation Lee Jones
@ 2013-04-09 9:36 ` Arnd Bergmann
2013-04-09 10:04 ` Lee Jones
2013-04-09 10:28 ` Arnd Bergmann
1 sibling, 1 reply; 17+ messages in thread
From: Arnd Bergmann @ 2013-04-09 9:36 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 09 April 2013, Lee Jones wrote:
> According to the DMA documentation allocating a channel and configuring
> it are two separate actions. By removing the configuration code from the
> channel allocation path we lighten the burden on the information required to
> successfully allocate a channel.
Did you send out the first version again? The text is the same as before.
Arnd
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/5] dmaengine: ste_dma40: Do not configure channels during an channel allocation
2013-04-09 9:36 ` Arnd Bergmann
@ 2013-04-09 10:04 ` Lee Jones
0 siblings, 0 replies; 17+ messages in thread
From: Lee Jones @ 2013-04-09 10:04 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 09 Apr 2013, Arnd Bergmann wrote:
> On Tuesday 09 April 2013, Lee Jones wrote:
> > According to the DMA documentation allocating a channel and configuring
> > it are two separate actions. By removing the configuration code from the
> > channel allocation path we lighten the burden on the information required to
> > successfully allocate a channel.
>
> Did you send out the first version again? The text is the same as before.
No, the first commit message implied I'd moved the config code from
'allocate' to 'configure', whereas in reality I just removed it from
'allocate', as it's already in 'configure'.
This changelog is different (and more accurate) than the first.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 4/5] dmaengine: ste_dma40: Do not configure channels during an channel allocation
2013-04-09 7:11 ` [PATCH 4/5] dmaengine: ste_dma40: Do not configure channels during an channel allocation Lee Jones
2013-04-09 9:36 ` Arnd Bergmann
@ 2013-04-09 10:28 ` Arnd Bergmann
1 sibling, 0 replies; 17+ messages in thread
From: Arnd Bergmann @ 2013-04-09 10:28 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 09 April 2013, Lee Jones wrote:
> According to the DMA documentation allocating a channel and configuring
> it are two separate actions. By removing the configuration code from the
> channel allocation path we lighten the burden on the information required to
> successfully allocate a channel.
>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: Dan Williams <djbw@fb.com>
> Cc: Per Forlin <per.forlin@stericsson.com>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 5/5] dmaengine: ste_dma40: Move LCPA allocation and real-time config
2013-04-08 15:23 [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Lee Jones
` (2 preceding siblings ...)
2013-04-08 15:23 ` [PATCH 4/5] dmaengine: ste_dma40: Only configure a channel during a configure request Lee Jones
@ 2013-04-08 15:23 ` Lee Jones
2013-04-08 16:17 ` [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Arnd Bergmann
2013-04-15 10:47 ` Linus Walleij
5 siblings, 0 replies; 17+ messages in thread
From: Lee Jones @ 2013-04-08 15:23 UTC (permalink / raw)
To: linux-arm-kernel
There are various pieces of configuration which do not need to happen
until after a channel is allocated. Here we move some of these so they're
dealt with when it's time to configure the channel, rather than allocate
it.
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: Dan Williams <djbw@fb.com>
Cc: Per Forlin <per.forlin@stericsson.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
drivers/dma/ste_dma40.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 3543ea4..8a71bf6 100644
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -2472,18 +2472,6 @@ static int d40_alloc_chan_resources(struct dma_chan *chan)
pm_runtime_get_sync(d40c->base->dev);
- d40_set_prio_realtime(d40c);
-
- if (chan_is_logical(d40c)) {
- if (d40c->dma_cfg.dir == STEDMA40_PERIPH_TO_MEM)
- d40c->lcpa = d40c->base->lcpa_base +
- d40c->dma_cfg.src_dev_type * D40_LCPA_CHAN_SIZE;
- else
- d40c->lcpa = d40c->base->lcpa_base +
- d40c->dma_cfg.dst_dev_type *
- D40_LCPA_CHAN_SIZE + D40_LCPA_CHAN_DST_DELTA;
- }
-
dev_dbg(chan2dev(d40c), "allocated %s channel (phy %d%s)\n",
chan_is_logical(d40c) ? "logical" : "physical",
d40c->phy_chan->num,
@@ -2830,6 +2818,18 @@ static int d40_set_runtime_config(struct dma_chan *chan,
d40_phy_cfg(cfg, &d40c->src_def_cfg,
&d40c->dst_def_cfg, false);
+ d40_set_prio_realtime(d40c);
+
+ if (chan_is_logical(d40c)) {
+ if (cfg->dir == STEDMA40_PERIPH_TO_MEM)
+ d40c->lcpa = d40c->base->lcpa_base +
+ cfg->src_dev_type * D40_LCPA_CHAN_SIZE;
+ else
+ d40c->lcpa = d40c->base->lcpa_base +
+ cfg->dst_dev_type *
+ D40_LCPA_CHAN_SIZE + D40_LCPA_CHAN_DST_DELTA;
+ }
+
/* These settings will take precedence later */
d40c->runtime_addr = config_addr;
d40c->runtime_direction = config->direction;
--
1.7.10.4
^ permalink raw reply related [flat|nested] 17+ messages in thread* [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/
2013-04-08 15:23 [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Lee Jones
` (3 preceding siblings ...)
2013-04-08 15:23 ` [PATCH 5/5] dmaengine: ste_dma40: Move LCPA allocation and real-time config Lee Jones
@ 2013-04-08 16:17 ` Arnd Bergmann
2013-04-09 7:05 ` Lee Jones
2013-04-15 10:47 ` Linus Walleij
5 siblings, 1 reply; 17+ messages in thread
From: Arnd Bergmann @ 2013-04-08 16:17 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 08 April 2013, Lee Jones wrote:
> The pin names for DB8500 based platforms need to be moved out of
> ux500 platform data and into the new proper location in include/
> linux/platform_data/. This way we an reference them from other
> external locations, such as the main DMA50 driver(s).
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
Hmm, not sure about this one. The slave numbers are not really platform_data
and I think they should not be exposed to drivers. It makes sense to
keep the numbers for the memcpy channels in the driver itself as they
are hardwired in the driver, but the slave channels should stay in the
platform I think.
Arnd
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/
2013-04-08 16:17 ` [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Arnd Bergmann
@ 2013-04-09 7:05 ` Lee Jones
2013-04-09 9:35 ` Arnd Bergmann
0 siblings, 1 reply; 17+ messages in thread
From: Lee Jones @ 2013-04-09 7:05 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 08 Apr 2013, Arnd Bergmann wrote:
> On Monday 08 April 2013, Lee Jones wrote:
> > The pin names for DB8500 based platforms need to be moved out of
> > ux500 platform data and into the new proper location in include/
> > linux/platform_data/. This way we an reference them from other
> > external locations, such as the main DMA50 driver(s).
> >
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
>
> Hmm, not sure about this one. The slave numbers are not really platform_data
> and I think they should not be exposed to drivers. It makes sense to
> keep the numbers for the memcpy channels in the driver itself as they
> are hardwired in the driver, but the slave channels should stay in the
> platform I think.
Just looking at this again now. So you're right in that the main
reason for moving these out of platform code and into the system-wide
platform data area is for the memcpy channels. However, I'd prefer to
keep the channel allocation enum fully contiguous rather than
splitting them out.
The channels are only exposed to the one external driver which
includes them, and that's the D40 driver.
How against this move are you?
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/
2013-04-09 7:05 ` Lee Jones
@ 2013-04-09 9:35 ` Arnd Bergmann
0 siblings, 0 replies; 17+ messages in thread
From: Arnd Bergmann @ 2013-04-09 9:35 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 09 April 2013, Lee Jones wrote:
> On Mon, 08 Apr 2013, Arnd Bergmann wrote:
>
> > On Monday 08 April 2013, Lee Jones wrote:
> > > The pin names for DB8500 based platforms need to be moved out of
> > > ux500 platform data and into the new proper location in include/
> > > linux/platform_data/. This way we an reference them from other
> > > external locations, such as the main DMA50 driver(s).
> > >
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> >
> > Hmm, not sure about this one. The slave numbers are not really platform_data
> > and I think they should not be exposed to drivers. It makes sense to
> > keep the numbers for the memcpy channels in the driver itself as they
> > are hardwired in the driver, but the slave channels should stay in the
> > platform I think.
>
> Just looking at this again now. So you're right in that the main
> reason for moving these out of platform code and into the system-wide
> platform data area is for the memcpy channels. However, I'd prefer to
> keep the channel allocation enum fully contiguous rather than
> splitting them out.
>
> The channels are only exposed to the one external driver which
> includes them, and that's the D40 driver.
>
> How against this move are you?
I think it's a move in the wrong direction. If you think we should keep the
knowledge of which channels are used for memcpy outside of the driver,
I would prefer you to drop the the first two patches, which implies that
we will eventually pass that information using DT properties in order get
rid of the auxdata.
Arnd
^ permalink raw reply [flat|nested] 17+ messages in thread
* [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/
2013-04-08 15:23 [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Lee Jones
` (4 preceding siblings ...)
2013-04-08 16:17 ` [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/ Arnd Bergmann
@ 2013-04-15 10:47 ` Linus Walleij
2013-04-15 10:58 ` Lee Jones
5 siblings, 1 reply; 17+ messages in thread
From: Linus Walleij @ 2013-04-15 10:47 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Apr 8, 2013 at 5:23 PM, Lee Jones <lee.jones@linaro.org> wrote:
> The pin names for DB8500 based platforms need to be moved out of
"pin names" ???
> ux500 platform data and into the new proper location in include/
> linux/platform_data/. This way we an reference them from other
> external locations, such as the main DMA50 driver(s).
>
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
(...)
> rename arch/arm/mach-ux500/ste-dma40-db8500.h => include/linux/platform_data/dma-ste-dma40-db8500.h (98%)
Those are the DB8500 DMA channel definitions...
I will not interfere with the fruitful discussion with Arnd on this
subject though, I suspect he's right.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 17+ messages in thread* [PATCH 1/5] ARM: ux500: Move DMA40 platform data includes file out to include/
2013-04-15 10:47 ` Linus Walleij
@ 2013-04-15 10:58 ` Lee Jones
0 siblings, 0 replies; 17+ messages in thread
From: Lee Jones @ 2013-04-15 10:58 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, 15 Apr 2013, Linus Walleij wrote:
> On Mon, Apr 8, 2013 at 5:23 PM, Lee Jones <lee.jones@linaro.org> wrote:
>
> > The pin names for DB8500 based platforms need to be moved out of
>
> "pin names" ???
>
> > ux500 platform data and into the new proper location in include/
> > linux/platform_data/. This way we an reference them from other
> > external locations, such as the main DMA50 driver(s).
> >
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
>
> (...)
> > rename arch/arm/mach-ux500/ste-dma40-db8500.h => include/linux/platform_data/dma-ste-dma40-db8500.h (98%)
>
> Those are the DB8500 DMA channel definitions...
>
> I will not interfere with the fruitful discussion with Arnd on this
> subject though, I suspect he's right.
It's okay, I've since removed this patch.
--
Lee Jones
Linaro ST-Ericsson Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
^ permalink raw reply [flat|nested] 17+ messages in thread