diff mbox series

[PATCHv2,3/4] fwu: gpt: implement read_mdata and write_mdata callbacks

Message ID 20221203031712.579809-1-jassisinghbrar@gmail.com
State New
Headers show
Series FWU: Handle meta-data in common code | expand

Commit Message

Jassi Brar Dec. 3, 2022, 3:17 a.m. UTC 
From: Jassi Brar <jaswinder.singh@linaro.org>

Moving towards using common code for meta-data management,
implement the read/write mdata hooks.

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
---
 drivers/fwu-mdata/gpt_blk.c | 40 +++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

Comments

Ilias Apalodimas Dec. 22, 2022, 12:59 p.m. UTC | #1 
Hi Jassi,

On Fri, Dec 02, 2022 at 09:17:12PM -0600, jassisinghbrar@gmail.com wrote:
> From: Jassi Brar <jaswinder.singh@linaro.org>
>
> Moving towards using common code for meta-data management,
> implement the read/write mdata hooks.
>
> Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
> ---
>  drivers/fwu-mdata/gpt_blk.c | 40 +++++++++++++++++++++++++++++++++++--
>  1 file changed, 38 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/fwu-mdata/gpt_blk.c b/drivers/fwu-mdata/gpt_blk.c
> index 28f5d23e1e..35239c0a4f 100644
> --- a/drivers/fwu-mdata/gpt_blk.c
> +++ b/drivers/fwu-mdata/gpt_blk.c
> @@ -222,7 +222,7 @@ static int fwu_gpt_read_mdata_partition(struct udevice *dev,
>  	struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
>
>  	return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev),
> -				    mdata, MDATA_READ, part_num);
> +                                mdata, MDATA_READ, part_num);

I assume this was by mistake?

>  }
>
>  static int fwu_gpt_write_mdata_partition(struct udevice *dev,
> @@ -231,7 +231,7 @@ static int fwu_gpt_write_mdata_partition(struct udevice *dev,
>  	struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
>
>  	return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev),
> -				    mdata, MDATA_WRITE, part_num);
> +                                mdata, MDATA_WRITE, part_num);

ditto

>  }
>
>  static int fwu_get_mdata_device(struct udevice *dev, struct udevice **mdata_dev)
> @@ -272,7 +272,43 @@ static int fwu_mdata_gpt_blk_probe(struct udevice *dev)
>  	return 0;
>  }
>
> +static int fwu_gpt_read_mdata(struct udevice *dev, struct fwu_mdata *mdata,
> +						 bool primary)
> +{
> +	struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
> +	struct blk_desc *desc = dev_get_uclass_plat(priv->blk_dev);
> +	int ret;
> +
> +	ret = gpt_get_mdata_partitions(desc);
> +	if (ret < 0) {
> +		log_debug("Error getting the FWU metadata partitions\n");
> +		return -ENOENT;
> +	}
> +
> +	return gpt_read_write_mdata(desc, mdata, MDATA_READ,
> +                                primary ? g_mdata_part[0] : g_mdata_part[1]);
> +}
> +
> +static int fwu_gpt_write_mdata(struct udevice *dev, struct fwu_mdata *mdata,
> +						 bool primary)
> +{
> +	struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
> +	struct blk_desc *desc = dev_get_uclass_plat(priv->blk_dev);
> +	int ret;
> +
> +	ret = gpt_get_mdata_partitions(desc);
> +	if (ret < 0) {
> +		log_debug("Error getting the FWU metadata partitions\n");
> +		return -ENOENT;
> +	}
> +
> +	return gpt_read_write_mdata(desc, mdata, MDATA_WRITE,
> +                                primary ? g_mdata_part[0] : g_mdata_part[1]);
> +}
> +
>  static const struct fwu_mdata_ops fwu_gpt_blk_ops = {
> +	.read_mdata = fwu_gpt_read_mdata,
> +	.write_mdata = fwu_gpt_write_mdata,
>  	.get_mdata = fwu_gpt_get_mdata,
>  	.update_mdata = fwu_gpt_update_mdata,
>  	.get_mdata_part_num = fwu_gpt_get_mdata_partitions,
> --
> 2.34.1
>


Other than that
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Etienne Carriere Jan. 2, 2023, 9:48 a.m. UTC | #2 
Hi Jassi,

On Thu, 22 Dec 2022 at 13:59, Ilias Apalodimas
<ilias.apalodimas@linaro.org> wrote:
>
> Hi Jassi,
>
> On Fri, Dec 02, 2022 at 09:17:12PM -0600, jassisinghbrar@gmail.com wrote:
> > From: Jassi Brar <jaswinder.singh@linaro.org>
> >
> > Moving towards using common code for meta-data management,
> > implement the read/write mdata hooks.
> >
> > Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
> > ---
> >  drivers/fwu-mdata/gpt_blk.c | 40 +++++++++++++++++++++++++++++++++++--
> >  1 file changed, 38 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/fwu-mdata/gpt_blk.c b/drivers/fwu-mdata/gpt_blk.c
> > index 28f5d23e1e..35239c0a4f 100644
> > --- a/drivers/fwu-mdata/gpt_blk.c
> > +++ b/drivers/fwu-mdata/gpt_blk.c
> > @@ -222,7 +222,7 @@ static int fwu_gpt_read_mdata_partition(struct udevice *dev,
> >       struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
> >
> >       return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev),
> > -                                 mdata, MDATA_READ, part_num);
> > +                                mdata, MDATA_READ, part_num);
>
> I assume this was by mistake?
>

