diff options
-rw-r--r-- | arch/arm/mach-omap2/omap-secure.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap-smc.S | 21 |
2 files changed, 21 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h index 0e729170c46b..c4586f42ea98 100644 --- a/arch/arm/mach-omap2/omap-secure.h +++ b/arch/arm/mach-omap2/omap-secure.h | |||
@@ -51,6 +51,7 @@ | |||
51 | extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, | 51 | extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, |
52 | u32 arg1, u32 arg2, u32 arg3, u32 arg4); | 52 | u32 arg1, u32 arg2, u32 arg3, u32 arg4); |
53 | extern u32 omap_smc2(u32 id, u32 falg, u32 pargs); | 53 | extern u32 omap_smc2(u32 id, u32 falg, u32 pargs); |
54 | extern u32 omap_smc3(u32 id, u32 process, u32 flag, u32 pargs); | ||
54 | extern phys_addr_t omap_secure_ram_mempool_base(void); | 55 | extern phys_addr_t omap_secure_ram_mempool_base(void); |
55 | extern int omap_secure_ram_reserve_memblock(void); | 56 | extern int omap_secure_ram_reserve_memblock(void); |
56 | 57 | ||
diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S index f6441c13cd8c..fd90125bffc7 100644 --- a/arch/arm/mach-omap2/omap-smc.S +++ b/arch/arm/mach-omap2/omap-smc.S | |||
@@ -1,9 +1,11 @@ | |||
1 | /* | 1 | /* |
2 | * OMAP44xx secure APIs file. | 2 | * OMAP34xx and OMAP44xx secure APIs file. |
3 | * | 3 | * |
4 | * Copyright (C) 2010 Texas Instruments, Inc. | 4 | * Copyright (C) 2010 Texas Instruments, Inc. |
5 | * Written by Santosh Shilimkar <santosh.shilimkar@ti.com> | 5 | * Written by Santosh Shilimkar <santosh.shilimkar@ti.com> |
6 | * | 6 | * |
7 | * Copyright (C) 2012 Ivaylo Dimitrov <freemangordon@abv.bg> | ||
8 | * Copyright (C) 2013 Pali Rohár <pali.rohar@gmail.com> | ||
7 | * | 9 | * |
8 | * This program is free software,you can redistribute it and/or modify | 10 | * This program is free software,you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License version 2 as | 11 | * it under the terms of the GNU General Public License version 2 as |
@@ -54,6 +56,23 @@ ENTRY(omap_smc2) | |||
54 | ldmfd sp!, {r4-r12, pc} | 56 | ldmfd sp!, {r4-r12, pc} |
55 | ENDPROC(omap_smc2) | 57 | ENDPROC(omap_smc2) |
56 | 58 | ||
59 | /** | ||
60 | * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs) | ||
61 | * Low level common routine for secure HAL and PPA APIs via smc #1 | ||
62 | * r0 - @service_id: Secure Service ID | ||
63 | * r1 - @process_id: Process ID | ||
64 | * r2 - @flag: Flag to indicate the criticality of operation | ||
65 | * r3 - @pargs: Physical address of parameter list | ||
66 | */ | ||
67 | ENTRY(omap_smc3) | ||
68 | stmfd sp!, {r4-r11, lr} | ||
69 | mov r12, r0 @ Copy the secure service ID | ||
70 | mov r6, #0xff @ Indicate new Task call | ||
71 | dsb @ Memory Barrier (not sure if needed, copied from omap_smc2) | ||
72 | smc #1 @ Call PPA service | ||
73 | ldmfd sp!, {r4-r11, pc} | ||
74 | ENDPROC(omap_smc3) | ||
75 | |||
57 | ENTRY(omap_modify_auxcoreboot0) | 76 | ENTRY(omap_modify_auxcoreboot0) |
58 | stmfd sp!, {r1-r12, lr} | 77 | stmfd sp!, {r1-r12, lr} |
59 | ldr r12, =0x104 | 78 | ldr r12, =0x104 |