Merge pull request #309 from soby-mathew/sm/fix_fvp_get_entry
FVP: Correct the PSYSR_WK bit width in platform_get_entrypoint
This commit is contained in:
commit
789c220135
|
@ -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 @@
|
||||||
#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
|
||||||
|
|
Loading…
Reference in New Issue