I agree. Discard this change.

> >  }
> >
> >  static int fwu_gpt_write_mdata_partition(struct udevice *dev,
> > @@ -231,7 +231,7 @@ static int fwu_gpt_write_mdata_partition(struct udevice *dev,
> >       struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
> >
> >       return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev),
> > -                                 mdata, MDATA_WRITE, part_num);
> > +                                mdata, MDATA_WRITE, part_num);
>
> ditto
>
> >  }
> >
> >  static int fwu_get_mdata_device(struct udevice *dev, struct udevice **mdata_dev)
> > @@ -272,7 +272,43 @@ static int fwu_mdata_gpt_blk_probe(struct udevice *dev)
> >       return 0;
> >  }
> >
> > +static int fwu_gpt_read_mdata(struct udevice *dev, struct fwu_mdata *mdata,
> > +                                              bool primary)
> > +{
> > +     struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
> > +     struct blk_desc *desc = dev_get_uclass_plat(priv->blk_dev);
> > +     int ret;
> > +
> > +     ret = gpt_get_mdata_partitions(desc);
> > +     if (ret < 0) {
> > +             log_debug("Error getting the FWU metadata partitions\n");
> > +             return -ENOENT;
> > +     }
> > +
> > +     return gpt_read_write_mdata(desc, mdata, MDATA_READ,
> > +                                primary ? g_mdata_part[0] : g_mdata_part[1]);
> > +}
> > +
> > +static int fwu_gpt_write_mdata(struct udevice *dev, struct fwu_mdata *mdata,
> > +                                              bool primary)
> > +{
> > +     struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
> > +     struct blk_desc *desc = dev_get_uclass_plat(priv->blk_dev);
> > +     int ret;
> > +
> > +     ret = gpt_get_mdata_partitions(desc);
> > +     if (ret < 0) {
> > +             log_debug("Error getting the FWU metadata partitions\n");
> > +             return -ENOENT;
> > +     }
> > +
> > +     return gpt_read_write_mdata(desc, mdata, MDATA_WRITE,
> > +                                primary ? g_mdata_part[0] : g_mdata_part[1]);
> > +}
> > +
> >  static const struct fwu_mdata_ops fwu_gpt_blk_ops = {
> > +     .read_mdata = fwu_gpt_read_mdata,
> > +     .write_mdata = fwu_gpt_write_mdata,
> >       .get_mdata = fwu_gpt_get_mdata,
> >       .update_mdata = fwu_gpt_update_mdata,
> >       .get_mdata_part_num = fwu_gpt_get_mdata_partitions,
> > --
> > 2.34.1
> >
>
>
> Other than that
> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
>

Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org> with
Ilias' comments addressed.
Jassi Brar Jan. 2, 2023, 4:04 p.m. UTC | #3 
On Mon, 2 Jan 2023 at 03:48, Etienne Carriere
<etienne.carriere@linaro.org> wrote:
>
> Hi Jassi,
>
> On Thu, 22 Dec 2022 at 13:59, Ilias Apalodimas
> <ilias.apalodimas@linaro.org> wrote:
> >
> > Hi Jassi,
> >
> > On Fri, Dec 02, 2022 at 09:17:12PM -0600, jassisinghbrar@gmail.com wrote:
> > > From: Jassi Brar <jaswinder.singh@linaro.org>
> > >
> > > Moving towards using common code for meta-data management,
> > > implement the read/write mdata hooks.
> > >
> > > Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
> > > ---
> > >  drivers/fwu-mdata/gpt_blk.c | 40 +++++++++++++++++++++++++++++++++++--
> > >  1 file changed, 38 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/fwu-mdata/gpt_blk.c b/drivers/fwu-mdata/gpt_blk.c
> > > index 28f5d23e1e..35239c0a4f 100644
> > > --- a/drivers/fwu-mdata/gpt_blk.c
> > > +++ b/drivers/fwu-mdata/gpt_blk.c
> > > @@ -222,7 +222,7 @@ static int fwu_gpt_read_mdata_partition(struct udevice *dev,
> > >       struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
> > >
> > >       return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev),
> > > -                                 mdata, MDATA_READ, part_num);
> > > +                                mdata, MDATA_READ, part_num);
> >
> > I assume this was by mistake?
> >
During the churn I changed from indentation by tabs to spaces. I will
drop the change.

