diff options
| author | Usama Arif <usamaarif642@gmail.com> | 2024-10-23 18:14:26 +0100 |
|---|---|---|
| committer | Rob Herring (Arm) <robh@kernel.org> | 2024-10-29 15:32:45 -0500 |
| commit | b2473a359763e27567993e7d8f37de82f57a0829 (patch) | |
| tree | 1e7df6a84697a025a8636a9e7191b966ce0a9f5e /include/linux/of_fdt.h | |
| parent | f9759e2b57049f9c4ea8d7254ba6afcf6eb10cd6 (diff) | |
| download | linux-b2473a359763e27567993e7d8f37de82f57a0829.tar.gz linux-b2473a359763e27567993e7d8f37de82f57a0829.tar.bz2 linux-b2473a359763e27567993e7d8f37de82f57a0829.zip | |
of/fdt: add dt_phys arg to early_init_dt_scan and early_init_dt_verify
__pa() is only intended to be used for linear map addresses and using
it for initial_boot_params which is in fixmap for arm64 will give an
incorrect value. Hence save the physical address when it is known at
boot time when calling early_init_dt_scan for arm64 and use it at kexec
time instead of converting the virtual address using __pa().
Note that arm64 doesn't need the FDT region reserved in the DT as the
kernel explicitly reserves the passed in FDT. Therefore, only a debug
warning is fixed with this change.
Reported-by: Breno Leitao <leitao@debian.org>
Suggested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Usama Arif <usamaarif642@gmail.com>
Fixes: ac10be5cdbfa ("arm64: Use common of_kexec_alloc_and_setup_fdt()")
Link: https://lore.kernel.org/r/20241023171426.452688-1-usamaarif642@gmail.com
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Diffstat (limited to 'include/linux/of_fdt.h')
| -rw-r--r-- | include/linux/of_fdt.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h index d69ad5bb1eb1..b8d6c0c20876 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h @@ -31,6 +31,7 @@ extern void *of_fdt_unflatten_tree(const unsigned long *blob, extern int __initdata dt_root_addr_cells; extern int __initdata dt_root_size_cells; extern void *initial_boot_params; +extern phys_addr_t initial_boot_params_pa; extern char __dtb_start[]; extern char __dtb_end[]; @@ -70,8 +71,8 @@ extern u64 dt_mem_next_cell(int s, const __be32 **cellp); /* Early flat tree scan hooks */ extern int early_init_dt_scan_root(void); -extern bool early_init_dt_scan(void *params); -extern bool early_init_dt_verify(void *params); +extern bool early_init_dt_scan(void *dt_virt, phys_addr_t dt_phys); +extern bool early_init_dt_verify(void *dt_virt, phys_addr_t dt_phys); extern void early_init_dt_scan_nodes(void); extern const char *of_flat_dt_get_machine_name(void); |