UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARC: compress cpuinfo_arc_mmu (mainly save page size in KB) 

Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
This commit is contained in:
Vineet Gupta 2015-02-13 18:33:47 +05:30
parent 5b9bd17840
commit 40b552d95a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arc/include/asm/arcregs.h
View File

@ -299,7 +299,8 @@ struct bcr_generic {
*/ */
struct cpuinfo_arc_mmu { struct cpuinfo_arc_mmu {
unsigned int ver, pg_sz, sets, ways, u_dtlb, u_itlb, num_tlb; unsigned int ver:4, pg_sz_k:8, pad:8, u_dtlb:6, u_itlb:6;
unsigned int num_tlb:16, sets:12, ways:4;
}; };
struct cpuinfo_arc_cache { struct cpuinfo_arc_cache {

8
arch/arc/mm/tlb.c
View File

@ -587,14 +587,14 @@ void read_decode_mmu_bcr(void)
if (mmu->ver <= 2) { if (mmu->ver <= 2) {
mmu2 = (struct bcr_mmu_1_2 *)&tmp; mmu2 = (struct bcr_mmu_1_2 *)&tmp;
mmu->pg_sz = PAGE_SIZE; mmu->pg_sz_k = TO_KB(PAGE_SIZE);
mmu->sets = 1 << mmu2->sets; mmu->sets = 1 << mmu2->sets;
mmu->ways = 1 << mmu2->ways; mmu->ways = 1 << mmu2->ways;
mmu->u_dtlb = mmu2->u_dtlb; mmu->u_dtlb = mmu2->u_dtlb;
mmu->u_itlb = mmu2->u_itlb; mmu->u_itlb = mmu2->u_itlb;
} else { } else {
mmu3 = (struct bcr_mmu_3 *)&tmp; mmu3 = (struct bcr_mmu_3 *)&tmp;
mmu->pg_sz = 512 << mmu3->pg_sz; mmu->pg_sz_k = 1 << (mmu3->pg_sz - 1);
mmu->sets = 1 << mmu3->sets; mmu->sets = 1 << mmu3->sets;
mmu->ways = 1 << mmu3->ways; mmu->ways = 1 << mmu3->ways;
mmu->u_dtlb = mmu3->u_dtlb; mmu->u_dtlb = mmu3->u_dtlb;
@ -611,7 +611,7 @@ char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len)
n += scnprintf(buf + n, len - n, n += scnprintf(buf + n, len - n,
"MMU [v%x]\t: %dk PAGE, JTLB %d (%dx%d), uDTLB %d, uITLB %d %s\n", "MMU [v%x]\t: %dk PAGE, JTLB %d (%dx%d), uDTLB %d, uITLB %d %s\n",
p_mmu->ver, TO_KB(p_mmu->pg_sz), p_mmu->ver, p_mmu->pg_sz_k,
p_mmu->num_tlb, p_mmu->sets, p_mmu->ways, p_mmu->num_tlb, p_mmu->sets, p_mmu->ways,
p_mmu->u_dtlb, p_mmu->u_itlb, p_mmu->u_dtlb, p_mmu->u_itlb,
IS_ENABLED(CONFIG_ARC_MMU_SASID) ? ",SASID" : ""); IS_ENABLED(CONFIG_ARC_MMU_SASID) ? ",SASID" : "");
@ -639,7 +639,7 @@ void arc_mmu_init(void)
mmu->ver, CONFIG_ARC_MMU_VER); mmu->ver, CONFIG_ARC_MMU_VER);
} }
if (mmu->pg_sz != PAGE_SIZE) if (mmu->pg_sz_k != TO_KB(PAGE_SIZE))
panic("MMU pg size != PAGE_SIZE (%luk)\n", TO_KB(PAGE_SIZE)); panic("MMU pg size != PAGE_SIZE (%luk)\n", TO_KB(PAGE_SIZE));
/* Enable the MMU */ /* Enable the MMU */