diff options
| author | danh-arm <dan.handley@arm.com> | 2015-06-05 17:32:25 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2015-06-05 17:32:25 +0100 |
| commit | 789c22013574846413ffb86618297ee7de168af0 (patch) | |
| tree | 8122da2e609560a440e6150291ddae707987f2b2 | |
| parent | de975e85ff4a3712fc8ff8aa5556e0ec0a11e63c (diff) | |
| parent | c8f0c3f76caaaa110d50027d6e1635d88e30c464 (diff) | |
Merge pull request #309 from soby-mathew/sm/fix_fvp_get_entryHEADmasterlinarojunointegrationfvp-base
FVP: Correct the PSYSR_WK bit width in platform_get_entrypoint
| -rw-r--r-- | plat/arm/board/fvp/aarch64/fvp_helpers.S | 2 | ||||
| -rw-r--r-- | plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plat/arm/board/fvp/aarch64/fvp_helpers.S b/plat/arm/board/fvp/aarch64/fvp_helpers.S index dd56687..d176fac 100644 --- a/plat/arm/board/fvp/aarch64/fvp_helpers.S +++ b/plat/arm/board/fvp/aarch64/fvp_helpers.S @@ -123,7 +123,7 @@ func platform_get_entrypoint ldr x1, =PWRC_BASE str 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 beq warm_reset cmp w2, #WKUP_GICREQ diff --git a/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.h b/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.h index 5b755af..3dc9aad 100644 --- a/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.h +++ b/plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.h @@ -48,7 +48,8 @@ #define PSYSR_PP (1 << 26) #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 WKUP_COLD 0x0 |