diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-10-26 16:10:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-26 16:10:36 +0100 |
| commit | 907140002e629d4786695e516d2b1665e5fb923b (patch) | |
| tree | b348864254ecc41c3bd5be2acd5344085dbcd2b1 | |
| parent | cebec7421b1f8bf168239d2ecc75a398aa4072fe (diff) | |
| parent | 33dd33f8f0ce347209adae1044291e037ab2a0e1 (diff) | |
| download | arm-trusted-firmware-907140002e629d4786695e516d2b1665e5fb923b.tar.gz | |
Merge pull request #1143 from etienne-lms/qemu-hpen
qemu: fix holding pen mailbox sequence
| -rw-r--r-- | plat/qemu/aarch64/plat_helpers.S | 1 | ||||
| -rw-r--r-- | plat/qemu/include/platform_def.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/plat/qemu/aarch64/plat_helpers.S b/plat/qemu/aarch64/plat_helpers.S index f287e5b5..ed553795 100644 --- a/plat/qemu/aarch64/plat_helpers.S +++ b/plat/qemu/aarch64/plat_helpers.S @@ -63,6 +63,7 @@ endfunc plat_is_my_cpu_primary func plat_secondary_cold_boot_setup /* Calculate address of our hold entry */ bl plat_my_core_pos + lsl x0, x0, #PLAT_QEMU_HOLD_ENTRY_SHIFT mov_imm x2, PLAT_QEMU_HOLD_BASE /* Wait until we have a go */ diff --git a/plat/qemu/include/platform_def.h b/plat/qemu/include/platform_def.h index e91a7db9..9b5eba37 100644 --- a/plat/qemu/include/platform_def.h +++ b/plat/qemu/include/platform_def.h @@ -90,7 +90,8 @@ #define PLAT_QEMU_HOLD_BASE (PLAT_QEMU_TRUSTED_MAILBOX_BASE + 8) #define PLAT_QEMU_HOLD_SIZE (PLATFORM_CORE_COUNT * \ PLAT_QEMU_HOLD_ENTRY_SIZE) -#define PLAT_QEMU_HOLD_ENTRY_SIZE 8 +#define PLAT_QEMU_HOLD_ENTRY_SHIFT 3 +#define PLAT_QEMU_HOLD_ENTRY_SIZE (1 << PLAT_QEMU_HOLD_ENTRY_SHIFT) #define PLAT_QEMU_HOLD_STATE_WAIT 0 #define PLAT_QEMU_HOLD_STATE_GO 1 |