[PATCH] [media] atmel_isi: allocate memory to store the isi platform data.

[PATCH] [media] atmel_isi: allocate memory to store the isi platform data.

[Josh Wu]

This patch fix the bug: ISI driver's platform data became invalid when isi platform data's attribution is __initdata.

If the isi platform data is passed as __initdata. Then we need store it in driver allocated memory. otherwise when we use it out of the probe() function, then the isi platform data is invalid.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
 drivers/media/platform/soc_camera/atmel-isi.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index ec3f6a0..dc0fdec 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -926,6 +926,7 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
 	clk_put(isi->mck);
 	clk_unprepare(isi->pclk);
 	clk_put(isi->pclk);
+	kfree(isi->pdata);
 	kfree(isi);
 
 	return 0;
@@ -968,8 +969,15 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
 		goto err_alloc_isi;
 	}
 
+	isi->pdata = kzalloc(sizeof(struct isi_platform_data), GFP_KERNEL);
+	if (!isi->pdata) {
+		ret = -ENOMEM;
+		dev_err(&pdev->dev, "Can't allocate isi platform data!\n");
+		goto err_alloc_isi_pdata;
+	}
+	memcpy(isi->pdata, pdata, sizeof(struct isi_platform_data));
+
 	isi->pclk = pclk;
-	isi->pdata = pdata;
 	isi->active = NULL;
 	spin_lock_init(&isi->lock);
 	init_waitqueue_head(&isi->vsync_wq);
@@ -1073,6 +1081,8 @@ err_set_mck_rate:
 err_clk_prepare_mck:
 	clk_put(isi->mck);
 err_clk_get:
+	kfree(isi->pdata);
+err_alloc_isi_pdata:
 	kfree(isi);
 err_alloc_isi:
 	clk_unprepare(pclk);
-- 
1.7.9.5

[PATCH] [media] atmel_isi: allocate memory to store the isi platform data.

[Nicolas THERY]

Hello,

On 2012-08-29 12:11, Josh Wu wrote:
> This patch fix the bug: ISI driver's platform data became invalid when isi platform data's attribution is __initdata.
> 
> If the isi platform data is passed as __initdata. Then we need store it in driver allocated memory. otherwise when we use it out of the probe() function, then the isi platform data is invalid.
> 
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
>  drivers/media/platform/soc_camera/atmel-isi.c |   12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
> index ec3f6a0..dc0fdec 100644
> --- a/drivers/media/platform/soc_camera/atmel-isi.c
> +++ b/drivers/media/platform/soc_camera/atmel-isi.c
> @@ -926,6 +926,7 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
>  	clk_put(isi->mck);
>  	clk_unprepare(isi->pclk);
>  	clk_put(isi->pclk);
> +	kfree(isi->pdata);

Not needed if you use devm_kzalloc().  See below.

>  	kfree(isi);
>  
>  	return 0;
> @@ -968,8 +969,15 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
>  		goto err_alloc_isi;
>  	}
>  
> +	isi->pdata = kzalloc(sizeof(struct isi_platform_data), GFP_KERNEL);
> +	if (!isi->pdata) {
> +		ret = -ENOMEM;
> +		dev_err(&pdev->dev, "Can't allocate isi platform data!\n");
> +		goto err_alloc_isi_pdata;
> +	}
> +	memcpy(isi->pdata, pdata, sizeof(struct isi_platform_data));
> +

It is more idiomatic to use sizeof(*isi->pdata) in kzalloc() and memcpy() calls
to be resilient to future type changes.

You may also want to use dev_kzalloc() which frees memory automagically on
driver detach.

>  	isi->pclk = pclk;
> -	isi->pdata = pdata;
>  	isi->active = NULL;
>  	spin_lock_init(&isi->lock);
>  	init_waitqueue_head(&isi->vsync_wq);
> @@ -1073,6 +1081,8 @@ err_set_mck_rate:
>  err_clk_prepare_mck:
>  	clk_put(isi->mck);
>  err_clk_get:
> +	kfree(isi->pdata);
> +err_alloc_isi_pdata:
>  	kfree(isi);
>  err_alloc_isi:
>  	clk_unprepare(pclk);
> 

Best regards,
Nicolas

[PATCH] [media] atmel_isi: allocate memory to store the isi platform data.

[Sylwester Nawrocki]

Hi,

On 08/29/2012 12:11 PM, Josh Wu wrote:
> This patch fix the bug: ISI driver's platform data became invalid 
> when isi platform data's attribution is __initdata.
> 
> If the isi platform data is passed as __initdata. Then we need store
> it in driver allocated memory. otherwise when we use it out of the 
> probe() function, then the isi platform data is invalid.
> 
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
>  drivers/media/platform/soc_camera/atmel-isi.c |   12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
> index ec3f6a0..dc0fdec 100644
> --- a/drivers/media/platform/soc_camera/atmel-isi.c
> +++ b/drivers/media/platform/soc_camera/atmel-isi.c
> @@ -926,6 +926,7 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
>  	clk_put(isi->mck);
>  	clk_unprepare(isi->pclk);
>  	clk_put(isi->pclk);
> +	kfree(isi->pdata);
>  	kfree(isi);
>  
>  	return 0;
> @@ -968,8 +969,15 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
>  		goto err_alloc_isi;
>  	}
>  
> +	isi->pdata = kzalloc(sizeof(struct isi_platform_data), GFP_KERNEL);
> +	if (!isi->pdata) {
> +		ret = -ENOMEM;
> +		dev_err(&pdev->dev, "Can't allocate isi platform data!\n");
> +		goto err_alloc_isi_pdata;
> +	}
> +	memcpy(isi->pdata, pdata, sizeof(struct isi_platform_data));
> +

Why not just embed struct isi_platform_data in struct atmel_isi and drop this
another kzalloc() ?
Then you could simply do isi->pdata = *pdata.

Also, is this going to work when this driver is build and as a module
and its loading is deferred past system booting ? At that time the driver's
platform data may be well discarded. You may wan't to duplicate it on the
running boards in board code with kmemdup() or something.

--

Regards,
Sylwester

[PATCH] [media] atmel_isi: allocate memory to store the isi platform data.

[Guennadi Liakhovetski]

On Wed, 29 Aug 2012, Sylwester Nawrocki wrote:

> Hi,
> 
> On 08/29/2012 12:11 PM, Josh Wu wrote:
> > This patch fix the bug: ISI driver's platform data became invalid 
> > when isi platform data's attribution is __initdata.
> > 
> > If the isi platform data is passed as __initdata. Then we need store
> > it in driver allocated memory. otherwise when we use it out of the 
> > probe() function, then the isi platform data is invalid.
> > 
> > Signed-off-by: Josh Wu <josh.wu@atmel.com>
> > ---
> >  drivers/media/platform/soc_camera/atmel-isi.c |   12 +++++++++++-
> >  1 file changed, 11 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
> > index ec3f6a0..dc0fdec 100644
> > --- a/drivers/media/platform/soc_camera/atmel-isi.c
> > +++ b/drivers/media/platform/soc_camera/atmel-isi.c
> > @@ -926,6 +926,7 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
> >  	clk_put(isi->mck);
> >  	clk_unprepare(isi->pclk);
> >  	clk_put(isi->pclk);
> > +	kfree(isi->pdata);
> >  	kfree(isi);
> >  
> >  	return 0;
> > @@ -968,8 +969,15 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
> >  		goto err_alloc_isi;
> >  	}
> >  
> > +	isi->pdata = kzalloc(sizeof(struct isi_platform_data), GFP_KERNEL);
> > +	if (!isi->pdata) {
> > +		ret = -ENOMEM;
> > +		dev_err(&pdev->dev, "Can't allocate isi platform data!\n");
> > +		goto err_alloc_isi_pdata;
> > +	}
> > +	memcpy(isi->pdata, pdata, sizeof(struct isi_platform_data));
> > +
> 
> Why not just embed struct isi_platform_data in struct atmel_isi and drop this
> another kzalloc() ?
> Then you could simply do isi->pdata = *pdata.
> 
> Also, is this going to work when this driver is build and as a module
> and its loading is deferred past system booting ? At that time the driver's
> platform data may be well discarded.

