andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Further renames of platform porting functions 

Rename the ic_* platform porting functions to plat_ic_* to be
consistent with the other functions in platform.h. Also rename
bl31_get_next_image_info() to bl31_plat_get_next_image_ep_info()
and remove the duplicate declaration in bl31.h.

Change-Id: I4851842069d3cff14c0a468daacc0a891a7ede84
This commit is contained in:
Dan Handley 2014-05-27 16:17:21 +01:00
parent 0ad4691104
commit 9865ac1576
8 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bl31/aarch64/runtime_exceptions.S
View File

@ -84,7 +84,7 @@
* interrupt controller reports a spurious interrupt then * interrupt controller reports a spurious interrupt then
* return to where we came from. * return to where we came from.
*/ */
bl ic_get_pending_interrupt_type bl plat_ic_get_pending_interrupt_type
cmp x0, #INTR_TYPE_INVAL cmp x0, #INTR_TYPE_INVAL
b.eq interrupt_exit_\label b.eq interrupt_exit_\label
@ -105,7 +105,7 @@
* Read the id of the highest priority pending interrupt. If * Read the id of the highest priority pending interrupt. If
* no interrupt is asserted then return to where we came from. * no interrupt is asserted then return to where we came from.
*/ */
bl ic_get_pending_interrupt_id bl plat_ic_get_pending_interrupt_id
cmp x0, #INTR_ID_UNAVAILABLE cmp x0, #INTR_ID_UNAVAILABLE
b.eq interrupt_exit_\label b.eq interrupt_exit_\label
#endif #endif

2
bl31/bl31_main.c
View File

@ -165,7 +165,7 @@ void bl31_prepare_next_image_entry()
bl31_next_el_arch_setup(image_type); bl31_next_el_arch_setup(image_type);
/* Program EL3 registers to enable entry into the next EL */ /* Program EL3 registers to enable entry into the next EL */
next_image_info = bl31_get_next_image_info(image_type); next_image_info = bl31_plat_get_next_image_ep_info(image_type);
assert(next_image_info); assert(next_image_info);
scr = read_scr(); scr = read_scr();

6
bl32/tsp/tsp_interrupt.c
View File

@ -82,7 +82,7 @@ int32_t tsp_fiq_handler()
* secure physical generic timer interrupt in which case, handle it. * secure physical generic timer interrupt in which case, handle it.
* Otherwise throw this interrupt at the EL3 firmware. * Otherwise throw this interrupt at the EL3 firmware.
*/ */
id = ic_get_pending_interrupt_id(); id = plat_ic_get_pending_interrupt_id();
/* TSP can only handle the secure physical timer interrupt */ /* TSP can only handle the secure physical timer interrupt */
if (id != IRQ_SEC_PHY_TIMER) if (id != IRQ_SEC_PHY_TIMER)
@ -92,10 +92,10 @@ int32_t tsp_fiq_handler()
* Handle the interrupt. Also sanity check if it has been preempted by * Handle the interrupt. Also sanity check if it has been preempted by
* another secure interrupt through an assertion. * another secure interrupt through an assertion.
*/ */
id = ic_acknowledge_interrupt(); id = plat_ic_acknowledge_interrupt();
assert(id == IRQ_SEC_PHY_TIMER); assert(id == IRQ_SEC_PHY_TIMER);
tsp_generic_timer_handler(); tsp_generic_timer_handler();
ic_end_of_interrupt(id); plat_ic_end_of_interrupt(id);
/* Update the statistics and print some messages */ /* Update the statistics and print some messages */
tsp_stats[linear_id].fiq_count++; tsp_stats[linear_id].fiq_count++;

6
include/bl31/bl31.h
View File

@ -33,11 +33,6 @@
#include <stdint.h> #include <stdint.h>
/******************************************
* Forward declarations
*****************************************/
struct entry_point_info;
/******************************************************************************* /*******************************************************************************
* Function prototypes * Function prototypes
******************************************************************************/ ******************************************************************************/
@ -46,7 +41,6 @@ void bl31_next_el_arch_setup(uint32_t security_state);
void bl31_set_next_image_type(uint32_t type); void bl31_set_next_image_type(uint32_t type);
uint32_t bl31_get_next_image_type(void); uint32_t bl31_get_next_image_type(void);
void bl31_prepare_next_image_entry(); void bl31_prepare_next_image_entry();
struct entry_point_info *bl31_get_next_image_info(uint32_t type);
void bl31_register_bl32_init(int32_t (*)(void)); void bl31_register_bl32_init(int32_t (*)(void));
#endif /* __BL31_H__ */ #endif /* __BL31_H__ */

12
include/plat/common/platform.h
View File

