[PATCHv3] efi: apply memblock cap after memblock_add()

[Leizhen (ThunderTown)]

On 2021/12/15 10:13, Pingfan Liu wrote:
>  
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index 18a2df431bfd..aa07ef5cab5f 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -972,7 +972,7 @@ static unsigned long chosen_node_offset = -FDT_ERR_NOTFOUND;
>   * location from flat tree
>   * @node: reference to node containing usable memory range location ('chosen')
>   */
> -static void __init early_init_dt_check_for_usable_mem_range(void)
> +void __init early_init_dt_check_for_usable_mem_range(void)

Why do I see a parameter 'node'?

master:
drivers/of/fdt.c:976:static void __init early_init_dt_check_for_usable_mem_range(unsigned long node)

next:
drivers/of/fdt.c:980:static void __init early_init_dt_check_for_usable_mem_range(unsigned long node)

>  {
>  	const __be32 *prop;
>  	int len;
> diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h
> index cf48983d3c86..ad09beb6d13c 100644
> --- a/include/linux/of_fdt.h
> +++ b/include/linux/of_fdt.h
> @@ -62,6 +62,7 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname,
>  				     int depth, void *data);
>  extern int early_init_dt_scan_memory(unsigned long node, const char *uname,
>  				     int depth, void *data);
> +extern void early_init_dt_check_for_usable_mem_range(void);
>  extern int early_init_dt_scan_chosen_stdout(void);
>  extern void early_init_fdt_scan_reserved_mem(void);
>  extern void early_init_fdt_reserve_self(void);
> @@ -86,6 +87,7 @@ extern void unflatten_and_copy_device_tree(void);
>  extern void early_init_devtree(void *);
>  extern void early_get_first_memblock_info(void *, phys_addr_t *);
>  #else /* CONFIG_OF_EARLY_FLATTREE */
> +static inline void early_init_dt_check_for_usable_mem_range(void) {}
>  static inline int early_init_dt_scan_chosen_stdout(void) { return -ENODEV; }
>  static inline void early_init_fdt_scan_reserved_mem(void) {}
>  static inline void early_init_fdt_reserve_self(void) {}
>