Commit cd278456 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'csky-for-linus-5.12-rc1' of git://github.com/c-sky/csky-linux 

Pull arch/csky updates from Guo Ren:
 "Features:
   - add new memory layout 2.5G(user):1.5G(kernel)
   - add kmemleak support
   - reconstruct VDSO framework: add VDSO with GENERIC_GETTIMEOFDAY,
     GENERIC_TIME_VSYSCALL, HAVE_GENERIC_VDSO
   - add faulthandler_disabled() check
   - support (fix) swapon
   - add (fix) _PAGE_ACCESSED for default pgprot
   - abort uaccess retries upon fatal signal (from arm)

  Fixes and optimizations:
   - fix perf probe failure
   - fix show_regs doesn't contain regs->usp
   - remove custom asm/atomic.h implementation
   - fix barrier design
   - fix futex SMP implementation
   - fix asm/cmpxchg.h with correct ordering barrier
   - cleanup asm/spinlock.h
   - fix PTE global for 2.5:1.5 virtual memory
   - remove prologue of page fault handler in entry.S
   - fix TLB maintenance synchronization problem
   - add show_tlb for CPU_CK860 debug
   - fix FAULT_FLAG_XXX param for handle_mm_fault
   - fix update_mmu_cache called with user io mapping
   - fix do_page_fault parent irq status
   - fix a size determination in gpr_get()
   - pgtable.h: Coding convention
   - kprobe: Fix code in simulate without 'long'
   - fix pfn_valid error with wrong max_mapnr
   - use free_initmem_default() in free_initmem()
   - fix compile error"

* tag 'csky-for-linus-5.12-rc1' of git://github.com/c-sky/csky-linux: (30 commits)
  csky: Fixup compile error
  csky: use free_initmem_default() in free_initmem()
  csky: Fixup pfn_valid error with wrong max_mapnr
  csky: Add VDSO with GENERIC_GETTIMEOFDAY, GENERIC_TIME_VSYSCALL, HAVE_GENERIC_VDSO
  csky: kprobe: Fixup code in simulate without 'long'
  csky: Fixup swapon
  csky: pgtable.h: Coding convention
  csky: Fixup _PAGE_ACCESSED for default pgprot
  csky: remove unused including <linux/version.h>
  csky: Fix a size determination in gpr_get()
  csky: Reconstruct VDSO framework
  csky: mm: abort uaccess retries upon fatal signal
  csky: Sync riscv mm/fault.c for easy maintenance
  csky: Fixup do_page_fault parent irq status
  csky: Add faulthandler_disabled() check
  csky: Fixup update_mmu_cache called with user io mapping
  csky: Fixup FAULT_FLAG_XXX param for handle_mm_fault
  csky: Add show_tlb for CPU_CK860 debug
  csky: Fix TLB maintenance synchronization problem
  csky: Add kmemleak support
  ...
parents 7d19ea5e 6607aa6f

arch/csky/Kconfig

+23 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ config CSKY 
	select ARCH_HAS_SYNC_DMA_FOR_CPU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_QUEUED_RWLOCKS if NR_CPUS>2

	select ARCH_USE_QUEUED_RWLOCKS

	select ARCH_WANT_FRAME_POINTERS if !CPU_CK610

	select ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT

	select COMMON_CLK
@@ -35,6 +35,9 @@ config CSKY 
	select GENERIC_IRQ_MULTI_HANDLER

	select GENERIC_SCHED_CLOCK

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

	select GENERIC_VDSO_32

	select GENERIC_GETTIMEOFDAY

	select GX6605S_TIMER if CPU_CK610

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_AUDITSYSCALL
@@ -43,11 +46,14 @@ config CSKY 
	select HAVE_CONTEXT_TRACKING

	select HAVE_VIRT_CPU_ACCOUNTING_GEN

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_GENERIC_VDSO

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUTEX_CMPXCHG if FUTEX && SMP

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO
@@ -192,6 +198,22 @@ config CPU_CK860 
endchoice



choice

	prompt "PAGE OFFSET"

	default PAGE_OFFSET_80000000



config PAGE_OFFSET_80000000

	bool "PAGE OFFSET 2G (user:kernel = 2:2)"



config PAGE_OFFSET_A0000000

	bool "PAGE OFFSET 2.5G (user:kernel = 2.5:1.5)"

endchoice



config PAGE_OFFSET

	hex

	default 0x80000000 if PAGE_OFFSET_80000000

	default 0xa0000000 if PAGE_OFFSET_A0000000

choice



	prompt "C-SKY PMU type"

	depends on PERF_EVENTS

	depends on CPU_CK807 || CPU_CK810 || CPU_CK860

arch/csky/abiv1/inc/abi/cacheflush.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.



#ifndef __ABI_CSKY_CACHEFLUSH_H

#define __ABI_CSKY_CACHEFLUSH_H

arch/csky/abiv1/inc/abi/ckmmu.h

+5 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.



#ifndef __ASM_CSKY_CKMMUV1_H

#define __ASM_CSKY_CKMMUV1_H
@@ -89,13 +88,14 @@ static inline void tlb_invalid_indexed(void) 
	cpwcr("cpcr8", 0x02000000);

}



static inline void setup_pgd(unsigned long pgd, bool kernel)

static inline void setup_pgd(pgd_t *pgd, int asid)

{

	cpwcr("cpcr29", pgd | BIT(0));

	cpwcr("cpcr29", __pa(pgd) | BIT(0));

	write_mmu_entryhi(asid);

}



static inline unsigned long get_pgd(void)

static inline pgd_t *get_pgd(void)

{

	return cprcr("cpcr29") & ~BIT(0);

	return __va(cprcr("cpcr29") & ~BIT(0));

}

#endif /* __ASM_CSKY_CKMMUV1_H */

arch/csky/abiv1/inc/abi/entry.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.



#ifndef __ASM_CSKY_ENTRY_H

#define __ASM_CSKY_ENTRY_H

arch/csky/abiv1/inc/abi/page.h

+0 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.



#include <asm/shmparam.h>