From 15f49cb49d7daf2cd771c80d3dd80ff15874b40b Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 8 Feb 2023 09:31:09 +0100 Subject: fix(xilinx): remove unused mailbox macros All these macro are unused that's why remove them. Change-Id: I843cc7c1a592c47376a01c52f45b6d59da80772b Signed-off-by: Michal Simek --- plat/xilinx/versal/include/plat_ipi.h | 1 - plat/xilinx/versal_net/include/plat_ipi.h | 1 - plat/xilinx/zynqmp/include/plat_ipi.h | 1 - 3 files changed, 3 deletions(-) (limited to 'plat/xilinx') 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_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 -- cgit v1.2.1 From 92a43bdf366502c6919bbd2c8e4f687c51d9738c Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Wed, 8 Feb 2023 13:34:47 +0100 Subject: fix(versal): sync location based on IPI_ID macros IPI_ID_* macros available at include/plat_ipi.h are using PMC/APU/RPU0.. order which is not how versal_ipi_table array is composed. That's why swap APU and PMC to follow the same order as is described by macros. Change-Id: Ieaa3a967650e298e7cff45fafde0df96294c09fe Signed-off-by: Michal Simek --- plat/xilinx/versal/versal_ipi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plat/xilinx') diff --git a/plat/xilinx/versal/versal_ipi.c b/plat/xilinx/versal/versal_ipi.c index d821929a8..75d4c1436 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, + /* PMC IPI */ + [IPI_ID_PMC] = { + .ipi_bit_mask = PMC_IPI_TRIG_BIT, .ipi_reg_base = IPI0_REG_BASE, .secure_only = 0U, }, - /* PMC IPI */ - [IPI_ID_PMC] = { - .ipi_bit_mask = PMC_IPI_TRIG_BIT, + /* A72 IPI */ + [IPI_ID_APU] = { + .ipi_bit_mask = IPI0_TRIG_BIT, .ipi_reg_base = IPI0_REG_BASE, .secure_only = 0U, }, -- cgit v1.2.1 From c4185d5103080621393edb770a56aa274f9af1a7 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Thu, 9 Feb 2023 13:33:43 +0100 Subject: fix(versal): fix incorrect regbase for PMC IPI PMC ipi register base can't be the same as is for IPI_ID_APU that's why that address is not correct and needs to be fixed. Change-Id: I7ff2c9c0dd5995487e41f6b1060e4c9880c009fa Signed-off-by: Michal Simek --- plat/xilinx/versal/include/versal_def.h | 3 ++- plat/xilinx/versal/versal_ipi.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'plat/xilinx') 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 75d4c1436..67915f417 100644 --- a/plat/xilinx/versal/versal_ipi.c +++ b/plat/xilinx/versal/versal_ipi.c @@ -23,7 +23,7 @@ static const struct ipi_config versal_ipi_table[] = { /* PMC IPI */ [IPI_ID_PMC] = { .ipi_bit_mask = PMC_IPI_TRIG_BIT, - .ipi_reg_base = IPI0_REG_BASE, + .ipi_reg_base = PMC_REG_BASE, .secure_only = 0U, }, -- cgit v1.2.1