dmaengine: ste_dma40: Calculate number of logical channels from physical ones

This change will cost ~25KB of memory, but it's worth the trade-off,
as it removes a great deal of overhead. It means that instead of only
allocating memory for the logical channels in use, it does so for all
available ones, which is 32 per physical channel. However, this now
means we can remove some platform data and we don't have to worry
about adding vendor specific variables to Device Tree.

Acked-by: Vinod Koul <vnod.koul@intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 7989c564e47a36febefda4eb1c9af4516c611fd4..130f3d9917e7c257a461fdeaa0a7c129f28ae820 100644 (file)
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -121,7 +121,6 @@ static const dma_addr_t dma40_rx_map[DB8500_DMA_NR_DEV] = {
 };
 
 static struct stedma40_platform_data dma40_plat_data = {
-       .dev_len = DB8500_DMA_NR_DEV,
        .dev_rx = dma40_rx_map,
        .dev_tx = dma40_tx_map,
        .disabled_channels = {-1},

diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c
index 367ef15a3cd8094d7bd0e3b5661aa30e7653ced0..f25c9ccf28e844be13c98125764cc86d1d15c9f4 100644 (file)
--- a/drivers/dma/ste_dma40.c
+++ b/drivers/dma/ste_dma40.c
@@ -45,6 +45,9 @@
 #define D40_LCLA_LINK_PER_EVENT_GRP 128
 #define D40_LCLA_END D40_LCLA_LINK_PER_EVENT_GRP
 
+/* Max number of logical channels per physical channel */
+#define D40_MAX_LOG_CHAN_PER_PHY 32
+
 /* Attempts before giving up to trying to get pages that are aligned */
 #define MAX_LCLA_ALLOC_ATTEMPTS 256
 
@@ -3210,6 +3213,8 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
        else
                num_phy_chans = 4 * (readl(virtbase + D40_DREG_ICFG) & 0x7) + 4;
 
+       num_log_chans = num_phy_chans * D40_MAX_LOG_CHAN_PER_PHY;
+
        dev_info(&pdev->dev, "hardware revision: %d @ 0x%x with %d physical channels\n",
                 rev, res->start, num_phy_chans);
 
@@ -3219,15 +3224,6 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
                goto failure;
        }
 
-       /* Count the number of logical channels in use */
-       for (i = 0; i < plat_data->dev_len; i++)
-               if (plat_data->dev_rx[i] != 0)
-                       num_log_chans++;
-
-       for (i = 0; i < plat_data->dev_len; i++)
-               if (plat_data->dev_tx[i] != 0)
-                       num_log_chans++;
-
        base = kzalloc(ALIGN(sizeof(struct d40_base), 4) +
                       (num_phy_chans + num_log_chans + ARRAY_SIZE(dma40_memcpy_channels)) *
                       sizeof(struct d40_chan), GFP_KERNEL);
@@ -3295,7 +3291,7 @@ static struct d40_base * __init d40_hw_detect_init(struct platform_device *pdev)
                 * The max number of logical channels are event lines for all
                 * src devices and dst devices
                 */
-               base->lookup_log_chans = kzalloc(plat_data->dev_len * 2 *
+               base->lookup_log_chans = kzalloc(num_log_chans *
                                                 sizeof(struct d40_chan *),
                                                 GFP_KERNEL);
                if (!base->lookup_log_chans)

diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h
index 9e42a67d0cd598552d5bc0ad92527e7fc51e14ac..c54af61c9e48bc938b0076489169842fd6b2e467 100644 (file)
--- a/include/linux/platform_data/dma-ste-dma40.h
+++ b/include/linux/platform_data/dma-ste-dma40.h
@@ -136,7 +136,6 @@ struct stedma40_chan_cfg {
 /**
  * struct stedma40_platform_data - Configuration struct for the dma device.
  *
- * @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
  * @disabled_channels: A vector, ending with -1, that marks physical channels
@@ -153,7 +152,6 @@ struct stedma40_chan_cfg {
  * for 'multiple of 4' channels, like 8.
  */
 struct stedma40_platform_data {
-       u32                              dev_len;
        const dma_addr_t                *dev_tx;
        const dma_addr_t                *dev_rx;
        int                              disabled_channels[STEDMA40_MAX_PHYS];