drivers/dma/ti/k3-udma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Currently, a local dma_cap_mask_t variable is used to store device
cap_mask within udma_of_xlate(). However, the DMA_PRIVATE flag in
the device cap_mask can get cleared when the last channel is released.
This can happen right after storing the cap_mask locally in
udma_of_xlate(), and subsequent dma_request_channel() can fail due to
mismatch in the cap_mask. Fix this by removing the local dma_cap_mask_t
variable and directly using the one from the dma_device structure.
Fixes: 25dcb5dd7b7c ("dmaengine: ti: New driver for K3 UDMA")
Cc: stable@vger.kernel.org
Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
Signed-off-by: Yemike Abhilash Chandra <y-abhilashchandra@ti.com>
Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
---
RFC: https://lore.kernel.org/all/20250117121728.203452-1-y-abhilashchandra@ti.com/
drivers/dma/ti/k3-udma.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
index 7ed1956b4642..c775a2284e86 100644
--- a/drivers/dma/ti/k3-udma.c
+++ b/drivers/dma/ti/k3-udma.c
@@ -4246,7 +4246,6 @@ static struct dma_chan *udma_of_xlate(struct of_phandle_args *dma_spec,
struct of_dma *ofdma)
{
struct udma_dev *ud = ofdma->of_dma_data;
- dma_cap_mask_t mask = ud->ddev.cap_mask;
struct udma_filter_param filter_param;
struct dma_chan *chan;
@@ -4278,7 +4277,7 @@ static struct dma_chan *udma_of_xlate(struct of_phandle_args *dma_spec,
}
}
- chan = __dma_request_channel(&mask, udma_dma_filter_fn, &filter_param,
+ chan = __dma_request_channel(&ud->ddev.cap_mask, udma_dma_filter_fn, &filter_param,
ofdma->of_node);
if (!chan) {
dev_err(ud->dev, "get channel fail in %s.\n", __func__);
--
2.34.1
On 2/3/2025 1:19 PM, Yemike Abhilash Chandra wrote:
> Currently, a local dma_cap_mask_t variable is used to store device
> cap_mask within udma_of_xlate(). However, the DMA_PRIVATE flag in
> the device cap_mask can get cleared when the last channel is released.
> This can happen right after storing the cap_mask locally in
> udma_of_xlate(), and subsequent dma_request_channel() can fail due to
> mismatch in the cap_mask. Fix this by removing the local dma_cap_mask_t
> variable and directly using the one from the dma_device structure.
>
> Fixes: 25dcb5dd7b7c ("dmaengine: ti: New driver for K3 UDMA")
> Cc: stable@vger.kernel.org
I don't see patch is sent to stable in cc , please check if you
suppressed cc list.
For rest
Reviewed-by: Udit Kumar <u-kumar1@ti.com>
> Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
> Signed-off-by: Yemike Abhilash Chandra <y-abhilashchandra@ti.com>
> Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
> ---
> RFC: https://lore.kernel.org/all/20250117121728.203452-1-y-abhilashchandra@ti.com/
>
> drivers/dma/ti/k3-udma.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
> index 7ed1956b4642..c775a2284e86 100644
> --- a/drivers/dma/ti/k3-udma.c
> +++ b/drivers/dma/ti/k3-udma.c
> @@ -4246,7 +4246,6 @@ static struct dma_chan *udma_of_xlate(struct of_phandle_args *dma_spec,
> struct of_dma *ofdma)
> {
> struct udma_dev *ud = ofdma->of_dma_data;
> - dma_cap_mask_t mask = ud->ddev.cap_mask;
> struct udma_filter_param filter_param;
> struct dma_chan *chan;
>
> @@ -4278,7 +4277,7 @@ static struct dma_chan *udma_of_xlate(struct of_phandle_args *dma_spec,
> }
> }
>
> - chan = __dma_request_channel(&mask, udma_dma_filter_fn, &filter_param,
> + chan = __dma_request_channel(&ud->ddev.cap_mask, udma_dma_filter_fn, &filter_param,
> ofdma->of_node);
> if (!chan) {
> dev_err(ud->dev, "get channel fail in %s.\n", __func__);
Hi Vinod,
On 03/02/25 19:02, Kumar, Udit wrote:
>
> On 2/3/2025 1:19 PM, Yemike Abhilash Chandra wrote:
>> Currently, a local dma_cap_mask_t variable is used to store device
>> cap_mask within udma_of_xlate(). However, the DMA_PRIVATE flag in
>> the device cap_mask can get cleared when the last channel is released.
>> This can happen right after storing the cap_mask locally in
>> udma_of_xlate(), and subsequent dma_request_channel() can fail due to
>> mismatch in the cap_mask. Fix this by removing the local dma_cap_mask_t
>> variable and directly using the one from the dma_device structure.
>>
>> Fixes: 25dcb5dd7b7c ("dmaengine: ti: New driver for K3 UDMA")
>> Cc: stable@vger.kernel.org
>
> I don't see patch is sent to stable in cc , please check if you
> suppressed cc list.
>
> For rest
>
> Reviewed-by: Udit Kumar <u-kumar1@ti.com>
>
May I kindly ask if this patch is in line to be merged for the 6.15 window?
I just wanted to check if you are waiting for anything.
Please let me know if you prefer me to resend the patch.
I can do that as well.
Thanks and Regards
Yemike Abhilash Chandra
>> Signed-off-by: Vaishnav Achath <vaishnav.a@ti.com>
>> Signed-off-by: Yemike Abhilash Chandra <y-abhilashchandra@ti.com>
>> Acked-by: Peter Ujfalusi <peter.ujfalusi@gmail.com>
>> ---
>> RFC:
>> https://lore.kernel.org/all/20250117121728.203452-1-y-abhilashchandra@ti.com/
>>
>> drivers/dma/ti/k3-udma.c | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/dma/ti/k3-udma.c b/drivers/dma/ti/k3-udma.c
>> index 7ed1956b4642..c775a2284e86 100644
>> --- a/drivers/dma/ti/k3-udma.c
>> +++ b/drivers/dma/ti/k3-udma.c
>> @@ -4246,7 +4246,6 @@ static struct dma_chan *udma_of_xlate(struct
>> of_phandle_args *dma_spec,
>> struct of_dma *ofdma)
>> {
>> struct udma_dev *ud = ofdma->of_dma_data;
>> - dma_cap_mask_t mask = ud->ddev.cap_mask;
>> struct udma_filter_param filter_param;
>> struct dma_chan *chan;
>> @@ -4278,7 +4277,7 @@ static struct dma_chan *udma_of_xlate(struct
>> of_phandle_args *dma_spec,
>> }
>> }
>> - chan = __dma_request_channel(&mask, udma_dma_filter_fn,
>> &filter_param,
>> + chan = __dma_request_channel(&ud->ddev.cap_mask,
>> udma_dma_filter_fn, &filter_param,
>> ofdma->of_node);
>> if (!chan) {
>> dev_err(ud->dev, "get channel fail in %s.\n", __func__);
© 2016 - 2026 Red Hat, Inc.