ARM: OMAP: Add secure function omap_smc3() which calling instruction smc #1
Subsystems (3)
Quoted 8 lines
-------- Оригинално писмо --------
От: Dave Martin
Относно: Re: [PATCH v2 1/2] ARM: OMAP: Add secure functionomap_smc3()which
calling instruction smc #1
Quoted 70 lines
До: Pali Rohár
Изпратено на: Сряда, 2013, Юли 10 20:45:26 EESTQuoted 43 lines · Pali Rohár
Other secure functions
omap_smc1()andomap_smc2()calling instruction smc #0 but Nokia RX-51 board needs to call smc #1 for PPA access.Signed-off-by Ivaylo DimitrovSigned-off-by Pali Rohár--- arch/arm/mach-omap2/omap-secure.h | 1 + arch/arm/mach-omap2/omap-smc.S | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)arch/arm/mach-omap2/omap-secure.h +1
-0@@ -51,6 +51,7 @@extern u32 omap_secure_dispatcher (u32 idx,u32 flag,u32 nargs,u32 arg1,u32 arg2,u32 arg3,u32 arg4);extern u32 omap_smc2 (u32 id,u32 falg,u32 pargs); +extern u32 omap_smc3 (u32 id,u32 process,u32 flag,u32 pargs);extern phys_addr_t omap_secure_ram_mempool_base (void );extern int omap_secure_ram_reserve_memblock (void );arch/arm/mach-omap2/omap-smc.S +3
-1@@ -1,9 +1,11 @@ /* - * OMAP44xx secure APIs file. + * OMAP34xx and OMAP44xx secure APIs file. * * Copyright (C) 2010 Texas Instruments, Inc. * Written by Santosh Shilimkar * + * Copyright (C) 2012 Ivaylo Dimitrov + * Copyright (C) 2013 Pali Rohár * * This program is free software,you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as@@ -54,6 +56,24 @@ ENTRY(omap_smc2) ldmfd sp!, {r4-r12, pc} ENDPROC(omap_smc2)arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 68
Quoted 10 lines
arch/arm/mach-omap2/omap-smc.S +10
-0+/** + * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs) + * Low level common routine for secure HAL and PPA APIs via smc #1 + * r0 - @service_id: Secure Service ID + * r1 - @process_id: Process ID + * r2 - @flag: Flag to indicate the criticality of operation + * r3 - @pargs: Physical address of parameter list + */ +ENTRY(omap_smc3) + stmfd sp!, {r4-r12, lr}You don't need to save/restore r12. The ABI allows it to be clobbered across function calls.
arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 72
Quoted 4 lines
arch/arm/mach-omap2/omap-smc.S +4
-0+ mov r12, r0 @ Copy the secure service ID + mov r6, #0xff @ Indicate new Task call + dsb + dmbdsb synchronises a superset of what dmb synchronises, so the dmb here is not useful.
Quoted 10 lines
In any case, any code calling this must flush the region addressed by r3 beforehand anyway, which will include a dsb as part of its semantics -- this is how you call it from
rx51_secure_dispatcher().So I think the dsb may not be needed here (?)
Cheers
---Dave
Could be, but I wonder why almost all the kernel code(I am aware of) that uses SMC and is written by TI, is storing r12 and is using both DSB and DMB. See arch/arm/mach-omap2/sleep34xx.S or arch/arm/mach-omap2/omap-smc.S for examples. I'd rather play it safe and leave it that way, unless someone confirms the other code using SMC has extra DSB/DMB instructions too. I wouldn't risk passing invalid/stale data to the Secure Monitor to just save 8 bytes and barriers in a performance non-critical code which will be called only a couple of times during the boot-up process. r12 save/restore is a legacy from omap_smc2 in omap-smc.S, so I guess it can go away without much of a trouble.
Quoted 83 lines · ?????? ????????
Quoted 8 lines
-------- ?????????? ????? --------
??: Dave Martin
???????: Re: [PATCH v2 1/2] ARM: OMAP: Add secure functionomap_smc3()whichcalling instruction smc #1
Quoted 74 lines
??: Pali Roh?r
????????? ??: ?????, 2013, ??? 10 20:45:26 EESTQuoted 43 lines · Pali Roh?r
Other secure functions
omap_smc1()andomap_smc2()calling instruction smc #0 but Nokia RX-51 board needs to call smc #1 for PPA access.Signed-off-by Ivaylo DimitrovSigned-off-by Pali Roh?r--- arch/arm/mach-omap2/omap-secure.h | 1 + arch/arm/mach-omap2/omap-smc.S | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)arch/arm/mach-omap2/omap-secure.h +1
-0@@ -51,6 +51,7 @@extern u32 omap_secure_dispatcher (u32 idx,u32 flag,u32 nargs,u32 arg1,u32 arg2,u32 arg3,u32 arg4);extern u32 omap_smc2 (u32 id,u32 falg,u32 pargs); +extern u32 omap_smc3 (u32 id,u32 process,u32 flag,u32 pargs);extern phys_addr_t omap_secure_ram_mempool_base (void );extern int omap_secure_ram_reserve_memblock (void );arch/arm/mach-omap2/omap-smc.S +3
-1@@ -1,9 +1,11 @@ /* - * OMAP44xx secure APIs file. + * OMAP34xx and OMAP44xx secure APIs file. * * Copyright (C) 2010 Texas Instruments, Inc. * Written by Santosh Shilimkar * + * Copyright (C) 2012 Ivaylo Dimitrov + * Copyright (C) 2013 Pali Roh?r * * This program is free software,you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as@@ -54,6 +56,24 @@ ENTRY(omap_smc2) ldmfd sp!, {r4-r12, pc} ENDPROC(omap_smc2)arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 68
Quoted 10 lines
arch/arm/mach-omap2/omap-smc.S +10
-0+/** + * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs) + * Low level common routine for secure HAL and PPA APIs via smc #1 + * r0 - @service_id: Secure Service ID + * r1 - @process_id: Process ID + * r2 - @flag: Flag to indicate the criticality of operation + * r3 - @pargs: Physical address of parameter list + */ +ENTRY(omap_smc3) + stmfd sp!, {r4-r12, lr}You don't need to save/restore r12. The ABI allows it to be clobbered across function calls.
arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 72
Quoted 4 lines
arch/arm/mach-omap2/omap-smc.S +4
-0+ mov r12, r0 @ Copy the secure service ID + mov r6, #0xff @ Indicate new Task call + dsb + dmbdsb synchronises a superset of what dmb synchronises, so the dmb here is not useful.
In any case, any code calling this must flush the region addressed by r3 beforehand anyway, which will include a dsb as part of its semantics -- this is how you call it from
rx51_secure_dispatcher().
Quoted 9 lines
Quoted 6 lines
So I think the dsb may not be needed here (?)
Cheers
---DaveCould be, but I wonder why almost all the kernel code(I am aware of) that uses SMC and is written by TI, is storing r12 and is using both DSB and DMB. See
arch/arm/mach-omap2/sleep34xx.Sorarch/arm/mach-omap2/omap-smc.Sfor examples. I'd rather play it safe and leave it that way, unless someone confirms the other code using SMC has extra DSB/DMB instructions too. I wouldn't risk passing invalid/stale data to the Secure Monitor to just save 8 bytes and barriers in a performance non-critical code which will be called only a couple of times during the boot-up process. r12 save/restore is a legacy fromomap_smc2inomap-smc.S, so I guess it can go away without much of a trouble.
Dave pointed out about the dsb and r12 to me in another thread. R12 can be easily removed but the DSB's were needed on OMAP for power sequencing. Without those, we have seen many issues. So you can leave the dsb's to be consistent with rest of the code.
Regards
SantoshP.S: Please sensibly wrap your message while replying. You reply apears like one single line and I needed to keep scrolling to read it.
Quoted 91 lines · Santosh Shilimkar
Quoted 90 lines · ?????? ????????
Quoted 8 lines
-------- ?????????? ????? --------
??: Dave Martin
???????: Re: [PATCH v2 1/2] ARM: OMAP: Add secure functionomap_smc3()whichcalling instruction smc #1
Quoted 80 lines
??: Pali Roh?r
????????? ??: ?????, 2013, ??? 10 20:45:26 EESTQuoted 43 lines · Pali Roh?r
Other secure functions
omap_smc1()andomap_smc2()calling instruction smc #0 but Nokia RX-51 board needs to call smc #1 for PPA access.Signed-off-by Ivaylo DimitrovSigned-off-by Pali Roh?r--- arch/arm/mach-omap2/omap-secure.h | 1 + arch/arm/mach-omap2/omap-smc.S | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)arch/arm/mach-omap2/omap-secure.h +1
-0@@ -51,6 +51,7 @@extern u32 omap_secure_dispatcher (u32 idx,u32 flag,u32 nargs,u32 arg1,u32 arg2,u32 arg3,u32 arg4);extern u32 omap_smc2 (u32 id,u32 falg,u32 pargs); +extern u32 omap_smc3 (u32 id,u32 process,u32 flag,u32 pargs);extern phys_addr_t omap_secure_ram_mempool_base (void );extern int omap_secure_ram_reserve_memblock (void );arch/arm/mach-omap2/omap-smc.S +3
-1@@ -1,9 +1,11 @@ /* - * OMAP44xx secure APIs file. + * OMAP34xx and OMAP44xx secure APIs file. * * Copyright (C) 2010 Texas Instruments, Inc. * Written by Santosh Shilimkar * + * Copyright (C) 2012 Ivaylo Dimitrov + * Copyright (C) 2013 Pali Roh?r * * This program is free software,you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as@@ -54,6 +56,24 @@ ENTRY(omap_smc2) ldmfd sp!, {r4-r12, pc} ENDPROC(omap_smc2)arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 68
Quoted 10 lines
arch/arm/mach-omap2/omap-smc.S +10
-0+/** + * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs) + * Low level common routine for secure HAL and PPA APIs via smc #1 + * r0 - @service_id: Secure Service ID + * r1 - @process_id: Process ID + * r2 - @flag: Flag to indicate the criticality of operation + * r3 - @pargs: Physical address of parameter list + */ +ENTRY(omap_smc3) + stmfd sp!, {r4-r12, lr}You don't need to save/restore r12. The ABI allows it to be clobbered across function calls.
arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 72
Quoted 4 lines
arch/arm/mach-omap2/omap-smc.S +4
-0+ mov r12, r0 @ Copy the secure service ID + mov r6, #0xff @ Indicate new Task call + dsb + dmbdsb synchronises a superset of what dmb synchronises, so the dmb here is not useful.
In any case, any code calling this must flush the region addressed by r3 beforehand anyway, which will include a dsb as part of its semantics -- this is how you call it from
rx51_secure_dispatcher().So I think the dsb may not be needed here (?)
Cheers
---Dave
Quoted 5 lines
Quoted 2 lines
Could be, but I wonder why almost all the kernel code(I am aware of) that uses SMC and is written by TI, is storing r12 and is using both DSB and DMB. See
arch/arm/mach-omap2/sleep34xx.Sorarch/arm/mach-omap2/omap-smc.Sfor examples. I'd rather play it safe and leave it that way, unless someone confirms the other code using SMC has extra DSB/DMB instructions too. I wouldn't risk passing invalid/stale data to the Secure Monitor to just save 8 bytes and barriers in a performance non-critical code which will be called only a couple of times during the boot-up process. r12 save/restore is a legacy fromomap_smc2inomap-smc.S, so I guess it can go away without much of a trouble.Dave pointed out about the dsb and r12 to me in another thread. R12 can be easily removed but the DSB's were needed on OMAP for power sequencing. Without those, we have seen many issues. So you can leave the dsb's to be consistent with rest of the code.
Consistency is a perfectly good reason, especially in code like this where a certain code sequence has been proven, but it's preferable to include brief comments to explain nonetheless.
Difficulty in explaining precisely why something is needed should be a warning flag that a comment is needed.
Cheers
---Dave
PATCH v3 1/2 ARM: OMAP: Add secure function omap_smc3() which calling instruction smc #1
Here is new version (v3) of omap secure part patch:
Other secure functions omap_smc1() and omap_smc2() calling instruction smc #0 but Nokia RX-51 board needs to call smc #1 for PPA access.
---
arch/arm/mach-omap2/omap-secure.h +1 -0
@@ -51,6 +51,7 @@extern u32 omap_secure_dispatcher (u32 idx,u32 flag,u32 nargs,u32 arg1,u32 arg2,u32 arg3,u32 arg4);extern u32 omap_smc2 (u32 id,u32 falg,u32 pargs); +extern u32 omap_smc3 (u32 id,u32 process,u32 flag,u32 pargs);extern phys_addr_t omap_secure_ram_mempool_base (void );extern int omap_secure_ram_reserve_memblock (void );
arch/arm/mach-omap2/omap-smc.S +20 -1
@@ -1,9 +1,11 @@ /* - * OMAP44xx secure APIs file. + * OMAP34xx and OMAP44xx secure APIs file. * * Copyright (C) 2010 Texas Instruments, Inc. * Written by Santosh Shilimkar <[email protected]> * + * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]> + * Copyright (C) 2013 Pali Roh?r <[email protected]> * * This program is free software,you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as
@@ -54,6 +56,23 @@ ENTRY(omap_smc2) ldmfd sp!, {r4-r12, pc} ENDPROC(omap_smc2) +/** + * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs) + * Low level common routine for secure HAL and PPA APIs via smc #1 + * r0 - @service_id: Secure Service ID + * r1 - @process_id: Process ID + * r2 - @flag: Flag to indicate the criticality of operation + * r3 - @pargs: Physical address of parameter list + */ +ENTRY(omap_smc3) + stmfd sp!, {r4-r11, lr} + mov r12, r0 @ Copy the secure service ID + mov r6, #0xff @ Indicate new Task call + dsb @ Memory Barrier + smc #1 @ Call PPA service + ldmfd sp!, {r4-r11, pc} +ENDPROC(omap_smc3) + ENTRY(omap_modify_auxcoreboot0) stmfd sp!, {r1-r12, lr} ldr r12, =0x104
Signature · 9 lines
Pali Roh?r pali.rohar at gmail.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130804/c2ba9517/attachment.sig>
Quoted 44 lines · Pali Roh?r
Here is new version (v3) of omap secure part patch:
Other secure functions
omap_smc1()andomap_smc2()calling instruction smc #0 but Nokia RX-51 board needs to call smc #1 for PPA access.Signed-off-by Ivaylo Dimitrov <[email protected]>Signed-off-by Pali Roh?r <[email protected]>---
arch/arm/mach-omap2/omap-secure.h +1
-0@@ -51,6 +51,7 @@extern u32 omap_secure_dispatcher (u32 idx,u32 flag,u32 nargs,u32 arg1,u32 arg2,u32 arg3,u32 arg4);extern u32 omap_smc2 (u32 id,u32 falg,u32 pargs); +extern u32 omap_smc3 (u32 id,u32 process,u32 flag,u32 pargs);extern phys_addr_t omap_secure_ram_mempool_base (void );extern int omap_secure_ram_reserve_memblock (void );arch/arm/mach-omap2/omap-smc.S +6
-1@@ -1,9 +1,11 @@ /* - * OMAP44xx secure APIs file. + * OMAP34xx and OMAP44xx secure APIs file. * * Copyright (C) 2010 Texas Instruments, Inc. * Written by Santosh Shilimkar <[email protected]> * + * Copyright (C) 2012 Ivaylo Dimitrov <[email protected]> + * Copyright (C) 2013 Pali Roh?r <[email protected]> * * This program is free software,you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as@@ -54,6 +56,23 @@ ENTRY(omap_smc2) ldmfd sp!, {r4-r12, pc} ENDPROC(omap_smc2) +/** + * u32 omap_smc3(u32 service_id, u32 process_id, u32 flag, u32 pargs) + * Low level common routine for secure HAL and PPA APIs via smc #1
arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 71
Quoted 10 lines
arch/arm/mach-omap2/omap-smc.S +10
-0+ * r0 - @service_id: Secure Service ID + * r1 - @process_id: Process ID + * r2 - @flag: Flag to indicate the criticality of operation + * r3 - @pargs: Physical address of parameter list + */ +ENTRY(omap_smc3) + stmfd sp!, {r4-r11, lr} + mov r12, r0 @ Copy the secure service ID + mov r6, #0xff @ Indicate new Task call + dsb @ Memory Barrier
Can you explain _why_ the barrier is there? The reader doesn't need to be told that a barrier instruction is a barrier instruction.
Cheers
---Dave