Commit c8f0c3f7 authored by Soby Mathew's avatar Soby Mathew
Browse files

FVP: Correct the PSYSR_WK bit width in platform_get_entrypoint

This patch fixes the incorrect bit width used to extract the wakeup
reason from PSYSR in platform_get_entrypoint() function. This defect
did not have any observed regression.

Change-Id: I42652dbffc99f5bf50cc86a5878f28d730720d9a
parent c163ec45
...@@ -123,7 +123,7 @@ func platform_get_entrypoint ...@@ -123,7 +123,7 @@ func platform_get_entrypoint
ldr x1, =PWRC_BASE ldr x1, =PWRC_BASE
str w2, [x1, #PSYSR_OFF] str w2, [x1, #PSYSR_OFF]
ldr w2, [x1, #PSYSR_OFF] ldr w2, [x1, #PSYSR_OFF]
ubfx w2, w2, #PSYSR_WK_SHIFT, #PSYSR_WK_MASK ubfx w2, w2, #PSYSR_WK_SHIFT, #PSYSR_WK_WIDTH
cmp w2, #WKUP_PPONR cmp w2, #WKUP_PPONR
beq warm_reset beq warm_reset
cmp w2, #WKUP_GICREQ cmp w2, #WKUP_GICREQ
......
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
#define PSYSR_PP (1 << 26) #define PSYSR_PP (1 << 26)
#define PSYSR_WK_SHIFT 24 #define PSYSR_WK_SHIFT 24
#define PSYSR_WK_MASK 0x3 #define PSYSR_WK_WIDTH 0x2
#define PSYSR_WK_MASK ((1 << PSYSR_WK_WIDTH) - 1)
#define PSYSR_WK(x) (x >> PSYSR_WK_SHIFT) & PSYSR_WK_MASK #define PSYSR_WK(x) (x >> PSYSR_WK_SHIFT) & PSYSR_WK_MASK
#define WKUP_COLD 0x0 #define WKUP_COLD 0x0
......
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