Commit b9338a78 authored by Tzachi Perelstein's avatar Tzachi Perelstein Committed by Russell King

[ARM] 4567/1: Fix 'Oops - undefined instruction' when CONFIG_VFP=y on non VFP device

vfp_init() takes care of the condition when CONFIG_VFP=y but no real VFP
device exists. However, when this condition is true, a compiler might
misplace code lines in a way that will break this support. (To be more
specific - fmrx(FPSID) might be executed before vfp_testing_entry
assignment, which will end up with Oops - undefined instruction).
This patch adds a barrier() to guarantee the right execution ordering.

Signed-off-by: Assaf Hoffman
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent a53d6fb8
...@@ -323,6 +323,7 @@ static int __init vfp_init(void) ...@@ -323,6 +323,7 @@ static int __init vfp_init(void)
* we just need to read the VFPSID register. * we just need to read the VFPSID register.
*/ */
vfp_vector = vfp_testing_entry; vfp_vector = vfp_testing_entry;
barrier();
vfpsid = fmrx(FPSID); vfpsid = fmrx(FPSID);
barrier(); barrier();
vfp_vector = vfp_null_entry; vfp_vector = vfp_null_entry;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment