| Message ID | 20201023174546.504028-4-paul.kocialkowski@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Allwinner MIPI CSI-2 support for A31/V3s/A83T | expand |
On Fri, Oct 23, 2020 at 07:45:35PM +0200, Paul Kocialkowski wrote: > This allows selecting a dedicated CMA memory pool (specified via > device-tree) instead of the default one. > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Why would that be needed? > --- > drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > index 28e89340fed9..5d2389a5cd17 100644 > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > @@ -16,6 +16,7 @@ > #include <linux/module.h> > #include <linux/of.h> > #include <linux/of_device.h> > +#include <linux/of_reserved_mem.h> > #include <linux/platform_device.h> > #include <linux/pm_runtime.h> > #include <linux/regmap.h> > @@ -849,6 +850,12 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev, > return PTR_ERR(sdev->regmap); > } > > + ret = of_reserved_mem_device_init(&pdev->dev); > + if (ret && ret != -ENODEV) { > + dev_err(&pdev->dev, "Unable to init reserved memory\n"); > + return ret; > + } > + > sdev->clk_mod = devm_clk_get(&pdev->dev, "mod"); If that clk_get or any subsequent function fail you'll end up leaking whatever the initialization of the reserved memory has allocated Maxime
Hi, On Mon 26 Oct 20, 16:41, Maxime Ripard wrote: > On Fri, Oct 23, 2020 at 07:45:35PM +0200, Paul Kocialkowski wrote: > > This allows selecting a dedicated CMA memory pool (specified via > > device-tree) instead of the default one. > > > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > Why would that be needed? Sorry for the confusion, this is indeed unrelated to the current series and it is not needed for MIPI CSI-2 support. However, I think it's a worthwhile addition to the driver. I will take it out of the series and re-submit it separately then. > > --- > > drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > > index 28e89340fed9..5d2389a5cd17 100644 > > --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > > +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c > > @@ -16,6 +16,7 @@ > > #include <linux/module.h> > > #include <linux/of.h> > > #include <linux/of_device.h> > > +#include <linux/of_reserved_mem.h> > > #include <linux/platform_device.h> > > #include <linux/pm_runtime.h> > > #include <linux/regmap.h> > > @@ -849,6 +850,12 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev, > > return PTR_ERR(sdev->regmap); > > } > > > > + ret = of_reserved_mem_device_init(&pdev->dev); > > + if (ret && ret != -ENODEV) { > > + dev_err(&pdev->dev, "Unable to init reserved memory\n"); > > + return ret; > > + } > > + > > sdev->clk_mod = devm_clk_get(&pdev->dev, "mod"); > > If that clk_get or any subsequent function fail you'll end up leaking > whatever the initialization of the reserved memory has allocated Right, there's a missing of_reserved_mem_device_release in the error path here. Thanks! Paul
diff --git a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c index 28e89340fed9..5d2389a5cd17 100644 --- a/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c +++ b/drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c @@ -16,6 +16,7 @@ #include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/of_reserved_mem.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/regmap.h> @@ -849,6 +850,12 @@ static int sun6i_csi_resource_request(struct sun6i_csi_dev *sdev, return PTR_ERR(sdev->regmap); } + ret = of_reserved_mem_device_init(&pdev->dev); + if (ret && ret != -ENODEV) { + dev_err(&pdev->dev, "Unable to init reserved memory\n"); + return ret; + } + sdev->clk_mod = devm_clk_get(&pdev->dev, "mod"); if (IS_ERR(sdev->clk_mod)) { dev_err(&pdev->dev, "Unable to acquire csi clock\n"); @@ -917,6 +924,7 @@ static int sun6i_csi_remove(struct platform_device *pdev) struct sun6i_csi_dev *sdev = platform_get_drvdata(pdev); sun6i_csi_v4l2_cleanup(&sdev->csi); + of_reserved_mem_device_release(sdev->dev); return 0; }
This allows selecting a dedicated CMA memory pool (specified via device-tree) instead of the default one. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> --- drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 8 ++++++++ 1 file changed, 8 insertions(+)