[PATCH v5 14/15] lib:sbi:tlb: Improve function naming
Anup Patel
anup at brainfault.org
Sat Jul 10 22:31:22 PDT 2021
On Sat, Jul 10, 2021 at 9:49 PM Atish Patra <atish.patra at wdc.com> wrote:
>
> Follow the standard conventon for static function names:
>
> All global functions should be start with sbi_<module name>_
> All static functions should be start with <module name>_
>
> Reviewed-by: Anup Patel <anup.patel at wdc.com>
> Signed-off-by: Atish Patra <atish.patra at wdc.com>
Fixed commit subject at time of merging this patch.
Applied this patch to the riscv/opensbi repo.
Thanks,
Anup
> ---
> lib/sbi/sbi_tlb.c | 41 ++++++++++++++++++++---------------------
> 1 file changed, 20 insertions(+), 21 deletions(-)
>
> diff --git a/lib/sbi/sbi_tlb.c b/lib/sbi/sbi_tlb.c
> index 1a9cb1d2b5df..efa74a7542b3 100644
> --- a/lib/sbi/sbi_tlb.c
> +++ b/lib/sbi/sbi_tlb.c
> @@ -28,7 +28,7 @@ static unsigned long tlb_fifo_off;
> static unsigned long tlb_fifo_mem_off;
> static unsigned long tlb_range_flush_limit;
>
> -static void sbi_tlb_flush_all(void)
> +static void tlb_flush_all(void)
> {
> __asm__ __volatile("sfence.vma");
> }
> @@ -85,7 +85,7 @@ void sbi_tlb_local_sfence_vma(struct sbi_tlb_info *tinfo)
> sbi_pmu_ctr_incr_fw(SBI_PMU_FW_SFENCE_VMA_RCVD);
>
> if ((start == 0 && size == 0) || (size == SBI_TLB_FLUSH_ALL)) {
> - sbi_tlb_flush_all();
> + tlb_flush_all();
> return;
> }
>
> @@ -162,7 +162,7 @@ void sbi_tlb_local_sfence_vma_asid(struct sbi_tlb_info *tinfo)
> sbi_pmu_ctr_incr_fw(SBI_PMU_FW_SFENCE_VMA_ASID_RCVD);
>
> if (start == 0 && size == 0) {
> - sbi_tlb_flush_all();
> + tlb_flush_all();
> return;
> }
>
> @@ -211,7 +211,7 @@ static void tlb_pmu_incr_fw_ctr(struct sbi_tlb_info *data)
> sbi_pmu_ctr_incr_fw(SBI_PMU_FW_HFENCE_VVMA_ASID_SENT);
> }
>
> -static void sbi_tlb_entry_process(struct sbi_tlb_info *tinfo)
> +static void tlb_entry_process(struct sbi_tlb_info *tinfo)
> {
> u32 rhartid;
> struct sbi_scratch *rscratch = NULL;
> @@ -229,8 +229,7 @@ static void sbi_tlb_entry_process(struct sbi_tlb_info *tinfo)
> }
> }
>
> -static void sbi_tlb_process_count(struct sbi_scratch *scratch,
> - unsigned int count)
> +static void tlb_process_count(struct sbi_scratch *scratch, int count)
> {
> struct sbi_tlb_info tinfo;
> unsigned int deq_count = 0;
> @@ -238,7 +237,7 @@ static void sbi_tlb_process_count(struct sbi_scratch *scratch,
> sbi_scratch_offset_ptr(scratch, tlb_fifo_off);
>
> while (!sbi_fifo_dequeue(tlb_fifo, &tinfo)) {
> - sbi_tlb_entry_process(&tinfo);
> + tlb_entry_process(&tinfo);
> deq_count++;
> if (deq_count > count)
> break;
> @@ -246,17 +245,17 @@ static void sbi_tlb_process_count(struct sbi_scratch *scratch,
> }
> }
>
> -static void sbi_tlb_process(struct sbi_scratch *scratch)
> +static void tlb_process(struct sbi_scratch *scratch)
> {
> struct sbi_tlb_info tinfo;
> struct sbi_fifo *tlb_fifo =
> sbi_scratch_offset_ptr(scratch, tlb_fifo_off);
>
> while (!sbi_fifo_dequeue(tlb_fifo, &tinfo))
> - sbi_tlb_entry_process(&tinfo);
> + tlb_entry_process(&tinfo);
> }
>
> -static void sbi_tlb_sync(struct sbi_scratch *scratch)
> +static void tlb_sync(struct sbi_scratch *scratch)
> {
> unsigned long *tlb_sync =
> sbi_scratch_offset_ptr(scratch, tlb_sync_off);
> @@ -266,13 +265,13 @@ static void sbi_tlb_sync(struct sbi_scratch *scratch)
> * While we are waiting for remote hart to set the sync,
> * consume fifo requests to avoid deadlock.
> */
> - sbi_tlb_process_count(scratch, 1);
> + tlb_process_count(scratch, 1);
> }
>
> return;
> }
>
> -static inline int __sbi_tlb_range_check(struct sbi_tlb_info *curr,
> +static inline int tlb_range_check(struct sbi_tlb_info *curr,
> struct sbi_tlb_info *next)
> {
> unsigned long curr_end;
> @@ -315,7 +314,7 @@ static inline int __sbi_tlb_range_check(struct sbi_tlb_info *curr,
> * before continuing the while loop. This method is preferred over wfi/ipi because
> * of MMIO cost involved in later method.
> */
> -static int sbi_tlb_update_cb(void *in, void *data)
> +static int tlb_update_cb(void *in, void *data)
> {
> struct sbi_tlb_info *curr;
> struct sbi_tlb_info *next;
> @@ -330,16 +329,16 @@ static int sbi_tlb_update_cb(void *in, void *data)
> if (next->local_fn == sbi_tlb_local_sfence_vma_asid &&
> curr->local_fn == sbi_tlb_local_sfence_vma_asid) {
> if (next->asid == curr->asid)
> - ret = __sbi_tlb_range_check(curr, next);
> + ret = tlb_range_check(curr, next);
> } else if (next->local_fn == sbi_tlb_local_sfence_vma &&
> curr->local_fn == sbi_tlb_local_sfence_vma) {
> - ret = __sbi_tlb_range_check(curr, next);
> + ret = tlb_range_check(curr, next);
> }
>
> return ret;
> }
>
> -static int sbi_tlb_update(struct sbi_scratch *scratch,
> +static int tlb_update(struct sbi_scratch *scratch,
> struct sbi_scratch *remote_scratch,
> u32 remote_hartid, void *data)
> {
> @@ -369,7 +368,7 @@ static int sbi_tlb_update(struct sbi_scratch *scratch,
>
> tlb_fifo_r = sbi_scratch_offset_ptr(remote_scratch, tlb_fifo_off);
>
> - ret = sbi_fifo_inplace_update(tlb_fifo_r, data, sbi_tlb_update_cb);
> + ret = sbi_fifo_inplace_update(tlb_fifo_r, data, tlb_update_cb);
> if (ret != SBI_FIFO_UNCHANGED) {
> return 1;
> }
> @@ -383,7 +382,7 @@ static int sbi_tlb_update(struct sbi_scratch *scratch,
> * TODO: Introduce a wait/wakeup event mechanism to handle
> * this properly.
> */
> - sbi_tlb_process_count(scratch, 1);
> + tlb_process_count(scratch, 1);
> sbi_dprintf("hart%d: hart%d tlb fifo full\n",
> curr_hartid, remote_hartid);
> }
> @@ -393,9 +392,9 @@ static int sbi_tlb_update(struct sbi_scratch *scratch,
>
> static struct sbi_ipi_event_ops tlb_ops = {
> .name = "IPI_TLB",
> - .update = sbi_tlb_update,
> - .sync = sbi_tlb_sync,
> - .process = sbi_tlb_process,
> + .update = tlb_update,
> + .sync = tlb_sync,
> + .process = tlb_process,
> };
>
> static u32 tlb_event = SBI_IPI_EVENT_MAX;
> --
> 2.31.1
>
>
> --
> opensbi mailing list
> opensbi at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/opensbi
More information about the opensbi
mailing list