[PATCH v2 2/3] platform: generic: move fdt_reset_init to final_init

[Dong Du]

On Oct 26, 2021, at 9:48 PM, Heinrich Schuchardt heinrich.schuchardt at canonical.com wrote:

> Move the fdt_reset_init() invocation from generic_early_init() to
> generic_final_init(). This allows to print error messages.
> 
> Ignore the return value of fdt_reset_init() as we should not stop booting
> due to failure to initialize reset drivers.
> 
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt at canonical.com>
> ---
> v3:
>	no change
> v2:
>	new patch
> ---

Minors on title: should be PATCH v3 instead of v2.
Others are good to me.

Reviewed-by: Dong Du <Dd_nirvana at sjtu.edu.cn>

> platform/generic/platform.c | 15 +++++----------
> 1 file changed, 5 insertions(+), 10 deletions(-)
> 
> diff --git a/platform/generic/platform.c b/platform/generic/platform.c
> index 0757d87..8d4e41a 100644
> --- a/platform/generic/platform.c
> +++ b/platform/generic/platform.c
> @@ -120,18 +120,10 @@ fail:
> 
> static int generic_early_init(bool cold_boot)
> {
> -	int rc;
> -
> -	if (generic_plat && generic_plat->early_init) {
> -		rc = generic_plat->early_init(cold_boot, generic_plat_match);
> -		if (rc)
> -			return rc;
> -	}
> -
> -	if (!cold_boot)
> +	if (!generic_plat || !generic_plat->early_init)
> 		return 0;
> 
> -	return fdt_reset_init();
> +	return generic_plat->early_init(cold_boot, generic_plat_match);
> }
> 
> static int generic_final_init(bool cold_boot)
> @@ -139,6 +131,9 @@ static int generic_final_init(bool cold_boot)
> 	void *fdt;
> 	int rc;
> 
> +	if (cold_boot)
> +		fdt_reset_init();
> +
> 	if (generic_plat && generic_plat->final_init) {
> 		rc = generic_plat->final_init(cold_boot, generic_plat_match);
> 		if (rc)
> --
> 2.32.0
> 
> 
> --
> opensbi mailing list
> opensbi at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi