Message ID | 20221104024312.764840-1-jassisinghbrar@gmail.com |
---|---|
State | Superseded |
Headers | show |
Series | FWU: Handle meta-data in common code | expand |
On Fri, 4 Nov 2022 at 03:43, <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 | 36 ++++++++++++++++++++++++++++++++++++ > 1 file changed, 36 insertions(+) > > diff --git a/drivers/fwu-mdata/gpt_blk.c b/drivers/fwu-mdata/gpt_blk.c > index d706e3d4e4..7fda041302 100644 > --- a/drivers/fwu-mdata/gpt_blk.c > +++ b/drivers/fwu-mdata/gpt_blk.c > @@ -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; Not returning ret value? > + } > + > + return gpt_read_write_mdata(desc, mdata, MDATA_READ, > + primary ? g_mdata_part[0] : g_mdata_part[1]); Fix indentation. > +} > + > +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]); Dito Br, etienne > +} > + > 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.25.1 >
On Mon, Nov 7, 2022 at 11:23 AM Etienne Carriere <etienne.carriere@linaro.org> wrote: > > On Fri, 4 Nov 2022 at 03:43, <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 | 36 ++++++++++++++++++++++++++++++++++++ > > 1 file changed, 36 insertions(+) > > > > diff --git a/drivers/fwu-mdata/gpt_blk.c b/drivers/fwu-mdata/gpt_blk.c > > index d706e3d4e4..7fda041302 100644 > > --- a/drivers/fwu-mdata/gpt_blk.c > > +++ b/drivers/fwu-mdata/gpt_blk.c > > @@ -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; > > Not returning ret value? > It is unchanged from original behavior. > > + } > > + > > + return gpt_read_write_mdata(desc, mdata, MDATA_READ, > > + primary ? g_mdata_part[0] : g_mdata_part[1]); > > Fix indentation. > > > > +} > > + > > +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]); > > Dito > OK. thanks.
diff --git a/drivers/fwu-mdata/gpt_blk.c b/drivers/fwu-mdata/gpt_blk.c index d706e3d4e4..7fda041302 100644 --- a/drivers/fwu-mdata/gpt_blk.c +++ b/drivers/fwu-mdata/gpt_blk.c @@ -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,