Skip to content

Commit a1f749d

Browse files
committed
Merge tag 'csky-for-linus-6.4' of https://github.com/c-sky/csky-linux
Pull arch/csky updates from Guo Ren: - Remove CPU_TLB_SIZE config - Prevent spurious page faults * tag 'csky-for-linus-6.4' of https://github.com/c-sky/csky-linux: csky: mmu: Prevent spurious page faults csky: remove obsolete config CPU_TLB_SIZE
2 parents 1a5304f + 1f62ed0 commit a1f749d

3 files changed

Lines changed: 6 additions & 5 deletions

File tree

arch/csky/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -166,11 +166,6 @@ config STACKTRACE_SUPPORT
166166
config TIME_LOW_RES
167167
def_bool y
168168

169-
config CPU_TLB_SIZE
170-
int
171-
default "128" if (CPU_CK610 || CPU_CK807 || CPU_CK810)
172-
default "1024" if (CPU_CK860)
173-
174169
config CPU_ASID_BITS
175170
int
176171
default "8" if (CPU_CK610 || CPU_CK807 || CPU_CK810)

arch/csky/abiv1/cacheflush.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include <asm/cache.h>
1212
#include <asm/cacheflush.h>
1313
#include <asm/cachectl.h>
14+
#include <asm/tlbflush.h>
1415

1516
#define PG_dcache_clean PG_arch_1
1617

@@ -40,6 +41,8 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr,
4041
unsigned long pfn = pte_pfn(*ptep);
4142
struct page *page;
4243

44+
flush_tlb_page(vma, addr);
45+
4346
if (!pfn_valid(pfn))
4447
return;
4548

arch/csky/abiv2/cacheflush.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@
55
#include <linux/highmem.h>
66
#include <linux/mm.h>
77
#include <asm/cache.h>
8+
#include <asm/tlbflush.h>
89

910
void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
1011
pte_t *pte)
1112
{
1213
unsigned long addr;
1314
struct page *page;
1415

16+
flush_tlb_page(vma, address);
17+
1518
if (!pfn_valid(pte_pfn(*pte)))
1619
return;
1720

0 commit comments

Comments
 (0)