Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/arch/arm/plat-aspeed/platform_ast2600.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}

void console_init(void)
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-aspeed/platform_ast2700.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}

void console_init(void)
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-corstone1000/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}

void console_init(void)
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-imx/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,6 @@ void boot_primary_init_intc(void)
#if CFG_TEE_CORE_NB_CORE > 1
void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}
#endif
2 changes: 1 addition & 1 deletion core/arch/arm/plat-k3/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}

void console_init(void)
Expand Down
4 changes: 1 addition & 3 deletions core/arch/arm/plat-ls/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,7 @@ void boot_primary_init_intc(void)
gic_init(gic_base + gicc_offset, gic_base + gicd_offset);
}

#if !defined(CFG_WITH_ARM_TRUSTED_FW)
void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}
#endif
2 changes: 1 addition & 1 deletion core/arch/arm/plat-rcar/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,5 +94,5 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}
2 changes: 1 addition & 1 deletion core/arch/arm/plat-rockchip/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}

void console_init(void)
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-rzn1/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}

static TEE_Result rzn1_tz_init(void)
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-stm/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,5 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}
2 changes: 1 addition & 1 deletion core/arch/arm/plat-stm32mp1/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();

stm32mp_register_online_cpu();
}
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-stm32mp2/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,5 +140,5 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}
2 changes: 1 addition & 1 deletion core/arch/arm/plat-sunxi/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-ti/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}

struct plat_nsec_ctx {
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/plat-zynq7k/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void boot_primary_init_intc(void)

void boot_secondary_init_intc(void)
{
gic_cpu_init();
gic_init_per_cpu();
}

static vaddr_t slcr_access_range[] = {
Expand Down
14 changes: 0 additions & 14 deletions core/drivers/gic.c
Original file line number Diff line number Diff line change
Expand Up @@ -342,20 +342,6 @@ void gic_init_per_cpu(void)
}
}

void gic_cpu_init(void)
{
struct gic_data *gd = &gic_data;

#if defined(CFG_ARM_GICV3)
assert(gd->gicd_base);
#else
assert(gd->gicd_base && gd->gicc_base);
#endif
IMSG("%s is deprecated, please use gic_init_per_cpu()", __func__);

init_gic_per_cpu(gd);
}

void gic_init_donate_sgi_to_ns(size_t it)
{
struct gic_data *gd = &gic_data;
Expand Down
8 changes: 0 additions & 8 deletions core/include/drivers/gic.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,6 @@ void gic_init_donate_sgi_to_ns(size_t it);
*/
void gic_init_per_cpu(void);

/*
* Only initialize CPU GIC interface, mainly use for secondary CPUs in
* non-TF-A configurations.
*
* This function is deprecated, please use gic_init_per_cpu() instead.
*/
void gic_cpu_init(void);

/* Print GIC state to console */
void gic_dump_state(void);
#endif /*__DRIVERS_GIC_H*/