| Message ID | 20221203032813.580081-1-jassisinghbrar@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | FWU: Handle meta-data in common code | expand |
On Fri, Dec 02, 2022 at 09:28:13PM -0600, jassisinghbrar@gmail.com wrote: > From: Jassi Brar <jaswinder.singh@linaro.org> > > fwu_get_mdata() sounds more appropriate than fwu_get_verified_mdata() > > Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org> > --- > Forgot to send this patch previously in v2 > cmd/fwu_mdata.c | 2 +- > include/fwu.h | 4 ++-- > lib/fwu_updates/fwu.c | 6 +++--- > 3 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/cmd/fwu_mdata.c b/cmd/fwu_mdata.c > index 9b70340368..5ecda455df 100644 > --- a/cmd/fwu_mdata.c > +++ b/cmd/fwu_mdata.c > @@ -46,7 +46,7 @@ int do_fwu_mdata_read(struct cmd_tbl *cmdtp, int flag, > int ret = CMD_RET_SUCCESS, res; > struct fwu_mdata mdata; > > - res = fwu_get_verified_mdata(&mdata); > + res = fwu_get_mdata(&mdata); > if (res < 0) { > log_err("Unable to get valid FWU metadata\n"); > ret = CMD_RET_FAILURE; > diff --git a/include/fwu.h b/include/fwu.h > index 23bd97fe86..ea25aca2cd 100644 > --- a/include/fwu.h > +++ b/include/fwu.h > @@ -80,7 +80,7 @@ int fwu_read_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); > int fwu_write_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); > > /** > - * fwu_get_verified_mdata() - Read, verify and return the FWU metadata > + * fwu_get_mdata() - Read, verify and return the FWU metadata > * > * Read both the metadata copies from the storage media, verify their checksum, > * and ascertain that both copies match. If one of the copies has gone bad, > @@ -88,7 +88,7 @@ int fwu_write_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); > * > * Return: 0 if OK, -ve on error > */ > -int fwu_get_verified_mdata(struct fwu_mdata *mdata); > +int fwu_get_mdata(struct fwu_mdata *mdata); > > /** > * fwu_get_active_index() - Get active_index from the FWU metadata > diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c > index 3d11d92fb9..77444ba2de 100644 > --- a/lib/fwu_updates/fwu.c > +++ b/lib/fwu_updates/fwu.c > @@ -191,7 +191,7 @@ static inline int mdata_crc_check(struct fwu_mdata *mdata) > } > > /** > - * fwu_get_verified_mdata() - Read, verify and return the FWU metadata > + * fwu_get_mdata() - Read, verify and return the FWU metadata > * > * Read both the metadata copies from the storage media, verify their checksum, > * and ascertain that both copies match. If one of the copies has gone bad, > @@ -199,7 +199,7 @@ static inline int mdata_crc_check(struct fwu_mdata *mdata) > * > * Return: 0 if OK, -ve on error > */ > -int fwu_get_verified_mdata(struct fwu_mdata *mdata) > +int fwu_get_mdata(struct fwu_mdata *mdata) > { > int err; > bool pri_ok, sec_ok; > @@ -629,7 +629,7 @@ static int fwu_boottime_checks(void *ctx, struct event *event) > return ret; > } > > - ret = fwu_get_verified_mdata(NULL); > + ret = fwu_get_mdata(NULL); > if (ret) { > log_debug("Unable to read meta-data\n"); > return ret; > -- > 2.34.1 > Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
On Sat, 3 Dec 2022 at 04:28, <jassisinghbrar@gmail.com> wrote: > > From: Jassi Brar <jaswinder.singh@linaro.org> > > fwu_get_mdata() sounds more appropriate than fwu_get_verified_mdata() > > Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org> > --- > Forgot to send this patch previously in v2 > cmd/fwu_mdata.c | 2 +- > include/fwu.h | 4 ++-- > lib/fwu_updates/fwu.c | 6 +++--- > 3 files changed, 6 insertions(+), 6 deletions(-) > Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org> > diff --git a/cmd/fwu_mdata.c b/cmd/fwu_mdata.c > index 9b70340368..5ecda455df 100644 > --- a/cmd/fwu_mdata.c > +++ b/cmd/fwu_mdata.c > @@ -46,7 +46,7 @@ int do_fwu_mdata_read(struct cmd_tbl *cmdtp, int flag, > int ret = CMD_RET_SUCCESS, res; > struct fwu_mdata mdata; > > - res = fwu_get_verified_mdata(&mdata); > + res = fwu_get_mdata(&mdata); > if (res < 0) { > log_err("Unable to get valid FWU metadata\n"); > ret = CMD_RET_FAILURE; > diff --git a/include/fwu.h b/include/fwu.h > index 23bd97fe86..ea25aca2cd 100644 > --- a/include/fwu.h > +++ b/include/fwu.h > @@ -80,7 +80,7 @@ int fwu_read_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); > int fwu_write_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); > > /** > - * fwu_get_verified_mdata() - Read, verify and return the FWU metadata > + * fwu_get_mdata() - Read, verify and return the FWU metadata > * > * Read both the metadata copies from the storage media, verify their checksum, > * and ascertain that both copies match. If one of the copies has gone bad, > @@ -88,7 +88,7 @@ int fwu_write_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); > * > * Return: 0 if OK, -ve on error > */ > -int fwu_get_verified_mdata(struct fwu_mdata *mdata); > +int fwu_get_mdata(struct fwu_mdata *mdata); > > /** > * fwu_get_active_index() - Get active_index from the FWU metadata > diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c > index 3d11d92fb9..77444ba2de 100644 > --- a/lib/fwu_updates/fwu.c > +++ b/lib/fwu_updates/fwu.c > @@ -191,7 +191,7 @@ static inline int mdata_crc_check(struct fwu_mdata *mdata) > } > > /** > - * fwu_get_verified_mdata() - Read, verify and return the FWU metadata > + * fwu_get_mdata() - Read, verify and return the FWU metadata > * > * Read both the metadata copies from the storage media, verify their checksum, > * and ascertain that both copies match. If one of the copies has gone bad, > @@ -199,7 +199,7 @@ static inline int mdata_crc_check(struct fwu_mdata *mdata) > * > * Return: 0 if OK, -ve on error > */ > -int fwu_get_verified_mdata(struct fwu_mdata *mdata) > +int fwu_get_mdata(struct fwu_mdata *mdata) > { > int err; > bool pri_ok, sec_ok; > @@ -629,7 +629,7 @@ static int fwu_boottime_checks(void *ctx, struct event *event) > return ret; > } > > - ret = fwu_get_verified_mdata(NULL); > + ret = fwu_get_mdata(NULL); > if (ret) { > log_debug("Unable to read meta-data\n"); > return ret; > -- > 2.34.1 >
diff --git a/cmd/fwu_mdata.c b/cmd/fwu_mdata.c index 9b70340368..5ecda455df 100644 --- a/cmd/fwu_mdata.c +++ b/cmd/fwu_mdata.c @@ -46,7 +46,7 @@ int do_fwu_mdata_read(struct cmd_tbl *cmdtp, int flag, int ret = CMD_RET_SUCCESS, res; struct fwu_mdata mdata; - res = fwu_get_verified_mdata(&mdata); + res = fwu_get_mdata(&mdata); if (res < 0) { log_err("Unable to get valid FWU metadata\n"); ret = CMD_RET_FAILURE; diff --git a/include/fwu.h b/include/fwu.h index 23bd97fe86..ea25aca2cd 100644 --- a/include/fwu.h +++ b/include/fwu.h @@ -80,7 +80,7 @@ int fwu_read_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); int fwu_write_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); /** - * fwu_get_verified_mdata() - Read, verify and return the FWU metadata + * fwu_get_mdata() - Read, verify and return the FWU metadata * * Read both the metadata copies from the storage media, verify their checksum, * and ascertain that both copies match. If one of the copies has gone bad, @@ -88,7 +88,7 @@ int fwu_write_mdata(struct udevice *dev, struct fwu_mdata *mdata, bool primary); * * Return: 0 if OK, -ve on error */ -int fwu_get_verified_mdata(struct fwu_mdata *mdata); +int fwu_get_mdata(struct fwu_mdata *mdata); /** * fwu_get_active_index() - Get active_index from the FWU metadata diff --git a/lib/fwu_updates/fwu.c b/lib/fwu_updates/fwu.c index 3d11d92fb9..77444ba2de 100644 --- a/lib/fwu_updates/fwu.c +++ b/lib/fwu_updates/fwu.c @@ -191,7 +191,7 @@ static inline int mdata_crc_check(struct fwu_mdata *mdata) } /** - * fwu_get_verified_mdata() - Read, verify and return the FWU metadata + * fwu_get_mdata() - Read, verify and return the FWU metadata * * Read both the metadata copies from the storage media, verify their checksum, * and ascertain that both copies match. If one of the copies has gone bad, @@ -199,7 +199,7 @@ static inline int mdata_crc_check(struct fwu_mdata *mdata) * * Return: 0 if OK, -ve on error */ -int fwu_get_verified_mdata(struct fwu_mdata *mdata) +int fwu_get_mdata(struct fwu_mdata *mdata) { int err; bool pri_ok, sec_ok; @@ -629,7 +629,7 @@ static int fwu_boottime_checks(void *ctx, struct event *event) return ret; } - ret = fwu_get_verified_mdata(NULL); + ret = fwu_get_mdata(NULL); if (ret) { log_debug("Unable to read meta-data\n"); return ret;