On 19-10-20, 12:17, Peter Ujfalusi wrote:
> Hi Vinod,
>
> On 15/10/2020 10.31, Vinod Koul wrote:
> > dmaengine history has a non inclusive terminology of dmaengine slave, I
> > feel it is time to replace that.
> >
> > This moves APIs in dmaengine interface with replacement of slave
> > to peripheral which is an appropriate term for dmaengine peripheral
> > devices
> >
> > Since the change of name can break users, the new names have been added
> > with old APIs kept as macro define for new names. Once the users have
> > been migrated, these macros will be dropped.
> >
> > Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx>
> > ---
> > include/linux/dmaengine.h | 46 +++++++++++++++++++++++++++------------
> > 1 file changed, 32 insertions(+), 14 deletions(-)
> >
> > diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
> > index 04b993a5373c..d8dce3cdfdd4 100644
> > --- a/include/linux/dmaengine.h
> > +++ b/include/linux/dmaengine.h
> > @@ -923,6 +923,10 @@ struct dma_device {
> > struct dma_async_tx_descriptor *(*device_prep_dma_interrupt)(
> > struct dma_chan *chan, unsigned long flags);
> >
> > + struct dma_async_tx_descriptor *(*device_prep_peripheral_sg)(
> > + struct dma_chan *chan, struct scatterlist *sgl,
> > + unsigned int sg_len, enum dma_transfer_direction direction,
> > + unsigned long flags, void *context);
> > struct dma_async_tx_descriptor *(*device_prep_slave_sg)(
> > struct dma_chan *chan, struct scatterlist *sgl,
> > unsigned int sg_len, enum dma_transfer_direction direction,
> > @@ -959,8 +963,8 @@ struct dma_device {
> > #endif
> > };
> >
> > -static inline int dmaengine_slave_config(struct dma_chan *chan,
> > - struct dma_slave_config *config)
> > +static inline int dmaengine_peripheral_config(struct dma_chan *chan,
> > + struct dma_peripheral_config *config)
> > {
> > if (chan->device->device_config)
> > return chan->device->device_config(chan, config);
> > @@ -968,12 +972,16 @@ static inline int dmaengine_slave_config(struct dma_chan *chan,
> > return -ENOSYS;
> > }
> >
> > -static inline bool is_slave_direction(enum dma_transfer_direction direction)
> > +#define dmaengine_slave_config dmaengine_peripheral_config
> > +
> > +static inline bool is_peripheral_direction(enum dma_transfer_direction direction)
> > {
> > return (direction == DMA_MEM_TO_DEV) || (direction == DMA_DEV_TO_MEM);
> > }
> >
> > -static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
> > +#define is_slave_direction is_peripheral_direction
> > +
> > +static inline struct dma_async_tx_descriptor *dmaengine_prep_peripheral_single(
> > struct dma_chan *chan, dma_addr_t buf, size_t len,
> > enum dma_transfer_direction dir, unsigned long flags)
> > {
> > @@ -989,7 +997,9 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
> > dir, flags, NULL);
> > }
> >
> > -static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_sg(
> > +#define dmaengine_prep_slave_single dmaengine_prep_peripheral_single
> > +
> > +static inline struct dma_async_tx_descriptor *dmaengine_prep_peripheral_sg(
> > struct dma_chan *chan, struct scatterlist *sgl, unsigned int sg_len,
> > enum dma_transfer_direction dir, unsigned long flags)
> > {
> > @@ -1000,6 +1010,8 @@ static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_sg(
> > dir, flags, NULL);
> > }
> >
> > +#define dmaengine_prep_slave_sg dmaengine_prep_peripheral_sg
> > +
>
> If you do similar changes to _single() then DMA drivers can migrate to
> the new device_prep_peripheral_sg in their own pace:
Yes not sure why I missed that, I have updated this for all three APIs
which use .device_prep_slave_sg()
Thanks
--
~Vinod
