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

diff --git a/bl31/aarch64/runtime_exceptions.S b/bl31/aarch64/runtime_exceptions.S
index 7e119c58cbd85f3e91c5ea9217ee3a430fbb4de1..e3673f0d99be61efa782d4d4e66608c6ed399f55 100644 (file)
--- a/bl31/aarch64/runtime_exceptions.S
+++ b/bl31/aarch64/runtime_exceptions.S
@@ -84,7 +84,7 @@
         * interrupt controller reports a spurious interrupt then
         * return to where we came from.
         */
-       bl      ic_get_pending_interrupt_type
+       bl      plat_ic_get_pending_interrupt_type
        cmp     x0, #INTR_TYPE_INVAL
        b.eq    interrupt_exit_\label
 
@@ -105,7 +105,7 @@
         * Read the id of the highest priority pending interrupt. If
         * 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
        b.eq    interrupt_exit_\label
 #endif

diff --git a/bl31/bl31_main.c b/bl31/bl31_main.c
index 71c64643ef65a1ffe3f4d9879fb4974aff9fe0c1..5117793406f67e542dcd2cd60801a4d6db1b0969 100644 (file)
--- a/bl31/bl31_main.c
+++ b/bl31/bl31_main.c
@@ -165,7 +165,7 @@ void bl31_prepare_next_image_entry()
        bl31_next_el_arch_setup(image_type);
 
        /* 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);
 
        scr = read_scr();

diff --git a/bl32/tsp/tsp_interrupt.c b/bl32/tsp/tsp_interrupt.c
index ac45d7afa69299d8074ee775e8fce90e21f64947..4a4b877e29859e5153b2c2c88cb94b96f2032c92 100644 (file)
--- a/bl32/tsp/tsp_interrupt.c
+++ b/bl32/tsp/tsp_interrupt.c
@@ -82,7 +82,7 @@ int32_t tsp_fiq_handler()
         * secure physical generic timer interrupt in which case, handle it.
         * 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 */
        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
         * another secure interrupt through an assertion.
         */
-       id = ic_acknowledge_interrupt();
+       id = plat_ic_acknowledge_interrupt();
        assert(id == IRQ_SEC_PHY_TIMER);
        tsp_generic_timer_handler();
-       ic_end_of_interrupt(id);
+       plat_ic_end_of_interrupt(id);
 
        /* Update the statistics and print some messages */
        tsp_stats[linear_id].fiq_count++;

diff --git a/include/bl31/bl31.h b/include/bl31/bl31.h
index 8d22dc98bbb4d807258f7c32efb2a8373782e658..33e4ecee063535daf47ffba5e2de5a8269393e33 100644 (file)
--- a/include/bl31/bl31.h
+++ b/include/bl31/bl31.h
@@ -33,11 +33,6 @@
 
 #include <stdint.h>
 
-/******************************************
- * Forward declarations
- *****************************************/
-struct entry_point_info;
-
 /*******************************************************************************
  * 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);
 uint32_t bl31_get_next_image_type(void);
 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));
 
 #endif /* __BL31_H__ */

diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index ad0818028ae9833338bf0dc335169150d365c43c..714f6e0772cf533ee1c2e5db4ed1bbf1015b9cfe 100644 (file)
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -58,11 +58,11 @@ unsigned long plat_get_ns_image_entrypoint(void);
 /*******************************************************************************
  * Mandatory interrupt management functions
  ******************************************************************************/
-uint32_t ic_get_pending_interrupt_id(void);
-uint32_t ic_get_pending_interrupt_type(void);
-uint32_t ic_acknowledge_interrupt(void);
-uint32_t ic_get_interrupt_type(uint32_t id);
-void ic_end_of_interrupt(uint32_t id);
+uint32_t plat_ic_get_pending_interrupt_id(void);
+uint32_t plat_ic_get_pending_interrupt_type(void);
+uint32_t plat_ic_acknowledge_interrupt(void);
+uint32_t plat_ic_get_interrupt_type(uint32_t id);
+void plat_ic_end_of_interrupt(uint32_t id);
 uint32_t plat_interrupt_type_to_line(uint32_t type,
                                     uint32_t security_state);
 
@@ -152,7 +152,7 @@ void bl31_early_platform_setup(struct bl31_params *from_bl2,
                                void *plat_params_from_bl2);
 void bl31_plat_arch_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)

diff --git a/plat/fvp/bl31_fvp_setup.c b/plat/fvp/bl31_fvp_setup.c
index d867fbac9035d433eb96cdf10321c6b03b01ae4d..5169bd76bd33fa8151dce09a734b1e6e5eb0f85c 100644 (file)
--- a/plat/fvp/bl31_fvp_setup.c
+++ b/plat/fvp/bl31_fvp_setup.c
@@ -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
  * 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;
 

diff --git a/plat/fvp/fvp_gic.c b/plat/fvp/fvp_gic.c
index fed2fca1f4cf4a767ea3abacc8323c1cdbc63e22..3156da909230609b2b22a665a5835186a99bb16d 100644 (file)
--- a/plat/fvp/fvp_gic.c
+++ b/plat/fvp/fvp_gic.c
@@ -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
  * interrupt pending.
  ******************************************************************************/
-uint32_t ic_get_pending_interrupt_type()
+uint32_t plat_ic_get_pending_interrupt_type()
 {
        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
  * interrupt pending.
  ******************************************************************************/
-uint32_t ic_get_pending_interrupt_id()
+uint32_t plat_ic_get_pending_interrupt_id()
 {
        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
  * 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));
 }
@@ -379,7 +379,7 @@ uint32_t ic_acknowledge_interrupt()
  * This functions writes the GIC cpu interface End Of Interrupt register with
  * 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);
        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.
  * 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;
 

diff --git a/services/spd/tspd/tspd_main.c b/services/spd/tspd/tspd_main.c
index 1dbe6ba08f8d3f4060a53d6752991294ae8cbfe6..da40ea3623ba50eb867d2fa4a1d9e077bdd84cb9 100644 (file)
--- a/services/spd/tspd/tspd_main.c
+++ b/services/spd/tspd/tspd_main.c
@@ -160,7 +160,7 @@ int32_t tspd_setup(void)
         * absence is a critical failure.  TODO: Add support to
         * 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);
 
        /*