ARM: OMAP: Add secure function omap_smc3() which calling instruction smc #1
Subsystems (3)
Quoted 103 lines · Pali Rohár
Quoted 102 lines · On Sunday 11 August 2013 20:36:40 Ивайло Димитров wrote:
Quoted 5 lines
-------- Оригинално писмо --------
От: Dave Martin
Относно: Re: [PATCH v3 1/2] ARM: OMAP: Add secure functionomap_smc3()whichcalling instruction smc #1
Quoted 83 lines
До: Pali Rohár
Изпратено на: Понеделник, 2013, Август 5 16:29:44 EESTQuoted 69 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 DimitrovSigned-off-by Pali Rohár---
(quoted diff) +0
-0
b/arch/arm/mach-omap2/omap-secure.hindex
0e72917..c4586f4 100644arch/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, u32pargs);
extern
phys_addr_tomap_secure_ram_mempool_base(void); extern intomap_secure_ram_reserve_memblock(void);(quoted diff) +0
-0
b/arch/arm/mach-omap2/omap-smc.Sindex f6441c1..7bbc043 100644arch/arm/mach-omap2/omap-smc.S +5
-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,23 @@ ENTRY(omap_smc2) ldmfd sp!, {r4-r12, pc} ENDPROC(omap_smc2) +/** + * u32 omap_smc3(u32 service_id, u32 process_id, u32flag, 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 + */arch/arm/mach-omap2/omap-smc.S
Quoted 5 lines
arch/arm/mach-omap2/omap-smc.S +5
-0+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 BarrierCan you explain _why_ the barrier is there? The reader doesn't need to be told that a barrier instruction is a barrier instruction.
Quoted 2 lines
Cheers
---DaveHi Dave,
Would quoting Santosh's explanation "DSBs were needed on OMAP for power sequencing." do the job? Something like "@ Needed on OMAP for power sequencing" instead of "@ Memory Barrier".
I want to be sure I correctly understand your requirement.
Quoted 8 lines
Quoted 2 lines
Regards,
IvoHello,
I'd like to know what happened with this patch? What is needed for including it into mainline? Note that without with this patch series Thumb-2 user space binaries crashing.
Apologies, it looks like I missed the previous reply somehow.
"Needed for power sequencing" is not a good explanation, because DSB has no direct role in "power sequencing".
I'm guessing that the reason for its being needed is either not well understood (otherwise someone would have offered a real explanation by now), or it is a secret (errata, whatever) or related to something so obscure it's likely to be of any interest or use to anyone anyway.
In the former case, just document the uncertainty.
In the latter case, at least document that the reasons are specific to that platform and probably not applicable to other situations: this warns someone maintaining or copying the code later that it may not make sense for them, and they should stop and think. It also avoids people reading the code for educational purposes and learning incorrect lessons from it.
I've seen a mail thread where precisely this bad education happened:
someone is trying to figure out whether they need a DSB before every SVC after reading the mach-omap2 SMC code.
The same goes for the disabling of interrupts around the call in rx51_secure_dispatcher(). Even if the Secure World might write into the params struct during the SMC, making the params ____cacheline_aligned should be sufficient to avoid the possibility of incoherent S/NS aliases of the same cacheline clobbering each other. SMC disables all interrupts on entry to the Secure World anyway, so I can't see what else the interrupt disabling achieves unless there are platform-specific errata reasons.
Cheers
---Dave
PATCH v4 1/2 ARM: OMAP: Add secure function omap_smc3() which calling instruction smc #1
Here is new version (v4) 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 (not sure if needed, copied from omap_smc2) + 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/20130908/4f1abd81/attachment.sig>
Quoted 59 lines · On Sunday 08 September 2013 09:43:29 Pali Roh?r wrote:
Here is new version (v4) 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]>---
(quoted diff) +0
-0
b/arch/arm/mach-omap2/omap-secure.hindex 0e72917..c4586f4 100644arch/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, u32pargs); extern
phys_addr_tomap_secure_ram_mempool_base(void); extern intomap_secure_ram_reserve_memblock(void);(quoted diff) +0
-0
b/arch/arm/mach-omap2/omap-smc.Sindex f6441c1..fd90125 100644arch/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 <[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 itand/or modify * it under the terms of the GNU General Public License version 2 as @@ -54,6 +56,23 @@
ENTRY(omap_smc2)arch/arm/mach-omap2/omap-smc.S +2
-0ldmfd 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
+ */arch/arm/mach-omap2/omap-smc.S +5
-0+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 (not sure if needed, copied from
omap_smc2) + smc #1 @ Call PPA service
arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 78
Quoted 6 lines
arch/arm/mach-omap2/omap-smc.S +3
-0+ ldmfd sp!, {r4-r11, pc} +ENDPROC(omap_smc3) + ENTRY(omap_modify_auxcoreboot0) stmfd sp!, {r1-r12, lr} ldr r12, =0x104
Dave, it is ok now?
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/20130914/dadfb89f/attachment.sig>
Quoted 42 lines · Pali Roh?r
Here is new version (v4) 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 +4
-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) +/**
arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 69
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-r11, lr} + mov r12, r0 @ Copy the secure service ID
I think you should save r12 in the call.
Signature · 2 lines
Ben Dooks http://www.codethink.co.uk/ Senior Engineer Codethink - Providing Genius
Quoted 42 lines · Ben Dooks
Quoted 41 lines · Pali Roh?r
Here is new version (v4) 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 +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<[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)
Quoted 13 lines
arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 69
Quoted 11 lines
arch/arm/mach-omap2/omap-smc.S +11
-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-r11, lr} + mov r12, r0 @ Copy the secure service IDI think you should save r12 in the call.
Not necessary.
Tony Lindgren
maintainerQuoted 57 lines · Russell King - ARM Linux
Quoted 42 lines · Ben Dooks
Quoted 41 lines · Pali Roh?r
Here is new version (v4) 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 +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<[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)Quoted 13 lines
arch/arm/mach-omap2/omap-smc.S ENTRY(omap_smc2) · line 69
Quoted 11 lines
arch/arm/mach-omap2/omap-smc.S +11
-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-r11, lr} + mov r12, r0 @ Copy the secure service IDI think you should save r12 in the call.
Quoted 1 line
Not necessary.
Assuming there are no other comments I'll apply these into omap-for-v3.13/n900 branch.
Regards,
Tony