diff options
| author | CHLin <CHLIN56@nuvoton.com> | 2017-11-07 10:50:16 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-09 21:46:07 -0800 |
| commit | 16f4c65daf528de399bf622d0aefcadc19238544 (patch) | |
| tree | 142aa240b3a6fe0fecc39355a32fbe7c37e79353 /chip/npcx/clock.c | |
| parent | d972385836212826d9179f4532e33e41b85f185f (diff) | |
| download | chrome-ec-16f4c65daf528de399bf622d0aefcadc19238544.tar.gz | |
npcx: fixed the assembly code of deep idle bypass
The original assembly code of deep sleep bypass will cause build error
if both CONFIG_LOW_POWER_IDLE and CONFIG_LTO are defined when buildiing
board glkrvp/zoombini. This CL fixed it by change the bypass assembly code
from:
asm ("push {r0-r5}\n"
"ldr r0, =0x100A8000\n"
"wfi\n"
"ldm r0, {r0-r5}\n"
"pop {r0-r5}\n"
"isb\n"
);
to:
asm ("push {r0-r5}\n"
"wfi\n"
"ldm %0, {r0-r5}\n"
"pop {r0-r5}\n"
"isb\n" :: "r" (0x100A8000)
);
BRANCH=none
BUG=none
TEST=No build errors for "make buildall".
TEST=build zoombini/glkrvp with CONFIG_LOW_POWER_IDLE and CONFIG_LTO,
no build errors.
TEST=build npcx7_evb/npcx_evb and do stress test for deep idle->wakeup
on EVB, no symptom observed.
Change-Id: I90b13b4baf418e3f4b3234d4811e3978b6436aac
Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
Signed-off-by: CHLin <CHLIN56@nuvoton.com>
Reviewed-on: https://chromium-review.googlesource.com/756535
Commit-Ready: CH Lin <chlin56@nuvoton.com>
Tested-by: CH Lin <chlin56@nuvoton.com>
Diffstat (limited to 'chip/npcx/clock.c')
| -rw-r--r-- | chip/npcx/clock.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chip/npcx/clock.c b/chip/npcx/clock.c index 8021f3c4d6..e2f071fea8 100644 --- a/chip/npcx/clock.c +++ b/chip/npcx/clock.c @@ -342,11 +342,10 @@ void __idle(void) * Workaround: Apply the same bypass of idle. */ asm ("push {r0-r5}\n" - "ldr r0, =0x100A8000\n" "wfi\n" - "ldm r0, {r0-r5}\n" + "ldm %0, {r0-r5}\n" "pop {r0-r5}\n" - "isb\n" + "isb\n" :: "r" (0x100A8000) ); /* Get time delay cause of deep idle */ @@ -393,11 +392,10 @@ void __idle(void) * Please see task.c for more detail */ asm ("push {r0-r5}\n" - "ldr r0, =0x100A8000\n" "wfi\n" - "ldm r0, {r0-r5}\n" + "ldm %0, {r0-r5}\n" "pop {r0-r5}\n" - "isb\n" + "isb\n" :: "r" (0x100A8000) ); } |