platform: Uses hart count as the default size of tlb info

For platform with high number of harts, it is better to auto detect a
suitable number of entries in tlb fifo. Since allocating tlb entry for
all online harts can reduce the wait time significantly, using the
number of the online harts can make most platforms happy. This auto
detection can avoid most duplicate code for setting tlb fifo size.

Signed-off-by: Inochi Amaoto <inochiama@outlook.com>
Acked-by: Guo Ren <guoren@kernel.org>
Reviewed-by: Xiang W <wxjstz@126.com>
Reviewed-by: Anup Patel <anup@brainfault.org>

diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h
index 389203b02a4dbaa077b6b7d42e1be83b6c5cb719..58b9069d903c1f6e6c100ac6d35cac5d7825bdc5 100644 (file)
--- a/include/sbi/sbi_platform.h
+++ b/include/sbi/sbi_platform.h
@@ -41,7 +41,6 @@
 #define SBI_PLATFORM_HART_INDEX2ID_OFFSET (0x60 + (__SIZEOF_POINTER__ * 2))
 
 #define SBI_PLATFORM_TLB_RANGE_FLUSH_LIMIT_DEFAULT             (1UL << 12)
-#define SBI_PLATFORM_TLB_FIFO_NUM_ENTRIES                              8
 
 #ifndef __ASSEMBLER__
 
@@ -330,7 +329,7 @@ static inline u32 sbi_platform_tlb_fifo_num_entries(const struct sbi_platform *p
 {
        if (plat && sbi_platform_ops(plat)->get_tlb_num_entries)
                return sbi_platform_ops(plat)->get_tlb_num_entries();
-       return SBI_PLATFORM_TLB_FIFO_NUM_ENTRIES;
+       return sbi_scratch_last_hartindex() + 1;
 }
 
 /**

diff --git a/platform/generic/platform.c b/platform/generic/platform.c
index 66a0b77c95246bb1d18fbeff431799b5a95c562c..4246efdb1ad98a075e1daef0b5f0fa0b818aad35 100644 (file)
--- a/platform/generic/platform.c
+++ b/platform/generic/platform.c
@@ -260,7 +260,7 @@ static u32 generic_tlb_num_entries(void)
 {
        if (generic_plat && generic_plat->tlb_num_entries)
                return generic_plat->tlb_num_entries(generic_plat_match);
-       return SBI_PLATFORM_TLB_FIFO_NUM_ENTRIES;
+       return sbi_scratch_last_hartindex() + 1;
 }
 
 static int generic_pmu_init(void)