Re: [PATCH 07/10] riscv: Drop board_quiesce_devices()

[Tom Rini]

On Tue, Jan 06, 2026 at 05:31:24PM -0700, Simon Glass wrote:

> From: Simon Glass <s...@chromium.org>
> 
> This is not used on RISC-V so drop it.
> 
> Signed-off-by: Simon Glass <s...@chromium.org>
> Signed-off-by: Simon Glass <simon.gl...@canonical.com>
> ---
> 
>  arch/riscv/include/asm/u-boot-riscv.h | 1 -
>  arch/riscv/lib/bootm.c                | 8 +++-----
>  2 files changed, 3 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/riscv/include/asm/u-boot-riscv.h 
> b/arch/riscv/include/asm/u-boot-riscv.h
> index 543a1688db8..3a8fdb57136 100644
> --- a/arch/riscv/include/asm/u-boot-riscv.h
> +++ b/arch/riscv/include/asm/u-boot-riscv.h
> @@ -16,7 +16,6 @@ int cleanup_before_linux(void);
>  
>  /* board/.../... */
>  int board_init(void);
> -void board_quiesce_devices(void);
>  int riscv_board_reserved_mem_fixup(void *fdt);
>  int riscv_fdt_copy_resv_mem_node(const void *src_fdt, void *dest_fdt);
>  
> diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
> index 9544907ab1e..35403e03ab0 100644
> --- a/arch/riscv/lib/bootm.c
> +++ b/arch/riscv/lib/bootm.c
> @@ -25,10 +25,6 @@
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  
> -__weak void board_quiesce_devices(void)
> -{
> -}
> -
>  /**
>   * announce_and_cleanup() - Print message and prepare for kernel boot
>   *
> @@ -46,7 +42,9 @@ static void announce_and_cleanup(int fake)
>       bootstage_report();
>  #endif
>  
> -     board_quiesce_devices();
> +#ifdef CONFIG_USB_DEVICE
> +     udc_disconnect();
> +#endif
>  
>       /*
>        * Call remove function of all devices with a removal flag set.

You're dropping the generic hook board_quiesce_devices which is wrong
and adding udc_disconnect() and a test for CONFIG_USB_DEVICE which is
not present in mainline.

-- 
Tom

signature.asc
Description: PGP signature