From aa0ed1d7338019af8c785274c99b13caa59ce1f5 Mon Sep 17 00:00:00 2001 From: Atish Patra Date: Sun, 24 Nov 2019 23:33:45 -0800 Subject: lib: Remove redundant IPI types We just need to distinguish only between FENCE and non FENCE related IPIs as all of the fence related requests are handled via fifo now. Remove the unnecessary IPI types related to individual fence types. Signed-off-by: Atish Patra Reviewed-by: Anup Patel --- lib/sbi/sbi_ecall.c | 6 +++--- lib/sbi/sbi_ipi.c | 13 +++---------- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'lib/sbi') diff --git a/lib/sbi/sbi_ecall.c b/lib/sbi/sbi_ecall.c index 785786f..58bce16 100644 --- a/lib/sbi/sbi_ecall.c +++ b/lib/sbi/sbi_ecall.c @@ -147,7 +147,7 @@ int sbi_ecall_0_1_handler(struct sbi_scratch *scratch, tlb_info.type = SBI_ITLB_FLUSH; tlb_info.shart_mask = 1UL << source_hart; ret = sbi_ipi_send_many(scratch, out_trap, (ulong *)args[0], - SBI_IPI_EVENT_FENCE_I, &tlb_info); + SBI_IPI_EVENT_FENCE, &tlb_info); break; case SBI_EXT_0_1_REMOTE_SFENCE_VMA: tlb_info.start = (unsigned long)args[1]; @@ -156,7 +156,7 @@ int sbi_ecall_0_1_handler(struct sbi_scratch *scratch, tlb_info.shart_mask = 1UL << source_hart; ret = sbi_ipi_send_many(scratch, out_trap, (ulong *)args[0], - SBI_IPI_EVENT_SFENCE_VMA, &tlb_info); + SBI_IPI_EVENT_FENCE, &tlb_info); break; case SBI_EXT_0_1_REMOTE_SFENCE_VMA_ASID: tlb_info.start = (unsigned long)args[1]; @@ -166,7 +166,7 @@ int sbi_ecall_0_1_handler(struct sbi_scratch *scratch, tlb_info.shart_mask = 1UL << source_hart; ret = sbi_ipi_send_many(scratch, out_trap, (ulong *)args[0], - SBI_IPI_EVENT_SFENCE_VMA_ASID, + SBI_IPI_EVENT_FENCE, &tlb_info); break; case SBI_EXT_0_1_SHUTDOWN: diff --git a/lib/sbi/sbi_ipi.c b/lib/sbi/sbi_ipi.c index af8d62d..8dc78a5 100644 --- a/lib/sbi/sbi_ipi.c +++ b/lib/sbi/sbi_ipi.c @@ -38,9 +38,7 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 hartid, u32 event, */ remote_scratch = sbi_hart_id_to_scratch(scratch, hartid); ipi_data = sbi_scratch_offset_ptr(remote_scratch, ipi_data_off); - if (event == SBI_IPI_EVENT_SFENCE_VMA || - event == SBI_IPI_EVENT_SFENCE_VMA_ASID || - event == SBI_IPI_EVENT_FENCE_I ) { + if (event == SBI_IPI_EVENT_FENCE) { ret = sbi_tlb_fifo_update(remote_scratch, hartid, data); if (ret < 0) return ret; @@ -49,11 +47,8 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 hartid, u32 event, smp_wmb(); sbi_platform_ipi_send(plat, hartid); - if (event == SBI_IPI_EVENT_SFENCE_VMA || - event == SBI_IPI_EVENT_SFENCE_VMA_ASID || - event == SBI_IPI_EVENT_FENCE_I ) { + if (event == SBI_IPI_EVENT_FENCE) sbi_tlb_fifo_sync(scratch); - } return 0; } @@ -113,9 +108,7 @@ void sbi_ipi_process(struct sbi_scratch *scratch) case SBI_IPI_EVENT_SOFT: csr_set(CSR_MIP, MIP_SSIP); break; - case SBI_IPI_EVENT_FENCE_I: - case SBI_IPI_EVENT_SFENCE_VMA: - case SBI_IPI_EVENT_SFENCE_VMA_ASID: + case SBI_IPI_EVENT_FENCE: sbi_tlb_fifo_process(scratch); break; case SBI_IPI_EVENT_HALT: -- cgit v1.2.3