Right, it will be gone, I think.

> You may wan't to duplicate it on the
> running boards in board code with kmemdup() or something.

How about removing __initdata from board code?

Thanks
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/

[PATCH] [media] atmel_isi: allocate memory to store the isi platform data.

[Josh Wu]

Hi, all

Sorry, My mistake here. After checking the code, this ISI bug doesn't 
exist in current mainline code. So I will *cancel* this patch.

Since current mainline will copy this __initdata isi platform data to 
one static structure in function at91_add_device_isi(...). Then pass 
this static structure to the driver.

So the ISI driver has no bug that isi platform became invalid. I meet 
this is because I'm not call the at91_add_device_isi(...) since I try in 
the DT support board.

At last, even no above bug in the code, This isi_platform_data is still 
need to stored in ISI driver. Since if we support DT then we need this 
isi platform data and the function at91_add_device_isi(...) will not to 
be called (it is in device file).

So I think after soc-camera DT support is merged. Then I will send a DT 
support patch for ISI driver which will embed the isi_platform_data into 
atmel_isi.

Thank you all for the replies. That helps a lot even in this small 
patch.  :)

On 8/30/2012 12:02 AM, Guennadi Liakhovetski wrote:
> On Wed, 29 Aug 2012, Sylwester Nawrocki wrote:
>
>> Hi,
>>
>> On 08/29/2012 12:11 PM, Josh Wu wrote:
>>> This patch fix the bug: ISI driver's platform data became invalid
>>> when isi platform data's attribution is __initdata.
>>>
>>> If the isi platform data is passed as __initdata. Then we need store
>>> it in driver allocated memory. otherwise when we use it out of the
>>> probe() function, then the isi platform data is invalid.
>>>
>>> Signed-off-by: Josh Wu <josh.wu@atmel.com>
>>> ---
>>>   drivers/media/platform/soc_camera/atmel-isi.c |   12 +++++++++++-
>>>   1 file changed, 11 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
>>> index ec3f6a0..dc0fdec 100644
>>> --- a/drivers/media/platform/soc_camera/atmel-isi.c
>>> +++ b/drivers/media/platform/soc_camera/atmel-isi.c
>>> @@ -926,6 +926,7 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
>>>   	clk_put(isi->mck);
>>>   	clk_unprepare(isi->pclk);
>>>   	clk_put(isi->pclk);
>>> +	kfree(isi->pdata);
>>>   	kfree(isi);
>>>   
>>>   	return 0;
>>> @@ -968,8 +969,15 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
>>>   		goto err_alloc_isi;
>>>   	}
>>>   
>>> +	isi->pdata = kzalloc(sizeof(struct isi_platform_data), GFP_KERNEL);
>>> +	if (!isi->pdata) {
>>> +		ret = -ENOMEM;
>>> +		dev_err(&pdev->dev, "Can't allocate isi platform data!\n");
>>> +		goto err_alloc_isi_pdata;
>>> +	}
>>> +	memcpy(isi->pdata, pdata, sizeof(struct isi_platform_data));
>>> +
>> Why not just embed struct isi_platform_data in struct atmel_isi and drop this
>> another kzalloc() ?
>> Then you could simply do isi->pdata = *pdata.
>>
>> Also, is this going to work when this driver is build and as a module
>> and its loading is deferred past system booting ? At that time the driver's
>> platform data may be well discarded.
> Right, it will be gone, I think.
>
>> You may wan't to duplicate it on the
>> running boards in board code with kmemdup() or something.
> How about removing __initdata from board code?
>
> Thanks
> Guennadi
> ---
> Guennadi Liakhovetski, Ph.D.
> Freelance Open-Source Software Developer
> http://www.open-technology.de/
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Best Regards,
Josh Wu