2023-09-19 02:33:27

by Kaiwei Liu

Subject: [PATCH V2] dmaengine: sprd: add dma mask interface in probe

In the probe of DMA, the default addressing range is 32 bits,
while the actual DMA hardware addressing range used is 36 bits.
So add dma_set_mask_and_coherent function to match DMA
addressing range.

Signed-off-by: Kaiwei Liu <[email protected]>
---
Change in V2:
-Change subject line.
-Modify error message to make it more readable.
---
drivers/dma/sprd-dma.c | 9 +++++++++
1 file changed, 9 insertions(+)

diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c
index 20c3cb1ef2f5..0e146550dfbb 100644
--- a/drivers/dma/sprd-dma.c
+++ b/drivers/dma/sprd-dma.c
@@ -1115,6 +1115,15 @@ static int sprd_dma_probe(struct platform_device *pdev)
u32 chn_count;
int ret, i;

+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(36));
+ if (ret) {
+ ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
+ if (ret) {
+ dev_err(&pdev->dev, "dma_set_mask_and_coherent failed\n");
+ return ret;
+ }
+ }
+
/* Parse new and deprecated dma-channels properties */
ret = device_property_read_u32(&pdev->dev, "dma-channels", &chn_count);
if (ret)
--
2.17.1

2023-09-19 03:23:33

by Baolin Wang

Subject: Re: [PATCH V2] dmaengine: sprd: add dma mask interface in probe

On 9/19/2023 10:30 AM, Kaiwei Liu wrote:
> In the probe of DMA, the default addressing range is 32 bits,
> while the actual DMA hardware addressing range used is 36 bits.
> So add dma_set_mask_and_coherent function to match DMA
> addressing range.
>
> Signed-off-by: Kaiwei Liu <[email protected]>
> ---
> Change in V2:
> -Change subject line.
> -Modify error message to make it more readable.

Have you modified the error message against v1? I did not see it.

https://lore.kernel.org/all/[email protected]/

> ---
> drivers/dma/sprd-dma.c | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c
> index 20c3cb1ef2f5..0e146550dfbb 100644
> --- a/drivers/dma/sprd-dma.c
> +++ b/drivers/dma/sprd-dma.c
> @@ -1115,6 +1115,15 @@ static int sprd_dma_probe(struct platform_device *pdev)
> u32 chn_count;
> int ret, i;
>
> + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(36));
> + if (ret) {
> + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> + if (ret) {
> + dev_err(&pdev->dev, "dma_set_mask_and_coherent failed\n");
> + return ret;
> + }
> + }
> +
> /* Parse new and deprecated dma-channels properties */
> ret = device_property_read_u32(&pdev->dev, "dma-channels", &chn_count);
> if (ret)

2023-09-19 12:25:52

by liu kaiwei

Subject: Re: [PATCH V2] dmaengine: sprd: add dma mask interface in probe

Hi Baolin, I am sorry that didn't add and commit my changes in PATCH
V2. I have added the changes in PATCH V3, please check the new email,
thank you.

On Tue, Sep 19, 2023 at 11:23 AM Baolin Wang
<[email protected]> wrote:
>
>
>
> On 9/19/2023 10:30 AM, Kaiwei Liu wrote:
> > In the probe of DMA, the default addressing range is 32 bits,
> > while the actual DMA hardware addressing range used is 36 bits.
> > So add dma_set_mask_and_coherent function to match DMA
> > addressing range.
> >
> > Signed-off-by: Kaiwei Liu <[email protected]>
> > ---
> > Change in V2:
> > -Change subject line.
> > -Modify error message to make it more readable.
>
> Have you modified the error message against v1? I did not see it.
>
> https://lore.kernel.org/all/[email protected]/
>
> > ---
> > drivers/dma/sprd-dma.c | 9 +++++++++
> > 1 file changed, 9 insertions(+)
> >
> > diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c
> > index 20c3cb1ef2f5..0e146550dfbb 100644
> > --- a/drivers/dma/sprd-dma.c
> > +++ b/drivers/dma/sprd-dma.c
> > @@ -1115,6 +1115,15 @@ static int sprd_dma_probe(struct platform_device *pdev)
> > u32 chn_count;
> > int ret, i;
> >
> > + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(36));
> > + if (ret) {
> > + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> > + if (ret) {
> > + dev_err(&pdev->dev, "dma_set_mask_and_coherent failed\n");
> > + return ret;
> > + }
> > + }
> > +
> > /* Parse new and deprecated dma-channels properties */
> > ret = device_property_read_u32(&pdev->dev, "dma-channels", &chn_count);
> > if (ret)