diff options
| author | Alexandre Ghiti <alexandre.ghiti@canonical.com> | 2021-10-27 09:43:36 +0200 |
|---|---|---|
| committer | Anup Patel <anup@brainfault.org> | 2021-11-02 11:23:16 +0530 |
| commit | c891acca172dfc60719419e19338508a83d97931 (patch) | |
| tree | 04658a01d122f0fbaf81b91adce26e738c812659 /platform | |
| parent | 723aa88ff4cc44230cf871bda319905113003279 (diff) | |
include: sbi_utils: Introduce an helper to get fdt base address
This simply adds an helper to get fdt address which is more explicit than
sbi_scratch_thishart_arg1_ptr.
Signed-off-by: Alexandre Ghiti <alexandre.ghiti@canonical.com>
Reviewed-by: Xiang W <wxjstz@126.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/andes/ae350/platform.c | 3 | ||||
| -rw-r--r-- | platform/fpga/ariane/platform.c | 3 | ||||
| -rw-r--r-- | platform/fpga/openpiton/platform.c | 4 | ||||
| -rw-r--r-- | platform/generic/platform.c | 6 | ||||
| -rw-r--r-- | platform/kendryte/k210/platform.c | 3 | ||||
| -rw-r--r-- | platform/nuclei/ux600/platform.c | 3 |
6 files changed, 13 insertions, 9 deletions
diff --git a/platform/andes/ae350/platform.c b/platform/andes/ae350/platform.c index ae4ef71..01232d0 100644 --- a/platform/andes/ae350/platform.c +++ b/platform/andes/ae350/platform.c @@ -15,6 +15,7 @@ #include <sbi/sbi_ipi.h> #include <sbi/sbi_platform.h> #include <sbi/sbi_trap.h> +#include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/irqchip/plic.h> #include <sbi_utils/serial/uart8250.h> @@ -55,7 +56,7 @@ static int ae350_final_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); fdt_fixups(fdt); return 0; diff --git a/platform/fpga/ariane/platform.c b/platform/fpga/ariane/platform.c index 5acc446..c6f0ffd 100644 --- a/platform/fpga/ariane/platform.c +++ b/platform/fpga/ariane/platform.c @@ -11,6 +11,7 @@ #include <sbi/sbi_const.h> #include <sbi/sbi_hart.h> #include <sbi/sbi_platform.h> +#include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/ipi/aclint_mswi.h> #include <sbi_utils/irqchip/plic.h> @@ -76,7 +77,7 @@ static int ariane_final_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); fdt_fixups(fdt); return 0; diff --git a/platform/fpga/openpiton/platform.c b/platform/fpga/openpiton/platform.c index 924053e..59c6702 100644 --- a/platform/fpga/openpiton/platform.c +++ b/platform/fpga/openpiton/platform.c @@ -76,7 +76,7 @@ static int openpiton_early_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); rc = fdt_parse_uart8250(fdt, &uart_data, "ns16550"); if (!rc) @@ -112,7 +112,7 @@ static int openpiton_final_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); fdt_fixups(fdt); return 0; diff --git a/platform/generic/platform.c b/platform/generic/platform.c index 0757d87..276f64e 100644 --- a/platform/generic/platform.c +++ b/platform/generic/platform.c @@ -148,7 +148,7 @@ static int generic_final_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); fdt_cpu_fixup(fdt); fdt_fixups(fdt); @@ -177,7 +177,7 @@ static void generic_final_exit(void) static int generic_domains_init(void) { - return fdt_domains_populate(sbi_scratch_thishart_arg1_ptr()); + return fdt_domains_populate(fdt_get_address()); } static u64 generic_tlbr_flush_limit(void) @@ -189,7 +189,7 @@ static u64 generic_tlbr_flush_limit(void) static int generic_pmu_init(void) { - return fdt_pmu_setup(sbi_scratch_thishart_arg1_ptr()); + return fdt_pmu_setup(fdt_get_address()); } static uint64_t generic_pmu_xlate_to_mhpmevent(uint32_t event_idx, diff --git a/platform/kendryte/k210/platform.c b/platform/kendryte/k210/platform.c index e7caec3..ef848c7 100644 --- a/platform/kendryte/k210/platform.c +++ b/platform/kendryte/k210/platform.c @@ -13,6 +13,7 @@ #include <sbi/sbi_const.h> #include <sbi/sbi_platform.h> #include <sbi/sbi_system.h> +#include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/ipi/aclint_mswi.h> #include <sbi_utils/irqchip/plic.h> @@ -120,7 +121,7 @@ static int k210_final_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); fdt_cpu_fixup(fdt); fdt_fixups(fdt); diff --git a/platform/nuclei/ux600/platform.c b/platform/nuclei/ux600/platform.c index 6f87cf8..5498a1f 100644 --- a/platform/nuclei/ux600/platform.c +++ b/platform/nuclei/ux600/platform.c @@ -16,6 +16,7 @@ #include <sbi/sbi_const.h> #include <sbi/sbi_platform.h> #include <sbi/sbi_system.h> +#include <sbi_utils/fdt/fdt_helper.h> #include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/ipi/aclint_mswi.h> #include <sbi_utils/irqchip/plic.h> @@ -175,7 +176,7 @@ static int ux600_final_init(bool cold_boot) if (!cold_boot) return 0; - fdt = sbi_scratch_thishart_arg1_ptr(); + fdt = fdt_get_address(); ux600_modify_dt(fdt); return 0; |