| Message ID | 20180530201249.26972-1-robert.jarzmik@free.fr (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
Robert Jarzmik <robert.jarzmik@free.fr> writes: > As what former drcmr -1 value meant, add a this as a default to each > channel, ie. that by default no requestor line is used. > > This is specifically used for network drivers smc91x and smc911x, and > needed for their port to slave maps. > > Cc: Arnd Bergmann <arnd@arndb.de> > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> > --- > Since v1: changed -1 to U32_MAX Hi Vinod, Could I have your ack on this so that I add this one to the dma slave map serie after the merge window is closed please ? Cheers. -- Robert > --- > drivers/dma/pxa_dma.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c > index 9505334f9c6e..b31c28b67ad3 100644 > --- a/drivers/dma/pxa_dma.c > +++ b/drivers/dma/pxa_dma.c > @@ -762,6 +762,8 @@ static void pxad_free_chan_resources(struct dma_chan *dchan) > dma_pool_destroy(chan->desc_pool); > chan->desc_pool = NULL; > > + chan->drcmr = U32_MAX; > + chan->prio = PXAD_PRIO_LOWEST; > } > > static void pxad_free_desc(struct virt_dma_desc *vd) > @@ -1386,6 +1388,9 @@ static int pxad_init_dmadev(struct platform_device *op, > c = devm_kzalloc(&op->dev, sizeof(*c), GFP_KERNEL); > if (!c) > return -ENOMEM; > + > + c->drcmr = U32_MAX; > + c->prio = PXAD_PRIO_LOWEST; > c->vc.desc_free = pxad_free_desc; > vchan_init(&c->vc, &pdev->slave); > init_waitqueue_head(&c->wq_state);
On 09-06-18, 14:43, Robert Jarzmik wrote: > Robert Jarzmik <robert.jarzmik@free.fr> writes: > > > As what former drcmr -1 value meant, add a this as a default to each > > channel, ie. that by default no requestor line is used. > > > > This is specifically used for network drivers smc91x and smc911x, and > > needed for their port to slave maps. > > > > Cc: Arnd Bergmann <arnd@arndb.de> > > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> > > --- > > Since v1: changed -1 to U32_MAX > Hi Vinod, > > Could I have your ack on this so that I add this one to the dma slave map serie > after the merge window is closed please ? Sorry I was thinking it would go thru dmaengine tree, please do indicate if that is not the case. Nevertheless Acked-by: Vinod Koul <vkoul@kernel.org>
Vinod Koul <vinod.koul@linaro.org> writes: > On 09-06-18, 14:43, Robert Jarzmik wrote: >> Robert Jarzmik <robert.jarzmik@free.fr> writes: >> >> > As what former drcmr -1 value meant, add a this as a default to each >> > channel, ie. that by default no requestor line is used. >> > >> > This is specifically used for network drivers smc91x and smc911x, and >> > needed for their port to slave maps. >> > >> > Cc: Arnd Bergmann <arnd@arndb.de> >> > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> >> > --- >> > Since v1: changed -1 to U32_MAX >> Hi Vinod, >> >> Could I have your ack on this so that I add this one to the dma slave map serie >> after the merge window is closed please ? > > Sorry I was thinking it would go thru dmaengine tree, please do > indicate if that is not the case. Nevertheless > > Acked-by: Vinod Koul <vkoul@kernel.org> Thanks. As this is a dependency to the serie, I'd rather take it, unless you insist, in which case I'll rely on the fact that it will hit 4.19 cycle. Cheers.
On 11-06-18, 21:54, Robert Jarzmik wrote: > Vinod Koul <vinod.koul@linaro.org> writes: > > > On 09-06-18, 14:43, Robert Jarzmik wrote: > >> Robert Jarzmik <robert.jarzmik@free.fr> writes: > >> > >> > As what former drcmr -1 value meant, add a this as a default to each > >> > channel, ie. that by default no requestor line is used. > >> > > >> > This is specifically used for network drivers smc91x and smc911x, and > >> > needed for their port to slave maps. > >> > > >> > Cc: Arnd Bergmann <arnd@arndb.de> > >> > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> > >> > --- > >> > Since v1: changed -1 to U32_MAX > >> Hi Vinod, > >> > >> Could I have your ack on this so that I add this one to the dma slave map serie > >> after the merge window is closed please ? > > > > Sorry I was thinking it would go thru dmaengine tree, please do > > indicate if that is not the case. Nevertheless > > > > Acked-by: Vinod Koul <vkoul@kernel.org> > Thanks. > > As this is a dependency to the serie, I'd rather take it, unless you insist, in > which case I'll rely on the fact that it will hit 4.19 cycle. It fine if you take, just that it helps to indicate the route to take for a patch :)
diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index 9505334f9c6e..b31c28b67ad3 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c @@ -762,6 +762,8 @@ static void pxad_free_chan_resources(struct dma_chan *dchan) dma_pool_destroy(chan->desc_pool); chan->desc_pool = NULL; + chan->drcmr = U32_MAX; + chan->prio = PXAD_PRIO_LOWEST; } static void pxad_free_desc(struct virt_dma_desc *vd) @@ -1386,6 +1388,9 @@ static int pxad_init_dmadev(struct platform_device *op, c = devm_kzalloc(&op->dev, sizeof(*c), GFP_KERNEL); if (!c) return -ENOMEM; + + c->drcmr = U32_MAX; + c->prio = PXAD_PRIO_LOWEST; c->vc.desc_free = pxad_free_desc; vchan_init(&c->vc, &pdev->slave); init_waitqueue_head(&c->wq_state);
As what former drcmr -1 value meant, add a this as a default to each channel, ie. that by default no requestor line is used. This is specifically used for network drivers smc91x and smc911x, and needed for their port to slave maps. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> --- Since v1: changed -1 to U32_MAX --- drivers/dma/pxa_dma.c | 5 +++++ 1 file changed, 5 insertions(+)