From: Vinod Koul Subject: Re: [PATCH 07/39] dmaengine: ste_dma40: Only use addresses passed as configuration information Date: Thu, 16 May 2013 12:10:37 +0530 Message-ID: <20130516064036.GF14863@intel.com> References: <1368611522-9984-1-git-send-email-lee.jones@linaro.org> <1368611522-9984-8-git-send-email-lee.jones@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: linus.walleij@stericsson.com, arnd@arndb.de, srinidhi.kasagar@stericsson.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, balbi@ti.com, herbert@gondor.hengli.com.au, linux-crypto@vger.kernel.org, davem@davemloft.net, linux-arm-kernel@lists.infradead.org To: Lee Jones Return-path: Content-Disposition: inline In-Reply-To: <1368611522-9984-8-git-send-email-lee.jones@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org List-Id: linux-crypto.vger.kernel.org On Wed, May 15, 2013 at 10:51:30AM +0100, Lee Jones wrote: > Addresses are passed in from the client's driver via the invocation of > dmaengine_slave_config(), so there's no need to fetch them from platform > data too, hardwired or otherwise. This is a great step forward, as it > elevates a large burden from platform data in the way of a look-up > table. > > Signed-off-by: Lee Jones > --- Good code size reduction, always a good template for code improvements Acked-by: Vinod Koul -- ~Vinod > drivers/dma/ste_dma40.c | 51 ++++++++++------------------------------------- > 1 file changed, 11 insertions(+), 40 deletions(-) > > diff --git a/drivers/dma/ste_dma40.c b/drivers/dma/ste_dma40.c > index ba84df8..57a127e 100644 > --- a/drivers/dma/ste_dma40.c > +++ b/drivers/dma/ste_dma40.c > @@ -1774,22 +1774,6 @@ static int d40_validate_conf(struct d40_chan *d40c, > res = -EINVAL; > } > > - if (conf->dir == STEDMA40_MEM_TO_PERIPH && > - d40c->base->plat_data->dev_tx[conf->dev_type] == 0 && > - d40c->runtime_addr == 0) { > - chan_err(d40c, "Invalid TX channel address (%d)\n", > - conf->dev_type); > - res = -EINVAL; > - } > - > - if (conf->dir == STEDMA40_PERIPH_TO_MEM && > - d40c->base->plat_data->dev_rx[conf->dev_type] == 0 && > - d40c->runtime_addr == 0) { > - chan_err(d40c, "Invalid RX channel address (%d)\n", > - conf->dev_type); > - res = -EINVAL; > - } > - > if (conf->dir == STEDMA40_PERIPH_TO_PERIPH) { > /* > * DMAC HW supports it. Will be added to this driver, > @@ -2327,14 +2311,10 @@ d40_prep_sg(struct dma_chan *dchan, struct scatterlist *sg_src, > if (sg_next(&sg_src[sg_len - 1]) == sg_src) > desc->cyclic = true; > > - if (direction != DMA_TRANS_NONE) { > - dma_addr_t dev_addr = d40_get_dev_addr(chan, direction); > - > - if (direction == DMA_DEV_TO_MEM) > - src_dev_addr = dev_addr; > - else if (direction == DMA_MEM_TO_DEV) > - dst_dev_addr = dev_addr; > - } > + if (direction == DMA_DEV_TO_MEM) > + src_dev_addr = chan->runtime_addr; > + else if (direction == DMA_MEM_TO_DEV) > + dst_dev_addr = chan->runtime_addr; > > if (chan_is_logical(chan)) > ret = d40_prep_sg_log(chan, desc, sg_src, sg_dst, > @@ -2782,15 +2762,8 @@ static int d40_set_runtime_config(struct dma_chan *chan, > dst_maxburst = config->dst_maxburst; > > if (config->direction == DMA_DEV_TO_MEM) { > - dma_addr_t dev_addr_rx = > - d40c->base->plat_data->dev_rx[cfg->dev_type]; > - > config_addr = config->src_addr; > - if (dev_addr_rx) > - dev_dbg(d40c->base->dev, > - "channel has a pre-wired RX address %08x " > - "overriding with %08x\n", > - dev_addr_rx, config_addr); > + > if (cfg->dir != STEDMA40_PERIPH_TO_MEM) > dev_dbg(d40c->base->dev, > "channel was not configured for peripheral " > @@ -2805,15 +2778,8 @@ static int d40_set_runtime_config(struct dma_chan *chan, > dst_maxburst = src_maxburst; > > } else if (config->direction == DMA_MEM_TO_DEV) { > - dma_addr_t dev_addr_tx = > - d40c->base->plat_data->dev_tx[cfg->dev_type]; > - > config_addr = config->dst_addr; > - if (dev_addr_tx) > - dev_dbg(d40c->base->dev, > - "channel has a pre-wired TX address %08x " > - "overriding with %08x\n", > - dev_addr_tx, config_addr); > + > if (cfg->dir != STEDMA40_MEM_TO_PERIPH) > dev_dbg(d40c->base->dev, > "channel was not configured for memory " > @@ -2833,6 +2799,11 @@ static int d40_set_runtime_config(struct dma_chan *chan, > return -EINVAL; > } > > + if (config_addr <= 0) { > + dev_err(d40c->base->dev, "no address supplied\n"); > + return -EINVAL; > + } > + > if (src_maxburst * src_addr_width != dst_maxburst * dst_addr_width) { > dev_err(d40c->base->dev, > "src/dst width/maxburst mismatch: %d*%d != %d*%d\n", > -- > 1.7.10.4 >