From: Baolin Wang <baolin.wang@linaro.org> To: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: Dan Williams <dan.j.williams@intel.com>, Vinod Koul <vkoul@kernel.org>, Thierry Reding <thierry.reding@gmail.com>, Jon Hunter <jonathanh@nvidia.com>, linux-tegra@vger.kernel.org, Shawn Guo <shawnguo@kernel.org>, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, Zubair.Kakakhel@imgtec.com, Wolfram Sang <wsa+renesas@sang-engineering.com>, jroedel@suse.de, Vincent Guittot <vincent.guittot@linaro.org>, dmaengine@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>, Linux ARM <linux-arm-kernel@lists.infradead.org> Subject: Re: [PATCH 1/8] dmaengine: Add matching device node validation in __dma_request_channel() Date: Mon, 20 May 2019 19:27:04 +0800 [thread overview] Message-ID: <CAMz4kuLokUGVXQaRt5aOBJOUQjsrPK74WGsif6Y1F7zwMvDXfA@mail.gmail.com> (raw) In-Reply-To: <42b84cfe-3281-7f4e-03cc-6ca126e16191@ti.com> On Tue, 7 May 2019 at 16:37, Peter Ujfalusi <peter.ujfalusi@ti.com> wrote: > > Hi, > > On 07/05/2019 9.09, Baolin Wang wrote: > > When user try to request one DMA channel by __dma_request_channel(), it won't > > validate if it is the correct DMA device to request, that will lead each DMA > > engine driver to validate the correct device node in their filter function > > if it is necessary. > > > > Thus we can add the matching device node validation in the DMA engine core, > > to remove all of device node validation in the drivers. > > I have picked this patch to my TI UDMA series and with > __dma_request_channel() it works as expected - picking the channel from > the correct DMA device. > > Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Thanks Peter. > > > > > Signed-off-by: Baolin Wang <baolin.wang@linaro.org> > > --- > > drivers/dma/dmaengine.c | 10 ++++++++-- > > drivers/dma/of-dma.c | 4 ++-- > > include/linux/dmaengine.h | 12 ++++++++---- > > 3 files changed, 18 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c > > index 3a11b10..610080c 100644 > > --- a/drivers/dma/dmaengine.c > > +++ b/drivers/dma/dmaengine.c > > @@ -641,11 +641,13 @@ struct dma_chan *dma_get_any_slave_channel(struct dma_device *device) > > * @mask: capabilities that the channel must satisfy > > * @fn: optional callback to disposition available channels > > * @fn_param: opaque parameter to pass to dma_filter_fn > > + * @np: device node to look for DMA channels > > * > > * Returns pointer to appropriate DMA channel on success or NULL. > > */ > > struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > > - dma_filter_fn fn, void *fn_param) > > + dma_filter_fn fn, void *fn_param, > > + struct device_node *np) > > { > > struct dma_device *device, *_d; > > struct dma_chan *chan = NULL; > > @@ -653,6 +655,10 @@ struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > > /* Find a channel */ > > mutex_lock(&dma_list_mutex); > > list_for_each_entry_safe(device, _d, &dma_device_list, global_node) { > > + /* Finds a DMA controller with matching device node */ > > + if (np && device->dev->of_node && np != device->dev->of_node) > > + continue; > > + > > chan = find_candidate(device, mask, fn, fn_param); > > if (!IS_ERR(chan)) > > break; > > @@ -769,7 +775,7 @@ struct dma_chan *dma_request_chan_by_mask(const dma_cap_mask_t *mask) > > if (!mask) > > return ERR_PTR(-ENODEV); > > > > - chan = __dma_request_channel(mask, NULL, NULL); > > + chan = __dma_request_channel(mask, NULL, NULL, NULL); > > if (!chan) { > > mutex_lock(&dma_list_mutex); > > if (list_empty(&dma_device_list)) > > diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c > > index 91fd395..6b43d04 100644 > > --- a/drivers/dma/of-dma.c > > +++ b/drivers/dma/of-dma.c > > @@ -316,8 +316,8 @@ struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec, > > if (count != 1) > > return NULL; > > > > - return dma_request_channel(info->dma_cap, info->filter_fn, > > - &dma_spec->args[0]); > > + return __dma_request_channel(&info->dma_cap, info->filter_fn, > > + &dma_spec->args[0], dma_spec->np); > > } > > EXPORT_SYMBOL_GPL(of_dma_simple_xlate); > > > > diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h > > index d49ec5c..504085b 100644 > > --- a/include/linux/dmaengine.h > > +++ b/include/linux/dmaengine.h > > @@ -1314,7 +1314,8 @@ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, > > enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); > > void dma_issue_pending_all(void); > > struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > > - dma_filter_fn fn, void *fn_param); > > + dma_filter_fn fn, void *fn_param, > > + struct device_node *np); > > struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name); > > > > struct dma_chan *dma_request_chan(struct device *dev, const char *name); > > @@ -1339,7 +1340,9 @@ static inline void dma_issue_pending_all(void) > > { > > } > > static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > > - dma_filter_fn fn, void *fn_param) > > + dma_filter_fn fn, > > + void *fn_param, > > + struct device_node *np) > > { > > return NULL; > > } > > @@ -1411,7 +1414,8 @@ static inline int dmaengine_desc_free(struct dma_async_tx_descriptor *desc) > > void dma_run_dependencies(struct dma_async_tx_descriptor *tx); > > struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); > > struct dma_chan *dma_get_any_slave_channel(struct dma_device *device); > > -#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) > > +#define dma_request_channel(mask, x, y) \ > > + __dma_request_channel(&(mask), x, y, NULL) > > #define dma_request_slave_channel_compat(mask, x, y, dev, name) \ > > __dma_request_slave_channel_compat(&(mask), x, y, dev, name) > > > > @@ -1429,6 +1433,6 @@ static inline int dmaengine_desc_free(struct dma_async_tx_descriptor *desc) > > if (!fn || !fn_param) > > return NULL; > > > > - return __dma_request_channel(mask, fn, fn_param); > > + return __dma_request_channel(mask, fn, fn_param, NULL); > > } > > #endif /* DMAENGINE_H */ > > > > - Péter > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki -- Baolin Wang Best Regards
WARNING: multiple messages have this Message-ID (diff)
From: Baolin Wang <baolin.wang@linaro.org> To: Peter Ujfalusi <peter.ujfalusi@ti.com> Cc: jroedel@suse.de, Vincent Guittot <vincent.guittot@linaro.org>, Zubair.Kakakhel@imgtec.com, dmaengine@vger.kernel.org, festevam@gmail.com, s.hauer@pengutronix.de, LKML <linux-kernel@vger.kernel.org>, Jon Hunter <jonathanh@nvidia.com>, Wolfram Sang <wsa+renesas@sang-engineering.com>, Vinod Koul <vkoul@kernel.org>, Thierry Reding <thierry.reding@gmail.com>, linux-imx@nxp.com, kernel@pengutronix.de, linux-tegra@vger.kernel.org, Dan Williams <dan.j.williams@intel.com>, Shawn Guo <shawnguo@kernel.org>, Linux ARM <linux-arm-kernel@lists.infradead.org> Subject: Re: [PATCH 1/8] dmaengine: Add matching device node validation in __dma_request_channel() Date: Mon, 20 May 2019 19:27:04 +0800 [thread overview] Message-ID: <CAMz4kuLokUGVXQaRt5aOBJOUQjsrPK74WGsif6Y1F7zwMvDXfA@mail.gmail.com> (raw) In-Reply-To: <42b84cfe-3281-7f4e-03cc-6ca126e16191@ti.com> On Tue, 7 May 2019 at 16:37, Peter Ujfalusi <peter.ujfalusi@ti.com> wrote: > > Hi, > > On 07/05/2019 9.09, Baolin Wang wrote: > > When user try to request one DMA channel by __dma_request_channel(), it won't > > validate if it is the correct DMA device to request, that will lead each DMA > > engine driver to validate the correct device node in their filter function > > if it is necessary. > > > > Thus we can add the matching device node validation in the DMA engine core, > > to remove all of device node validation in the drivers. > > I have picked this patch to my TI UDMA series and with > __dma_request_channel() it works as expected - picking the channel from > the correct DMA device. > > Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Thanks Peter. > > > > > Signed-off-by: Baolin Wang <baolin.wang@linaro.org> > > --- > > drivers/dma/dmaengine.c | 10 ++++++++-- > > drivers/dma/of-dma.c | 4 ++-- > > include/linux/dmaengine.h | 12 ++++++++---- > > 3 files changed, 18 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c > > index 3a11b10..610080c 100644 > > --- a/drivers/dma/dmaengine.c > > +++ b/drivers/dma/dmaengine.c > > @@ -641,11 +641,13 @@ struct dma_chan *dma_get_any_slave_channel(struct dma_device *device) > > * @mask: capabilities that the channel must satisfy > > * @fn: optional callback to disposition available channels > > * @fn_param: opaque parameter to pass to dma_filter_fn > > + * @np: device node to look for DMA channels > > * > > * Returns pointer to appropriate DMA channel on success or NULL. > > */ > > struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > > - dma_filter_fn fn, void *fn_param) > > + dma_filter_fn fn, void *fn_param, > > + struct device_node *np) > > { > > struct dma_device *device, *_d; > > struct dma_chan *chan = NULL; > > @@ -653,6 +655,10 @@ struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > > /* Find a channel */ > > mutex_lock(&dma_list_mutex); > > list_for_each_entry_safe(device, _d, &dma_device_list, global_node) { > > + /* Finds a DMA controller with matching device node */ > > + if (np && device->dev->of_node && np != device->dev->of_node) > > + continue; > > + > > chan = find_candidate(device, mask, fn, fn_param); > > if (!IS_ERR(chan)) > > break; > > @@ -769,7 +775,7 @@ struct dma_chan *dma_request_chan_by_mask(const dma_cap_mask_t *mask) > > if (!mask) > > return ERR_PTR(-ENODEV); > > > > - chan = __dma_request_channel(mask, NULL, NULL); > > + chan = __dma_request_channel(mask, NULL, NULL, NULL); > > if (!chan) { > > mutex_lock(&dma_list_mutex); > > if (list_empty(&dma_device_list)) > > diff --git a/drivers/dma/of-dma.c b/drivers/dma/of-dma.c > > index 91fd395..6b43d04 100644 > > --- a/drivers/dma/of-dma.c > > +++ b/drivers/dma/of-dma.c > > @@ -316,8 +316,8 @@ struct dma_chan *of_dma_simple_xlate(struct of_phandle_args *dma_spec, > > if (count != 1) > > return NULL; > > > > - return dma_request_channel(info->dma_cap, info->filter_fn, > > - &dma_spec->args[0]); > > + return __dma_request_channel(&info->dma_cap, info->filter_fn, > > + &dma_spec->args[0], dma_spec->np); > > } > > EXPORT_SYMBOL_GPL(of_dma_simple_xlate); > > > > diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h > > index d49ec5c..504085b 100644 > > --- a/include/linux/dmaengine.h > > +++ b/include/linux/dmaengine.h > > @@ -1314,7 +1314,8 @@ static inline enum dma_status dma_async_is_complete(dma_cookie_t cookie, > > enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); > > void dma_issue_pending_all(void); > > struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > > - dma_filter_fn fn, void *fn_param); > > + dma_filter_fn fn, void *fn_param, > > + struct device_node *np); > > struct dma_chan *dma_request_slave_channel(struct device *dev, const char *name); > > > > struct dma_chan *dma_request_chan(struct device *dev, const char *name); > > @@ -1339,7 +1340,9 @@ static inline void dma_issue_pending_all(void) > > { > > } > > static inline struct dma_chan *__dma_request_channel(const dma_cap_mask_t *mask, > > - dma_filter_fn fn, void *fn_param) > > + dma_filter_fn fn, > > + void *fn_param, > > + struct device_node *np) > > { > > return NULL; > > } > > @@ -1411,7 +1414,8 @@ static inline int dmaengine_desc_free(struct dma_async_tx_descriptor *desc) > > void dma_run_dependencies(struct dma_async_tx_descriptor *tx); > > struct dma_chan *dma_get_slave_channel(struct dma_chan *chan); > > struct dma_chan *dma_get_any_slave_channel(struct dma_device *device); > > -#define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y) > > +#define dma_request_channel(mask, x, y) \ > > + __dma_request_channel(&(mask), x, y, NULL) > > #define dma_request_slave_channel_compat(mask, x, y, dev, name) \ > > __dma_request_slave_channel_compat(&(mask), x, y, dev, name) > > > > @@ -1429,6 +1433,6 @@ static inline int dmaengine_desc_free(struct dma_async_tx_descriptor *desc) > > if (!fn || !fn_param) > > return NULL; > > > > - return __dma_request_channel(mask, fn, fn_param); > > + return __dma_request_channel(mask, fn, fn_param, NULL); > > } > > #endif /* DMAENGINE_H */ > > > > - Péter > > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. > Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki -- Baolin Wang Best Regards _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-05-20 11:27 UTC|newest] Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-07 6:09 [PATCH 0/8] Add matching device node validation in DMA engine core Baolin Wang 2019-05-07 6:09 ` Baolin Wang 2019-05-07 6:09 ` [PATCH 1/8] dmaengine: Add matching device node validation in __dma_request_channel() Baolin Wang 2019-05-07 6:09 ` Baolin Wang 2019-05-07 8:37 ` Peter Ujfalusi 2019-05-07 8:37 ` Peter Ujfalusi 2019-05-07 8:37 ` Peter Ujfalusi 2019-05-20 11:27 ` Baolin Wang [this message] 2019-05-20 11:27 ` Baolin Wang 2019-05-07 6:09 ` [PATCH 2/8] soc: tegra: fuse: Change to the correct __dma_request_channel() prototype Baolin Wang 2019-05-07 6:09 ` Baolin Wang 2019-05-08 15:15 ` Dmitry Osipenko 2019-05-08 15:15 ` Dmitry Osipenko 2019-05-09 1:44 ` Baolin Wang 2019-05-09 1:44 ` Baolin Wang 2019-05-07 6:09 ` [PATCH 3/8] dmaengine: imx-sdma: Let the core do the device node validation Baolin Wang 2019-05-07 6:09 ` Baolin Wang 2019-05-07 6:09 ` [PATCH 4/8] dmaengine: dma-jz4780: " Baolin Wang 2019-05-07 6:09 ` Baolin Wang 2019-05-07 6:09 ` [PATCH 5/8] dmaengine: mmp_tdma: " Baolin Wang 2019-05-07 6:09 ` Baolin Wang 2019-05-07 6:09 ` [PATCH 6/8] dmaengine: mxs-dma: " Baolin Wang 2019-05-07 6:09 ` Baolin Wang 2019-05-07 6:09 ` [PATCH 7/8] dmaengine: sh: rcar-dmac: " Baolin Wang 2019-05-07 6:09 ` Baolin Wang 2019-05-07 6:09 ` [PATCH 8/8] dmaengine: sh: usb-dmac: " Baolin Wang 2019-05-07 6:09 ` Baolin Wang
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=CAMz4kuLokUGVXQaRt5aOBJOUQjsrPK74WGsif6Y1F7zwMvDXfA@mail.gmail.com \ --to=baolin.wang@linaro.org \ --cc=Zubair.Kakakhel@imgtec.com \ --cc=dan.j.williams@intel.com \ --cc=dmaengine@vger.kernel.org \ --cc=festevam@gmail.com \ --cc=jonathanh@nvidia.com \ --cc=jroedel@suse.de \ --cc=kernel@pengutronix.de \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-imx@nxp.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-tegra@vger.kernel.org \ --cc=peter.ujfalusi@ti.com \ --cc=s.hauer@pengutronix.de \ --cc=shawnguo@kernel.org \ --cc=thierry.reding@gmail.com \ --cc=vincent.guittot@linaro.org \ --cc=vkoul@kernel.org \ --cc=wsa+renesas@sang-engineering.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.