[PATCH 1/2] arm: omap3: Make secureworld_exit() static

[PATCH 1/2] arm: omap3: Make secureworld_exit() static

[Adam Ford]

secureworld_exit() is only used in one file, so make it static
to that file and remove it from sys_proto.h. This
may help with some further optimization in the future.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
index 656f848a73..a6e9ff84aa 100644
--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
@@ -59,7 +59,6 @@ u32 is_running_in_sdram(void);
 u32 is_running_in_sram(void);
 u32 is_running_in_flash(void);
 u32 get_device_type(void);
-void secureworld_exit(void);
 u32 get_boot_type(void);
 void invalidate_dcache(u32);
 u32 wait_on_value(u32, u32, void *, u32);
diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index c621177580..87dddd9b0f 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -114,7 +114,7 @@ void secure_unlock_mem(void)
  *		configure secure registers and exit secure world
  *              general use.
  *****************************************************************************/
-void secureworld_exit(void)
+static void secureworld_exit(void)
 {
 	unsigned long i;
 
-- 
2.25.1

[PATCH 2/2] arm: omap3: Make secure_unlock_mem() static

[Adam Ford]

secure_unlock_mem() is only used in one file, so make it static
in that file. This
may help with some further optimization in the future.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
index 87dddd9b0f..74b5a4b111 100644
--- a/arch/arm/mach-omap2/omap3/board.c
+++ b/arch/arm/mach-omap2/omap3/board.c
@@ -76,7 +76,7 @@ const struct gpio_bank *const omap_gpio_bank = gpio_bank_34xx;
  * Description: Setup security registers for access
  *              (GP Device only)
  *****************************************************************************/
-void secure_unlock_mem(void)
+static void secure_unlock_mem(void)
 {
 	struct pm *pm_rt_ape_base = (struct pm *)PM_RT_APE_BASE_ADDR_ARM;
 	struct pm *pm_gpmc_base = (struct pm *)PM_GPMC_BASE_ADDR_ARM;
-- 
2.25.1

[PATCH 1/2] arm: omap3: Make secureworld_exit() static

[Adam Ford]

On Sat, Mar 6, 2021 at 10:04 PM Adam Ford <aford173@gmail.com> wrote:
>
> secureworld_exit() is only used in one file, so make it static
> to that file and remove it from sys_proto.h. This
> may help with some further optimization in the future.
>
> Signed-off-by: Adam Ford <aford173@gmail.com>
>

Lokesh,

Is this patch ok as-is, or do you want me to re-post it as V2 with no
changes when I redo patch 2/2?

adam

> diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
> index 656f848a73..a6e9ff84aa 100644
> --- a/arch/arm/include/asm/arch-omap3/sys_proto.h
> +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
> @@ -59,7 +59,6 @@ u32 is_running_in_sdram(void);
>  u32 is_running_in_sram(void);
>  u32 is_running_in_flash(void);
>  u32 get_device_type(void);
> -void secureworld_exit(void);
>  u32 get_boot_type(void);
>  void invalidate_dcache(u32);
>  u32 wait_on_value(u32, u32, void *, u32);
> diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
> index c621177580..87dddd9b0f 100644
> --- a/arch/arm/mach-omap2/omap3/board.c
> +++ b/arch/arm/mach-omap2/omap3/board.c
> @@ -114,7 +114,7 @@ void secure_unlock_mem(void)
>   *             configure secure registers and exit secure world
>   *              general use.
>   *****************************************************************************/
> -void secureworld_exit(void)
> +static void secureworld_exit(void)
>  {
>         unsigned long i;
>
> --
> 2.25.1
>

[PATCH 1/2] arm: omap3: Make secureworld_exit() static

[Lokesh Vutla]

On 17/03/21 11:00 pm, Adam Ford wrote:
> On Sat, Mar 6, 2021 at 10:04 PM Adam Ford <aford173@gmail.com> wrote:
>>
>> secureworld_exit() is only used in one file, so make it static
>> to that file and remove it from sys_proto.h. This
>> may help with some further optimization in the future.
>>
>> Signed-off-by: Adam Ford <aford173@gmail.com>
>>
> 
> Lokesh,
> 
> Is this patch ok as-is, or do you want me to re-post it as V2 with no
> changes when I redo patch 2/2?

Patch is okay. Please re-post it as V2 as a series.

Thanks and regards,
Lokesh

> 
> adam
> 
>> diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
>> index 656f848a73..a6e9ff84aa 100644
>> --- a/arch/arm/include/asm/arch-omap3/sys_proto.h
>> +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
>> @@ -59,7 +59,6 @@ u32 is_running_in_sdram(void);
>>  u32 is_running_in_sram(void);
>>  u32 is_running_in_flash(void);
>>  u32 get_device_type(void);
>> -void secureworld_exit(void);
>>  u32 get_boot_type(void);
>>  void invalidate_dcache(u32);
>>  u32 wait_on_value(u32, u32, void *, u32);
>> diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c
>> index c621177580..87dddd9b0f 100644
>> --- a/arch/arm/mach-omap2/omap3/board.c
>> +++ b/arch/arm/mach-omap2/omap3/board.c
>> @@ -114,7 +114,7 @@ void secure_unlock_mem(void)
>>   *             configure secure registers and exit secure world
>>   *              general use.
>>   *****************************************************************************/
>> -void secureworld_exit(void)
>> +static void secureworld_exit(void)
>>  {
>>         unsigned long i;
>>
>> --
>> 2.25.1
>>