From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anup Patel Date: Tue, 25 Apr 2023 18:02:26 +0530 Subject: [PATCH 13/17] lib: utils/ipi: Use scratch space to save per-HART MSWI pointer In-Reply-To: <20230425123230.3943447-1-apatel@ventanamicro.com> References: <20230425123230.3943447-1-apatel@ventanamicro.com> Message-ID: <20230425123230.3943447-14-apatel@ventanamicro.com> List-Id: To: opensbi@lists.infradead.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Instead of using a global array indexed by hartid, we should use scratch space to save per-HART MSWI pointer. Signed-off-by: Anup Patel --- lib/utils/ipi/aclint_mswi.c | 49 +++++++++++++++++++++++++++++-------- 1 file changed, 39 insertions(+), 10 deletions(-) diff --git a/lib/utils/ipi/aclint_mswi.c b/lib/utils/ipi/aclint_mswi.c index 6b004cb..a8a2872 100644 --- a/lib/utils/ipi/aclint_mswi.c +++ b/lib/utils/ipi/aclint_mswi.c @@ -12,21 +12,36 @@ #include #include #include -#include #include +#include #include #include -static struct aclint_mswi_data *mswi_hartid2data[SBI_HARTMASK_MAX_BITS]; +static unsigned long mswi_ptr_offset; + +#define mswi_get_hart_data_ptr(__scratch) \ +({ \ + (void *)(*((ulong *)sbi_scratch_offset_ptr((__scratch), \ + mswi_ptr_offset))); \ +}) + +#define mswi_set_hart_data_ptr(__scratch, __mswi) \ +do { \ + *((ulong *)sbi_scratch_offset_ptr((__scratch), mswi_ptr_offset))\ + = (ulong)(__mswi); \ +} while (0) static void mswi_ipi_send(u32 target_hart) { u32 *msip; + struct sbi_scratch *scratch; struct aclint_mswi_data *mswi; - if (SBI_HARTMASK_MAX_BITS <= target_hart) + scratch = sbi_hartid_to_scratch(target_hart); + if (!scratch) return; - mswi = mswi_hartid2data[target_hart]; + + mswi = mswi_get_hart_data_ptr(scratch); if (!mswi) return; @@ -38,11 +53,14 @@ static void mswi_ipi_send(u32 target_hart) static void mswi_ipi_clear(u32 target_hart) { u32 *msip; + struct sbi_scratch *scratch; struct aclint_mswi_data *mswi; - if (SBI_HARTMASK_MAX_BITS <= target_hart) + scratch = sbi_hartid_to_scratch(target_hart); + if (!scratch) return; - mswi = mswi_hartid2data[target_hart]; + + mswi = mswi_get_hart_data_ptr(scratch); if (!mswi) return; @@ -69,19 +87,30 @@ int aclint_mswi_cold_init(struct aclint_mswi_data *mswi) { u32 i; int rc; + struct sbi_scratch *scratch; unsigned long pos, region_size; struct sbi_domain_memregion reg; /* Sanity checks */ if (!mswi || (mswi->addr & (ACLINT_MSWI_ALIGN - 1)) || (mswi->size < (mswi->hart_count * sizeof(u32))) || - (mswi->first_hartid >= SBI_HARTMASK_MAX_BITS) || (mswi->hart_count > ACLINT_MSWI_MAX_HARTS)) return SBI_EINVAL; - /* Update MSWI hartid table */ - for (i = 0; i < mswi->hart_count; i++) - mswi_hartid2data[mswi->first_hartid + i] = mswi; + /* Allocate scratch space pointer */ + if (!mswi_ptr_offset) { + mswi_ptr_offset = sbi_scratch_alloc_offset(sizeof(ulong)); + if (!mswi_ptr_offset) + return SBI_ENOMEM; + } + + /* Update MSWI pointer in scratch space */ + for (i = 0; i < mswi->hart_count; i++) { + scratch = sbi_hartid_to_scratch(mswi->first_hartid + i); + if (!scratch) + return SBI_ENOENT; + mswi_set_hart_data_ptr(scratch, mswi); + } /* Add MSWI regions to the root domain */ for (pos = 0; pos < mswi->size; pos += ACLINT_MSWI_ALIGN) { -- 2.34.1