diff options
| author | Joanna Farley <joanna.farley@arm.com> | 2023-02-17 00:44:42 +0100 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2023-02-17 00:44:42 +0100 |
| commit | 8c56a6bad641ae5ac407ce5134afe53a5357fcad (patch) | |
| tree | 7bc0714175d9228686c5775f053734f4ad8b3774 /plat/xilinx | |
| parent | c5a840ad565a3b568c4b656296d40c10f4364507 (diff) | |
| parent | c4185d5103080621393edb770a56aa274f9af1a7 (diff) | |
| download | arm-trusted-firmware-8c56a6bad641ae5ac407ce5134afe53a5357fcad.tar.gz | |
Merge changes from topic "versal-ipi" into integration
* changes:
fix(versal): fix incorrect regbase for PMC IPI
fix(versal): sync location based on IPI_ID macros
fix(xilinx): remove unused mailbox macros
Diffstat (limited to 'plat/xilinx')
| -rw-r--r-- | plat/xilinx/versal/include/plat_ipi.h | 1 | ||||
| -rw-r--r-- | plat/xilinx/versal/include/versal_def.h | 3 | ||||
| -rw-r--r-- | plat/xilinx/versal/versal_ipi.c | 14 | ||||
| -rw-r--r-- | plat/xilinx/versal_net/include/plat_ipi.h | 1 | ||||
| -rw-r--r-- | plat/xilinx/zynqmp/include/plat_ipi.h | 1 |
5 files changed, 9 insertions, 11 deletions
diff --git a/plat/xilinx/versal/include/plat_ipi.h b/plat/xilinx/versal/include/plat_ipi.h index 36a438094..9143dc6b7 100644 --- a/plat/xilinx/versal/include/plat_ipi.h +++ b/plat/xilinx/versal/include/plat_ipi.h @@ -34,7 +34,6 @@ #define IPI_BUFFER_TARGET_APU_OFFSET 0x80U #define IPI_BUFFER_TARGET_PMC_OFFSET 0x40U -#define IPI_BUFFER_LOCAL_BASE IPI_BUFFER_APU_BASE #define IPI_BUFFER_REMOTE_BASE IPI_BUFFER_PMC_BASE #define IPI_BUFFER_TARGET_LOCAL_OFFSET IPI_BUFFER_TARGET_APU_OFFSET diff --git a/plat/xilinx/versal/include/versal_def.h b/plat/xilinx/versal/include/versal_def.h index 60431a59f..ce4d98c32 100644 --- a/plat/xilinx/versal/include/versal_def.h +++ b/plat/xilinx/versal/include/versal_def.h @@ -129,9 +129,10 @@ #define PMC_GLOBAL_GLOB_GEN_STORAGE4 (PMC_GLOBAL_BASE + 0x40U) /* IPI registers and bitfields */ +#define PMC_REG_BASE U(0xFF320000) +#define PMC_IPI_TRIG_BIT (1U << 1U) #define IPI0_REG_BASE U(0xFF330000) #define IPI0_TRIG_BIT (1U << 2U) -#define PMC_IPI_TRIG_BIT (1U << 1U) #define IPI1_REG_BASE U(0xFF340000) #define IPI1_TRIG_BIT (1U << 3U) #define IPI2_REG_BASE U(0xFF350000) diff --git a/plat/xilinx/versal/versal_ipi.c b/plat/xilinx/versal/versal_ipi.c index d821929a8..67915f417 100644 --- a/plat/xilinx/versal/versal_ipi.c +++ b/plat/xilinx/versal/versal_ipi.c @@ -20,16 +20,16 @@ /* versal ipi configuration table */ static const struct ipi_config versal_ipi_table[] = { - /* A72 IPI */ - [IPI_ID_APU] = { - .ipi_bit_mask = IPI0_TRIG_BIT, - .ipi_reg_base = IPI0_REG_BASE, - .secure_only = 0U, - }, - /* PMC IPI */ [IPI_ID_PMC] = { .ipi_bit_mask = PMC_IPI_TRIG_BIT, + .ipi_reg_base = PMC_REG_BASE, + .secure_only = 0U, + }, + + /* A72 IPI */ + [IPI_ID_APU] = { + .ipi_bit_mask = IPI0_TRIG_BIT, .ipi_reg_base = IPI0_REG_BASE, .secure_only = 0U, }, diff --git a/plat/xilinx/versal_net/include/plat_ipi.h b/plat/xilinx/versal_net/include/plat_ipi.h index 5255f8f56..5ac611c47 100644 --- a/plat/xilinx/versal_net/include/plat_ipi.h +++ b/plat/xilinx/versal_net/include/plat_ipi.h @@ -37,7 +37,6 @@ #define IPI_BUFFER_TARGET_APU_OFFSET 0x80U #define IPI_BUFFER_TARGET_PMC_OFFSET 0x40U -#define IPI_BUFFER_LOCAL_BASE IPI_BUFFER_APU_BASE #define IPI_BUFFER_REMOTE_BASE IPI_BUFFER_PMC_BASE #define IPI_BUFFER_TARGET_LOCAL_OFFSET IPI_BUFFER_TARGET_APU_OFFSET diff --git a/plat/xilinx/zynqmp/include/plat_ipi.h b/plat/xilinx/zynqmp/include/plat_ipi.h index a78f93a18..bf56d5e25 100644 --- a/plat/xilinx/zynqmp/include/plat_ipi.h +++ b/plat/xilinx/zynqmp/include/plat_ipi.h @@ -35,7 +35,6 @@ #define IPI_BUFFER_APU_BASE (IPI_BUFFER_BASEADDR + 0x400U) #define IPI_BUFFER_PMU_BASE (IPI_BUFFER_BASEADDR + 0xE00U) -#define IPI_BUFFER_LOCAL_BASE IPI_BUFFER_APU_BASE #define IPI_BUFFER_REMOTE_BASE IPI_BUFFER_PMU_BASE #define IPI_BUFFER_TARGET_LOCAL_OFFSET 0x80U |