@ -58,11 +58,11 @@ unsigned long plat_get_ns_image_entrypoint(void);
/******************************************************************************* /*******************************************************************************
* Mandatory interrupt management functions * Mandatory interrupt management functions
******************************************************************************/ ******************************************************************************/
uint32_t ic_get_pending_interrupt_id(void); uint32_t plat_ic_get_pending_interrupt_id(void);
uint32_t ic_get_pending_interrupt_type(void); uint32_t plat_ic_get_pending_interrupt_type(void);
uint32_t ic_acknowledge_interrupt(void); uint32_t plat_ic_acknowledge_interrupt(void);
uint32_t ic_get_interrupt_type(uint32_t id); uint32_t plat_ic_get_interrupt_type(uint32_t id);
void ic_end_of_interrupt(uint32_t id); void plat_ic_end_of_interrupt(uint32_t id);
uint32_t plat_interrupt_type_to_line(uint32_t type, uint32_t plat_interrupt_type_to_line(uint32_t type,
uint32_t security_state); uint32_t security_state);
@ -152,7 +152,7 @@ void bl31_early_platform_setup(struct bl31_params *from_bl2,
void *plat_params_from_bl2); void *plat_params_from_bl2);
void bl31_plat_arch_setup(void); void bl31_plat_arch_setup(void);
void bl31_platform_setup(void); void bl31_platform_setup(void);
struct entry_point_info *bl31_get_next_image_info(uint32_t type); struct entry_point_info *bl31_plat_get_next_image_ep_info(uint32_t type);
/******************************************************************************* /*******************************************************************************
* Mandatory PSCI functions (BL3-1) * Mandatory PSCI functions (BL3-1)

2
plat/fvp/bl31_fvp_setup.c
View File

@ -88,7 +88,7 @@ static bl31_params_t *bl2_to_bl31_params;
* while BL32 corresponds to the secure image type. A NULL pointer is returned * while BL32 corresponds to the secure image type. A NULL pointer is returned
* if the image does not exist. * if the image does not exist.
******************************************************************************/ ******************************************************************************/
entry_point_info_t *bl31_get_next_image_info(uint32_t type) entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)
{ {
entry_point_info_t *next_image_info; entry_point_info_t *next_image_info;

10
plat/fvp/fvp_gic.c
View File

@ -324,7 +324,7 @@ uint32_t plat_interrupt_type_to_line(uint32_t type, uint32_t security_state)
* the GIC cpu interface. INTR_TYPE_INVAL is returned when there is no * the GIC cpu interface. INTR_TYPE_INVAL is returned when there is no
* interrupt pending. * interrupt pending.
******************************************************************************/ ******************************************************************************/
uint32_t ic_get_pending_interrupt_type() uint32_t plat_ic_get_pending_interrupt_type()
{ {
uint32_t id, gicc_base; uint32_t id, gicc_base;
@ -346,7 +346,7 @@ uint32_t ic_get_pending_interrupt_type()
* the GIC cpu interface. INTR_ID_UNAVAILABLE is returned when there is no * the GIC cpu interface. INTR_ID_UNAVAILABLE is returned when there is no
* interrupt pending. * interrupt pending.
******************************************************************************/ ******************************************************************************/
uint32_t ic_get_pending_interrupt_id() uint32_t plat_ic_get_pending_interrupt_id()
{ {
uint32_t id, gicc_base; uint32_t id, gicc_base;
@ -370,7 +370,7 @@ uint32_t ic_get_pending_interrupt_id()
* This functions reads the GIC cpu interface Interrupt Acknowledge register * This functions reads the GIC cpu interface Interrupt Acknowledge register
* to start handling the pending interrupt. It returns the contents of the IAR. * to start handling the pending interrupt. It returns the contents of the IAR.
******************************************************************************/ ******************************************************************************/
uint32_t ic_acknowledge_interrupt() uint32_t plat_ic_acknowledge_interrupt()
{ {
return gicc_read_IAR(fvp_get_cfgvar(CONFIG_GICC_ADDR)); return gicc_read_IAR(fvp_get_cfgvar(CONFIG_GICC_ADDR));
} }
@ -379,7 +379,7 @@ uint32_t ic_acknowledge_interrupt()
* This functions writes the GIC cpu interface End Of Interrupt register with * This functions writes the GIC cpu interface End Of Interrupt register with
* the passed value to finish handling the active interrupt * the passed value to finish handling the active interrupt
******************************************************************************/ ******************************************************************************/
void ic_end_of_interrupt(uint32_t id) void plat_ic_end_of_interrupt(uint32_t id)
{ {
gicc_write_EOIR(fvp_get_cfgvar(CONFIG_GICC_ADDR), id); gicc_write_EOIR(fvp_get_cfgvar(CONFIG_GICC_ADDR), id);
return; return;
@ -390,7 +390,7 @@ void ic_end_of_interrupt(uint32_t id)
* this interrupt has been configured under by the interrupt controller i.e. * this interrupt has been configured under by the interrupt controller i.e.
* group0 or group1. * group0 or group1.
******************************************************************************/ ******************************************************************************/
uint32_t ic_get_interrupt_type(uint32_t id) uint32_t plat_ic_get_interrupt_type(uint32_t id)
{ {
uint32_t group; uint32_t group;

2
services/spd/tspd/tspd_main.c
View File

@ -160,7 +160,7 @@ int32_t tspd_setup(void)
* absence is a critical failure. TODO: Add support to * absence is a critical failure. TODO: Add support to
* conditionally include the SPD service * conditionally include the SPD service
*/ */
image_info = bl31_get_next_image_info(SECURE); image_info = bl31_plat_get_next_image_ep_info(SECURE);
assert(image_info); assert(image_info);
/* /*