> >
> > Other than that
> > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
> >
>
> Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org> with
> Ilias' comments addressed.

Thanks.
diff mbox series

Patch

diff --git a/drivers/fwu-mdata/gpt_blk.c b/drivers/fwu-mdata/gpt_blk.c
index 28f5d23e1e..35239c0a4f 100644
--- a/drivers/fwu-mdata/gpt_blk.c
+++ b/drivers/fwu-mdata/gpt_blk.c
@@ -222,7 +222,7 @@  static int fwu_gpt_read_mdata_partition(struct udevice *dev,
 	struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
 
 	return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev),
-				    mdata, MDATA_READ, part_num);
+                                mdata, MDATA_READ, part_num);
 }
 
 static int fwu_gpt_write_mdata_partition(struct udevice *dev,
@@ -231,7 +231,7 @@  static int fwu_gpt_write_mdata_partition(struct udevice *dev,
 	struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
 
 	return gpt_read_write_mdata(dev_get_uclass_plat(priv->blk_dev),
-				    mdata, MDATA_WRITE, part_num);
+                                mdata, MDATA_WRITE, part_num);
 }
 
 static int fwu_get_mdata_device(struct udevice *dev, struct udevice **mdata_dev)
@@ -272,7 +272,43 @@  static int fwu_mdata_gpt_blk_probe(struct udevice *dev)
 	return 0;
 }
 
+static int fwu_gpt_read_mdata(struct udevice *dev, struct fwu_mdata *mdata,
+						 bool primary)
+{
+	struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
+	struct blk_desc *desc = dev_get_uclass_plat(priv->blk_dev);
+	int ret;
+
+	ret = gpt_get_mdata_partitions(desc);
+	if (ret < 0) {
+		log_debug("Error getting the FWU metadata partitions\n");
+		return -ENOENT;
+	}
+
+	return gpt_read_write_mdata(desc, mdata, MDATA_READ,
+                                primary ? g_mdata_part[0] : g_mdata_part[1]);
+}
+
+static int fwu_gpt_write_mdata(struct udevice *dev, struct fwu_mdata *mdata,
+						 bool primary)
+{
+	struct fwu_mdata_gpt_blk_priv *priv = dev_get_priv(dev);
+	struct blk_desc *desc = dev_get_uclass_plat(priv->blk_dev);
+	int ret;
+
+	ret = gpt_get_mdata_partitions(desc);
+	if (ret < 0) {
+		log_debug("Error getting the FWU metadata partitions\n");
+		return -ENOENT;
+	}
+
+	return gpt_read_write_mdata(desc, mdata, MDATA_WRITE,
+                                primary ? g_mdata_part[0] : g_mdata_part[1]);
+}
+
 static const struct fwu_mdata_ops fwu_gpt_blk_ops = {
+	.read_mdata = fwu_gpt_read_mdata,
+	.write_mdata = fwu_gpt_write_mdata,
 	.get_mdata = fwu_gpt_get_mdata,
 	.update_mdata = fwu_gpt_update_mdata,
 	.get_mdata_part_num = fwu_gpt_get_mdata_partitions,