d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFP4:

Browse Source 
Change 228019 by bz@bz_zenith on 2013/04/23 13:55:30

	Add kernel side support for large TLB on BERI/CHERI.
	Modelled similar to NLM

MFC after:	3 days
Sponsored by:	DAPRA/AFRL
This commit is contained in:
Brooks Davis 2013-10-22 21:08:25 +00:00
parent cf193ef13e
commit f66834b69a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=256935
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/conf/options.mips
View File

@ -80,6 +80,11 @@ OCTEON_VENDOR_RADISYS opt_cvmx.h
OCTEON_VENDOR_GEFES opt_cvmx.h OCTEON_VENDOR_GEFES opt_cvmx.h
OCTEON_BOARD_CAPK_0100ND opt_cvmx.h OCTEON_BOARD_CAPK_0100ND opt_cvmx.h
#
# Options specific to the BERI platform.
#
BERI_LARGE_TLB opt_global.h
# #
# Options that control the Atheros SoC peripherals # Options that control the Atheros SoC peripherals
# #

2
sys/mips/beri/std.beri
View File

@ -2,3 +2,5 @@
files "../beri/files.beri" files "../beri/files.beri"
cpu CPU_MIPS4KC cpu CPU_MIPS4KC
options BERI_LARGE_TLB

7
sys/mips/include/cpufunc.h
View File

@ -242,8 +242,13 @@ MIPS_RW32_COP0_SEL(config3, MIPS_COP_0_CONFIG, 3);
#ifdef CPU_CNMIPS #ifdef CPU_CNMIPS
MIPS_RW32_COP0_SEL(config4, MIPS_COP_0_CONFIG, 4); MIPS_RW32_COP0_SEL(config4, MIPS_COP_0_CONFIG, 4);
#endif #endif
#ifdef CPU_NLM #ifdef BERI_LARGE_TLB
MIPS_RW32_COP0_SEL(config5, MIPS_COP_0_CONFIG, 5);
#endif
#if defined(CPU_NLM) || defined(BERI_LARGE_TLB)
MIPS_RW32_COP0_SEL(config6, MIPS_COP_0_CONFIG, 6); MIPS_RW32_COP0_SEL(config6, MIPS_COP_0_CONFIG, 6);
#endif
#ifdef CPU_NLM
MIPS_RW32_COP0_SEL(config7, MIPS_COP_0_CONFIG, 7); MIPS_RW32_COP0_SEL(config7, MIPS_COP_0_CONFIG, 7);
#endif #endif
MIPS_RW32_COP0(count, MIPS_COP_0_COUNT); MIPS_RW32_COP0(count, MIPS_COP_0_COUNT);

26
sys/mips/mips/cpu.c
View File

@ -99,17 +99,29 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo)
/* Learn TLB size and L1 cache geometry. */ /* Learn TLB size and L1 cache geometry. */
cfg1 = mips_rd_config1(); cfg1 = mips_rd_config1();
#ifndef CPU_NLM
cpuinfo->tlb_nentries = #if defined(CPU_NLM)
((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1;
#else
/* Account for Extended TLB entries in XLP */ /* Account for Extended TLB entries in XLP */
tmp = mips_rd_config6(); tmp = mips_rd_config6();
cpuinfo->tlb_nentries = ((tmp >> 16) & 0xffff) + 1; cpuinfo->tlb_nentries = ((tmp >> 16) & 0xffff) + 1;
#elif defined(BERI_LARGE_TLB)
/* Check if we support extended TLB entries and if so activate. */
tmp = mips_rd_config5();
#define BERI_CP5_LTLB_SUPPORTED 0x1
if (tmp & BERI_CP5_LTLB_SUPPORTED) {
/* See how many extra TLB entries we have. */
tmp = mips_rd_config6();
cpuinfo->tlb_nentries = (tmp >> 16) + 1;
/* Activate the extended entries. */
mips_wr_config6(tmp|0x4);
} else
#endif
#if !defined(CPU_NLM)
cpuinfo->tlb_nentries =
((cfg1 & MIPS_CONFIG1_TLBSZ_MASK) >> MIPS_CONFIG1_TLBSZ_SHIFT) + 1;
#endif #endif
/* Add extended TLB size information from config4. */
#if defined(CPU_CNMIPS) #if defined(CPU_CNMIPS)
/* Add extended TLB size information from config4. */
cfg4 = mips_rd_config4(); cfg4 = mips_rd_config4();
if ((cfg4 & MIPS_CONFIG4_MMUEXTDEF) == MIPS_CONFIG4_MMUEXTDEF_MMUSIZEEXT) if ((cfg4 & MIPS_CONFIG4_MMUEXTDEF) == MIPS_CONFIG4_MMUEXTDEF_MMUSIZEEXT)
cpuinfo->tlb_nentries += (cfg4 & MIPS_CONFIG4_MMUSIZEEXT) * 0x40; cpuinfo->tlb_nentries += (cfg4 & MIPS_CONFIG4_MMUSIZEEXT) * 0x40;
@ -124,8 +136,8 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo)
1 << (((cfg1 & MIPS_CONFIG1_IS_MASK) >> MIPS_CONFIG1_IS_SHIFT) + 6); 1 << (((cfg1 & MIPS_CONFIG1_IS_MASK) >> MIPS_CONFIG1_IS_SHIFT) + 6);
} }
#ifndef CPU_CNMIPS
/* L1 data cache. */ /* L1 data cache. */
#ifndef CPU_CNMIPS
tmp = (cfg1 & MIPS_CONFIG1_DL_MASK) >> MIPS_CONFIG1_DL_SHIFT; tmp = (cfg1 & MIPS_CONFIG1_DL_MASK) >> MIPS_CONFIG1_DL_SHIFT;
if (tmp != 0) { if (tmp != 0) {
cpuinfo->l1.dc_linesize = 1 << (tmp + 1); cpuinfo->l1.dc_linesize = 1 << (tmp + 1);