| Message ID | 20241104175110.1048449-3-sjg@chromium.org |
|---|---|
| State | Needs Review / ACK |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | bootstd: Support recording images | expand |
On 11/4/24 18:50, Simon Glass wrote: > This relates to more than just the bootdev, since there is a global list > of bootflows. Move the function to the bootstd file and rename it. > > Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > --- > > (no changes since v1) > > boot/bootdev-uclass.c | 19 +++++-------------- > boot/bootstd-uclass.c | 15 +++++++++++++++ > cmd/bootflow.c | 2 +- > include/bootdev.h | 10 ---------- > include/bootstd.h | 10 ++++++++++ > 5 files changed, 31 insertions(+), 25 deletions(-) > > diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c > index eddbf60600c..26b003427ec 100644 > --- a/boot/bootdev-uclass.c > +++ b/boot/bootdev-uclass.c > @@ -557,19 +557,6 @@ int bootdev_get_bootflow(struct udevice *dev, struct bootflow_iter *iter, > return ops->get_bootflow(dev, iter, bflow); > } > > -void bootdev_clear_bootflows(struct udevice *dev) > -{ > - struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev); > - > - while (!list_empty(&ucp->bootflow_head)) { > - struct bootflow *bflow; > - > - bflow = list_first_entry(&ucp->bootflow_head, struct bootflow, > - bm_node); > - bootflow_remove(bflow); > - } > -} > - > int bootdev_next_label(struct bootflow_iter *iter, struct udevice **devp, > int *method_flagsp) > { > @@ -935,7 +922,11 @@ static int bootdev_post_bind(struct udevice *dev) > > static int bootdev_pre_unbind(struct udevice *dev) > { > - bootdev_clear_bootflows(dev); > + int ret; > + > + ret = bootstd_clear_bootflows_for_bootdev(dev); > + if (ret) > + return log_msg_ret("bun", ret); > > return 0; > } > diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c > index bf6e49ad97a..596d3e5e41d 100644 > --- a/boot/bootstd-uclass.c > +++ b/boot/bootstd-uclass.c > @@ -86,6 +86,21 @@ int bootstd_add_bootflow(struct bootflow *bflow) > return 0; > } > > +int bootstd_clear_bootflows_for_bootdev(struct udevice *dev) > +{ > + struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev); > + > + while (!list_empty(&ucp->bootflow_head)) { > + struct bootflow *bflow; > + > + bflow = list_first_entry(&ucp->bootflow_head, struct bootflow, > + bm_node); > + bootflow_remove(bflow); > + } > + > + return 0; > +} > + > static int bootstd_remove(struct udevice *dev) > { > struct bootstd_priv *priv = dev_get_priv(dev); > diff --git a/cmd/bootflow.c b/cmd/bootflow.c > index 8962464bbf8..1c1146ce11e 100644 > --- a/cmd/bootflow.c > +++ b/cmd/bootflow.c > @@ -197,7 +197,7 @@ static int do_bootflow_scan(struct cmd_tbl *cmdtp, int flag, int argc, > show_header(); > } > if (dev) > - bootdev_clear_bootflows(dev); > + bootstd_clear_bootflows_for_bootdev(dev); > else > bootstd_clear_glob(); > for (i = 0, > diff --git a/include/bootdev.h b/include/bootdev.h > index 8db198dd56b..f9cae2fd1fd 100644 > --- a/include/bootdev.h > +++ b/include/bootdev.h > @@ -185,16 +185,6 @@ int bootdev_find_in_blk(struct udevice *dev, struct udevice *blk, > */ > void bootdev_list(bool probe); > > -/** > - * bootdev_clear_bootflows() - Clear bootflows from a bootdev > - * > - * Each bootdev maintains a list of discovered bootflows. This provides a > - * way to clear it. These bootflows are removed from the global list too. > - * > - * @dev: bootdev device to update > - */ > -void bootdev_clear_bootflows(struct udevice *dev); > - > /** > * bootdev_first_bootflow() - Get the first bootflow from a bootdev > * > diff --git a/include/bootstd.h b/include/bootstd.h > index 3fc93a4ec2e..4220ece785d 100644 > --- a/include/bootstd.h > +++ b/include/bootstd.h > @@ -122,4 +122,14 @@ int bootstd_prog_boot(void); > */ > int bootstd_add_bootflow(struct bootflow *bflow); > > +/** > + * bootstd_clear_bootflows_for_bootdev() - Clear bootflows from a bootdev > + * > + * Each bootdev maintains a list of discovered bootflows. This provides a > + * way to clear it. These bootflows are removed from the global list too. > + * > + * @dev: bootdev device to update > + */ > +int bootstd_clear_bootflows_for_bootdev(struct udevice *dev); > + > #endif
diff --git a/boot/bootdev-uclass.c b/boot/bootdev-uclass.c index eddbf60600c..26b003427ec 100644 --- a/boot/bootdev-uclass.c +++ b/boot/bootdev-uclass.c @@ -557,19 +557,6 @@ int bootdev_get_bootflow(struct udevice *dev, struct bootflow_iter *iter, return ops->get_bootflow(dev, iter, bflow); } -void bootdev_clear_bootflows(struct udevice *dev) -{ - struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev); - - while (!list_empty(&ucp->bootflow_head)) { - struct bootflow *bflow; - - bflow = list_first_entry(&ucp->bootflow_head, struct bootflow, - bm_node); - bootflow_remove(bflow); - } -} - int bootdev_next_label(struct bootflow_iter *iter, struct udevice **devp, int *method_flagsp) { @@ -935,7 +922,11 @@ static int bootdev_post_bind(struct udevice *dev) static int bootdev_pre_unbind(struct udevice *dev) { - bootdev_clear_bootflows(dev); + int ret; + + ret = bootstd_clear_bootflows_for_bootdev(dev); + if (ret) + return log_msg_ret("bun", ret); return 0; } diff --git a/boot/bootstd-uclass.c b/boot/bootstd-uclass.c index bf6e49ad97a..596d3e5e41d 100644 --- a/boot/bootstd-uclass.c +++ b/boot/bootstd-uclass.c @@ -86,6 +86,21 @@ int bootstd_add_bootflow(struct bootflow *bflow) return 0; } +int bootstd_clear_bootflows_for_bootdev(struct udevice *dev) +{ + struct bootdev_uc_plat *ucp = dev_get_uclass_plat(dev); + + while (!list_empty(&ucp->bootflow_head)) { + struct bootflow *bflow; + + bflow = list_first_entry(&ucp->bootflow_head, struct bootflow, + bm_node); + bootflow_remove(bflow); + } + + return 0; +} + static int bootstd_remove(struct udevice *dev) { struct bootstd_priv *priv = dev_get_priv(dev); diff --git a/cmd/bootflow.c b/cmd/bootflow.c index 8962464bbf8..1c1146ce11e 100644 --- a/cmd/bootflow.c +++ b/cmd/bootflow.c @@ -197,7 +197,7 @@ static int do_bootflow_scan(struct cmd_tbl *cmdtp, int flag, int argc, show_header(); } if (dev) - bootdev_clear_bootflows(dev); + bootstd_clear_bootflows_for_bootdev(dev); else bootstd_clear_glob(); for (i = 0, diff --git a/include/bootdev.h b/include/bootdev.h index 8db198dd56b..f9cae2fd1fd 100644 --- a/include/bootdev.h +++ b/include/bootdev.h @@ -185,16 +185,6 @@ int bootdev_find_in_blk(struct udevice *dev, struct udevice *blk, */ void bootdev_list(bool probe); -/** - * bootdev_clear_bootflows() - Clear bootflows from a bootdev - * - * Each bootdev maintains a list of discovered bootflows. This provides a - * way to clear it. These bootflows are removed from the global list too. - * - * @dev: bootdev device to update - */ -void bootdev_clear_bootflows(struct udevice *dev); - /** * bootdev_first_bootflow() - Get the first bootflow from a bootdev * diff --git a/include/bootstd.h b/include/bootstd.h index 3fc93a4ec2e..4220ece785d 100644 --- a/include/bootstd.h +++ b/include/bootstd.h @@ -122,4 +122,14 @@ int bootstd_prog_boot(void); */ int bootstd_add_bootflow(struct bootflow *bflow); +/** + * bootstd_clear_bootflows_for_bootdev() - Clear bootflows from a bootdev + * + * Each bootdev maintains a list of discovered bootflows. This provides a + * way to clear it. These bootflows are removed from the global list too. + * + * @dev: bootdev device to update + */ +int bootstd_clear_bootflows_for_bootdev(struct udevice *dev); + #endif
This relates to more than just the bootdev, since there is a global list of bootflows. Move the function to the bootstd file and rename it. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) boot/bootdev-uclass.c | 19 +++++-------------- boot/bootstd-uclass.c | 15 +++++++++++++++ cmd/bootflow.c | 2 +- include/bootdev.h | 10 ---------- include/bootstd.h | 10 ++++++++++ 5 files changed, 31 insertions(+), 25 deletions(-)