Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-20 02:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: tegra: Changes for v4.19-rc1

Browse Source 
This contains a single fix for the Trusted Foundations firmware
 implementation, used on some Tegra20 and Tegra30 platforms.
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCAAxFiEEiOrDCAFJzPfAjcif3SOs138+s6EFAltHcm4THHRyZWRpbmdA
 bnZpZGlhLmNvbQAKCRDdI6zXfz6zobqID/wJ8NAI0UzrJ2qEoEyL11LlN1WWyS8t
 PommgyebaMZdNOg7Glu09MQOds2RDKMmWTFm7we110vCpRYG/GUC/f4lWJqlSMOp
 DLZfP3x7vy+5lW4xa44+wo7AVcCYweOH1UTaSjNS+akLHoNCK4+2PsVqS2pWaMEq
 /r17jM3l/bG3AbGJCqVRTIkydgM5UzGgbhlElhWMHIAn69V5ieotBBMSZZWi42g8
 rxNJHAB4UHGP4c1dPFLPBsvo0rq/PZrjqGoPN/8j6DcYD76ueXHgZqcFRua3H6s4
 zliFV6q3tHqGgFlUObIfxaz8t5kjAX2d6R6JjU8H4nh+ct0cOmakL7h2ZbBjdPxX
 RIogY9F49NzSPJYuv/CVRjWo2KUBHgQuKc/q8Ix4Vu7PfVubz3dP7IGHni/YR1i0
 TJ3hv+h1qDmMMQ3Ny9GSY3X+1k0LDblz8FCJYMA38gSWVsyxRFZDMaNPigxwogy1
 RD5UCc/oohP8T4NL+mINNYdyiHBN4P3/I33v4r9YFU8vzdC+Kn9k45UvH1dYYgzJ
 AHYkMTnXrIjj60NMmxopReuOtn8auY9emqL+F2u+w720NLkv5lyhk4EJXjIigY3F
 AzkJMBjBgM5NTRTGEUgvnUjDG54OKqKH/IEemBrerUTiEjgsFKa0qaj6todIb1qL
 xwtayZ2fFu6UiQ==
 =SJEE
 -----END PGP SIGNATURE-----

Merge tag 'tegra-for-4.19-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc

firmware: tegra: Changes for v4.19-rc1

This contains a single fix for the Trusted Foundations firmware
implementation, used on some Tegra20 and Tegra30 platforms.

* tag 'tegra-for-4.19-firmware' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: trusted_foundations: do not use naked function

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-07-14 14:45:51 -07:00
commit ce8403d455
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/arm/firmware/trusted_foundations.c
View File

@ -31,21 +31,25 @@
static unsigned long cpu_boot_addr; static unsigned long cpu_boot_addr;
static void __naked tf_generic_smc(u32 type, u32 arg1, u32 arg2) static void tf_generic_smc(u32 type, u32 arg1, u32 arg2)
{ {
register u32 r0 asm("r0") = type;
register u32 r1 asm("r1") = arg1;
register u32 r2 asm("r2") = arg2;
asm volatile( asm volatile(
".arch_extension sec\n\t" ".arch_extension sec\n\t"
"stmfd sp!, {r4 - r11, lr}\n\t" "stmfd sp!, {r4 - r11}\n\t"
__asmeq("%0", "r0") __asmeq("%0", "r0")
__asmeq("%1", "r1") __asmeq("%1", "r1")
__asmeq("%2", "r2") __asmeq("%2", "r2")
"mov r3, #0\n\t" "mov r3, #0\n\t"
"mov r4, #0\n\t" "mov r4, #0\n\t"
"smc #0\n\t" "smc #0\n\t"
"ldmfd sp!, {r4 - r11, pc}" "ldmfd sp!, {r4 - r11}\n\t"
: :
: "r" (type), "r" (arg1), "r" (arg2) : "r" (r0), "r" (r1), "r" (r2)
: "memory"); : "memory", "r3", "r12", "lr");
} }
static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr) static int tf_set_cpu_boot_addr(int cpu, unsigned long boot_addr)