Mirrors/opensbi
1
0
Fork 1
mirror of https://github.com/riscv-software-src/opensbi.git synced 2025-08-24 23:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

include: sbi_utils: Introduce an helper to get fdt base address

Browse Source 
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>
This commit is contained in:
Alexandre Ghiti
2021-10-27 09:43:36 +02:00
committed by Anup Patel
parent 723aa88ff4
commit c891acca17
12 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/sbi_utils/fdt/fdt_helper.h
View File

@@ -11,6 +11,7 @@
#define __FDT_HELPER_H__ #define __FDT_HELPER_H__
#include <sbi/sbi_types.h> #include <sbi/sbi_types.h>
#include <sbi/sbi_scratch.h>
struct fdt_match { struct fdt_match {
const char *compatible; const char *compatible;
@@ -81,4 +82,9 @@ int fdt_parse_aclint_node(void *fdt, int nodeoffset, bool for_timer,
int fdt_parse_compat_addr(void *fdt, uint64_t *addr, int fdt_parse_compat_addr(void *fdt, uint64_t *addr,
const char *compatible); const char *compatible);
static inline void *fdt_get_address(void)
{
return sbi_scratch_thishart_arg1_ptr();
}
#endif /* __FDT_HELPER_H__ */ #endif /* __FDT_HELPER_H__ */

2
lib/utils/ipi/fdt_ipi.c
View File

@@ -45,7 +45,7 @@ static int fdt_ipi_cold_init(void)
int pos, noff, rc; int pos, noff, rc;
struct fdt_ipi *drv; struct fdt_ipi *drv;
const struct fdt_match *match; const struct fdt_match *match;
void *fdt = sbi_scratch_thishart_arg1_ptr(); void *fdt = fdt_get_address();
for (pos = 0; pos < array_size(ipi_drivers); pos++) { for (pos = 0; pos < array_size(ipi_drivers); pos++) {
drv = ipi_drivers[pos]; drv = ipi_drivers[pos];

2
lib/utils/irqchip/fdt_irqchip.c
View File

@@ -38,7 +38,7 @@ static int fdt_irqchip_cold_init(void)
int pos, noff, rc; int pos, noff, rc;
struct fdt_irqchip *drv; struct fdt_irqchip *drv;
const struct fdt_match *match; const struct fdt_match *match;
void *fdt = sbi_scratch_thishart_arg1_ptr(); void *fdt = fdt_get_address();
for (pos = 0; pos < array_size(irqchip_drivers); pos++) { for (pos = 0; pos < array_size(irqchip_drivers); pos++) {
drv = irqchip_drivers[pos]; drv = irqchip_drivers[pos];

2
lib/utils/reset/fdt_reset.c
View File

@@ -33,7 +33,7 @@ int fdt_reset_init(void)
int pos, noff, rc; int pos, noff, rc;
struct fdt_reset *drv; struct fdt_reset *drv;
const struct fdt_match *match; const struct fdt_match *match;
void *fdt = sbi_scratch_thishart_arg1_ptr(); void *fdt = fdt_get_address();
for (pos = 0; pos < array_size(reset_drivers); pos++) { for (pos = 0; pos < array_size(reset_drivers); pos++) {
drv = reset_drivers[pos]; drv = reset_drivers[pos];

2
lib/utils/serial/fdt_serial.c
View File

@@ -40,7 +40,7 @@ int fdt_serial_init(void)
struct fdt_serial *drv; struct fdt_serial *drv;
const struct fdt_match *match; const struct fdt_match *match;
int pos, noff = -1, len, coff, rc; int pos, noff = -1, len, coff, rc;
void *fdt = sbi_scratch_thishart_arg1_ptr(); void *fdt = fdt_get_address();
/* Find offset of node pointed to by stdout-path */ /* Find offset of node pointed to by stdout-path */
coff = fdt_path_offset(fdt, "/chosen"); coff = fdt_path_offset(fdt, "/chosen");

2
lib/utils/timer/fdt_timer.c
View File

@@ -45,7 +45,7 @@ static int fdt_timer_cold_init(void)
int pos, noff, rc; int pos, noff, rc;
struct fdt_timer *drv; struct fdt_timer *drv;
const struct fdt_match *match; const struct fdt_match *match;
void *fdt = sbi_scratch_thishart_arg1_ptr(); void *fdt = fdt_get_address();
for (pos = 0; pos < array_size(timer_drivers); pos++) { for (pos = 0; pos < array_size(timer_drivers); pos++) {
drv = timer_drivers[pos]; drv = timer_drivers[pos];

3
platform/andes/ae350/platform.c
View File

@@ -15,6 +15,7 @@
#include <sbi/sbi_ipi.h> #include <sbi/sbi_ipi.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <sbi/sbi_trap.h> #include <sbi/sbi_trap.h>
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/fdt/fdt_fixup.h>
#include <sbi_utils/irqchip/plic.h> #include <sbi_utils/irqchip/plic.h>
#include <sbi_utils/serial/uart8250.h> #include <sbi_utils/serial/uart8250.h>
@@ -55,7 +56,7 @@ static int ae350_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = sbi_scratch_thishart_arg1_ptr(); fdt = fdt_get_address();
fdt_fixups(fdt); fdt_fixups(fdt);
return 0; return 0;

3
platform/fpga/ariane/platform.c
View File

@@ -11,6 +11,7 @@
#include <sbi/sbi_const.h> #include <sbi/sbi_const.h>
#include <sbi/sbi_hart.h> #include <sbi/sbi_hart.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/fdt/fdt_fixup.h>
#include <sbi_utils/ipi/aclint_mswi.h> #include <sbi_utils/ipi/aclint_mswi.h>
#include <sbi_utils/irqchip/plic.h> #include <sbi_utils/irqchip/plic.h>
@@ -76,7 +77,7 @@ static int ariane_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = sbi_scratch_thishart_arg1_ptr(); fdt = fdt_get_address();
fdt_fixups(fdt); fdt_fixups(fdt);
return 0; return 0;

4
platform/fpga/openpiton/platform.c
View File

@@ -76,7 +76,7 @@ static int openpiton_early_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = sbi_scratch_thishart_arg1_ptr(); fdt = fdt_get_address();
rc = fdt_parse_uart8250(fdt, &uart_data, "ns16550"); rc = fdt_parse_uart8250(fdt, &uart_data, "ns16550");
if (!rc) if (!rc)
@@ -112,7 +112,7 @@ static int openpiton_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = sbi_scratch_thishart_arg1_ptr(); fdt = fdt_get_address();
fdt_fixups(fdt); fdt_fixups(fdt);
return 0; return 0;

6
platform/generic/platform.c
View File

@@ -148,7 +148,7 @@ static int generic_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = sbi_scratch_thishart_arg1_ptr(); fdt = fdt_get_address();
fdt_cpu_fixup(fdt); fdt_cpu_fixup(fdt);
fdt_fixups(fdt); fdt_fixups(fdt);
@@ -177,7 +177,7 @@ static void generic_final_exit(void)
static int generic_domains_init(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) static u64 generic_tlbr_flush_limit(void)
@@ -189,7 +189,7 @@ static u64 generic_tlbr_flush_limit(void)
static int generic_pmu_init(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, static uint64_t generic_pmu_xlate_to_mhpmevent(uint32_t event_idx,

3
platform/kendryte/k210/platform.c
View File

@@ -13,6 +13,7 @@
#include <sbi/sbi_const.h> #include <sbi/sbi_const.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <sbi/sbi_system.h> #include <sbi/sbi_system.h>
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/fdt/fdt_fixup.h>
#include <sbi_utils/ipi/aclint_mswi.h> #include <sbi_utils/ipi/aclint_mswi.h>
#include <sbi_utils/irqchip/plic.h> #include <sbi_utils/irqchip/plic.h>
@@ -120,7 +121,7 @@ static int k210_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = sbi_scratch_thishart_arg1_ptr(); fdt = fdt_get_address();
fdt_cpu_fixup(fdt); fdt_cpu_fixup(fdt);
fdt_fixups(fdt); fdt_fixups(fdt);

3
platform/nuclei/ux600/platform.c
View File

@@ -16,6 +16,7 @@
#include <sbi/sbi_const.h> #include <sbi/sbi_const.h>
#include <sbi/sbi_platform.h> #include <sbi/sbi_platform.h>
#include <sbi/sbi_system.h> #include <sbi/sbi_system.h>
#include <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/fdt/fdt_fixup.h> #include <sbi_utils/fdt/fdt_fixup.h>
#include <sbi_utils/ipi/aclint_mswi.h> #include <sbi_utils/ipi/aclint_mswi.h>
#include <sbi_utils/irqchip/plic.h> #include <sbi_utils/irqchip/plic.h>
@@ -175,7 +176,7 @@ static int ux600_final_init(bool cold_boot)
if (!cold_boot) if (!cold_boot)
return 0; return 0;
fdt = sbi_scratch_thishart_arg1_ptr(); fdt = fdt_get_address();
ux600_modify_dt(fdt); ux600_modify_dt(fdt);
return 0; return 0;