| Message ID | 201309080943.30542@pali (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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() and omap_smc2() calling > instruction smc #0 but Nokia RX-51 board needs to call smc #1 > for PPA access. > > Signed-off-by: Ivaylo Dimitrov <freemangordon@abv.bg> > Signed-off-by: Pali Rohár <pali.rohar@gmail.com> > --- > diff --git a/arch/arm/mach-omap2/omap-secure.h > b/arch/arm/mach-omap2/omap-secure.h index 0e72917..c4586f4 > 100644 > --- a/arch/arm/mach-omap2/omap-secure.h > +++ b/arch/arm/mach-omap2/omap-secure.h > @@ -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); > > diff --git a/arch/arm/mach-omap2/omap-smc.S > b/arch/arm/mach-omap2/omap-smc.S index f6441c1..fd90125 > 100644 > --- a/arch/arm/mach-omap2/omap-smc.S > +++ b/arch/arm/mach-omap2/omap-smc.S > @@ -1,9 +1,11 @@ > /* > - * OMAP44xx secure APIs file. > + * OMAP34xx and OMAP44xx secure APIs file. > * > * Copyright (C) 2010 Texas Instruments, Inc. > * Written by Santosh Shilimkar <santosh.shilimkar@ti.com> > * > + * Copyright (C) 2012 Ivaylo Dimitrov <freemangordon@abv.bg> > + * Copyright (C) 2013 Pali Rohár <pali.rohar@gmail.com> > * > * 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 Dave, it is ok now?
On 08/09/13 09:43, Pali Rohár wrote: > 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. > > Signed-off-by: Ivaylo Dimitrov<freemangordon@abv.bg> > Signed-off-by: Pali Rohár<pali.rohar@gmail.com> > --- > diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h > index 0e72917..c4586f4 100644 > --- a/arch/arm/mach-omap2/omap-secure.h > +++ b/arch/arm/mach-omap2/omap-secure.h > @@ -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); > > diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S > index f6441c1..fd90125 100644 > --- a/arch/arm/mach-omap2/omap-smc.S > +++ b/arch/arm/mach-omap2/omap-smc.S > @@ -1,9 +1,11 @@ > /* > - * OMAP44xx secure APIs file. > + * OMAP34xx and OMAP44xx secure APIs file. > * > * Copyright (C) 2010 Texas Instruments, Inc. > * Written by Santosh Shilimkar<santosh.shilimkar@ti.com> > * > + * Copyright (C) 2012 Ivaylo Dimitrov<freemangordon@abv.bg> > + * Copyright (C) 2013 Pali Rohár<pali.rohar@gmail.com> > * > * 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 I think you should save r12 in the call.
On Tue, Oct 08, 2013 at 09:13:16AM +0200, Ben Dooks wrote: > On 08/09/13 09:43, Pali Rohár wrote: >> 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. >> >> Signed-off-by: Ivaylo Dimitrov<freemangordon@abv.bg> >> Signed-off-by: Pali Rohár<pali.rohar@gmail.com> >> --- >> diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h >> index 0e72917..c4586f4 100644 >> --- a/arch/arm/mach-omap2/omap-secure.h >> +++ b/arch/arm/mach-omap2/omap-secure.h >> @@ -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); >> >> diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S >> index f6441c1..fd90125 100644 >> --- a/arch/arm/mach-omap2/omap-smc.S >> +++ b/arch/arm/mach-omap2/omap-smc.S >> @@ -1,9 +1,11 @@ >> /* >> - * OMAP44xx secure APIs file. >> + * OMAP34xx and OMAP44xx secure APIs file. >> * >> * Copyright (C) 2010 Texas Instruments, Inc. >> * Written by Santosh Shilimkar<santosh.shilimkar@ti.com> >> * >> + * Copyright (C) 2012 Ivaylo Dimitrov<freemangordon@abv.bg> >> + * Copyright (C) 2013 Pali Rohár<pali.rohar@gmail.com> >> * >> * 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 > > I think you should save r12 in the call. Not necessary.
* Russell King - ARM Linux <linux@arm.linux.org.uk> [131008 01:17]: > On Tue, Oct 08, 2013 at 09:13:16AM +0200, Ben Dooks wrote: > > On 08/09/13 09:43, Pali Rohár wrote: > >> 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. > >> > >> Signed-off-by: Ivaylo Dimitrov<freemangordon@abv.bg> > >> Signed-off-by: Pali Rohár<pali.rohar@gmail.com> > >> --- > >> diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h > >> index 0e72917..c4586f4 100644 > >> --- a/arch/arm/mach-omap2/omap-secure.h > >> +++ b/arch/arm/mach-omap2/omap-secure.h > >> @@ -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); > >> > >> diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S > >> index f6441c1..fd90125 100644 > >> --- a/arch/arm/mach-omap2/omap-smc.S > >> +++ b/arch/arm/mach-omap2/omap-smc.S > >> @@ -1,9 +1,11 @@ > >> /* > >> - * OMAP44xx secure APIs file. > >> + * OMAP34xx and OMAP44xx secure APIs file. > >> * > >> * Copyright (C) 2010 Texas Instruments, Inc. > >> * Written by Santosh Shilimkar<santosh.shilimkar@ti.com> > >> * > >> + * Copyright (C) 2012 Ivaylo Dimitrov<freemangordon@abv.bg> > >> + * Copyright (C) 2013 Pali Rohár<pali.rohar@gmail.com> > >> * > >> * 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 > > > > I think you should save r12 in the call. > > Not necessary. Assuming there are no other comments I'll apply these into omap-for-v3.13/n900 branch. Regards, Tony
diff --git a/arch/arm/mach-omap2/omap-secure.h b/arch/arm/mach-omap2/omap-secure.h index 0e72917..c4586f4 100644 --- a/arch/arm/mach-omap2/omap-secure.h +++ b/arch/arm/mach-omap2/omap-secure.h @@ -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); diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S index f6441c1..fd90125 100644 --- a/arch/arm/mach-omap2/omap-smc.S +++ b/arch/arm/mach-omap2/omap-smc.S @@ -1,9 +1,11 @@ /* - * OMAP44xx secure APIs file. + * OMAP34xx and OMAP44xx secure APIs file. * * Copyright (C) 2010 Texas Instruments, Inc. * Written by Santosh Shilimkar <santosh.shilimkar@ti.com> * + * Copyright (C) 2012 Ivaylo Dimitrov <freemangordon@abv.bg> + * Copyright (C) 2013 Pali Rohár <pali.rohar@gmail.com> * * 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