Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ee3b3f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arch/csky updates from Guo Ren:
 "Here are three main features (cpu_hotplug, basic ftrace, basic perf)
  and some bugfixes:

  Features:
   - Add CPU-hotplug support for SMP
   - Add ftrace with function trace and function graph trace
   - Add Perf support
   - Add EM_CSKY_OLD 39
   - optimize kernel panic print.
   - remove syscall_exit_work

  Bugfixes:
   - fix abiv2 mmap(... O_SYNC) failure
   - fix gdb coredump error
   - remove vdsp implement for kernel
   - fix qemu failure to bootup sometimes
   - fix ftrace call-graph panic
   - fix device tree node reference leak
   - remove meaningless header-y
   - fix save hi,lo,dspcr regs in switch_stack
   - remove unused members in processor.h"

* tag 'csky-for-linus-4.21' of git://github.com/c-sky/csky-linux:
  csky: Add perf support for C-SKY
  csky: Add EM_CSKY_OLD 39
  clocksource/drivers/c-sky: fixup ftrace call-graph panic
  csky: ftrace call graph supported.
  csky: basic ftrace supported
  csky: remove unused members in processor.h
  csky: optimize kernel panic print.
  csky: stacktrace supported.
  csky: CPU-hotplug supported for SMP
  clocksource/drivers/c-sky: fixup qemu fail to bootup sometimes.
  csky: fixup save hi,lo,dspcr regs in switch_stack.
  csky: remove syscall_exit_work
  csky: fixup remove vdsp implement for kernel.
  csky: bugfix gdb coredump error.
  csky: fixup abiv2 mmap(... O_SYNC) failed.
  csky: define syscall_get_arch()
  elf-em.h: add EM_CSKY
  csky: remove meaningless header-y
  csky: Don't leak device tree node reference
parents a6598110 f50fd2d8

arch/csky/Kconfig

+29 −1
Original line number Diff line number Diff line
@@ -28,10 +28,13 @@ config CSKY 
	select GENERIC_SCHED_CLOCK

	select GENERIC_SMP_IDLE_THREAD

	select HAVE_ARCH_TRACEHOOK

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_LZMA

	select HAVE_PERF_EVENTS

	select HAVE_C_RECORDMCOUNT

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_CONTIGUOUS
@@ -40,7 +43,7 @@ config CSKY 
	select OF

	select OF_EARLY_FLATTREE

	select OF_RESERVED_MEM

	select PERF_USE_VMALLOC

	select PERF_USE_VMALLOC if CPU_CK610

	select RTC_LIB

	select TIMER_OF

	select USB_ARCH_HAS_EHCI
@@ -93,6 +96,9 @@ config MMU 
config RWSEM_GENERIC_SPINLOCK

	def_bool y



config STACKTRACE_SUPPORT

	def_bool y



config TIME_LOW_RES

	def_bool y
@@ -144,6 +150,19 @@ config CPU_CK860 
	select CPU_HAS_FPUV2

endchoice



choice

	prompt "C-SKY PMU type"

	depends on PERF_EVENTS

	depends on CPU_CK807 || CPU_CK810 || CPU_CK860



config CPU_PMU_NONE

	bool "None"



config CSKY_PMU_V1

	bool "Performance Monitoring Unit Ver.1"



endchoice



choice

	prompt "Power Manager Instruction (wait/doze/stop)"

	default CPU_PM_NONE
@@ -197,6 +216,15 @@ config RAM_BASE 
	hex "DRAM start addr (the same with memory-section in dts)"

	default 0x0



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"

	select GENERIC_IRQ_MIGRATION

	depends on SMP

	help

	  Say Y here to allow turning CPUs off and on. CPUs can be

	  controlled through /sys/devices/system/cpu/cpu1/hotplug/target.



	  Say N if you want to disable CPU hotplug.

endmenu



source "kernel/Kconfig.hz"

arch/csky/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ ifeq ($(CSKYABI),abiv2) 
KBUILD_CFLAGS += -mno-stack-size

endif



ifdef CONFIG_STACKTRACE

KBUILD_CFLAGS += -mbacktrace

endif



abidirs := $(patsubst %,arch/csky/%/,$(CSKYABI))

KBUILD_CFLAGS += $(patsubst %,-I$(srctree)/%inc,$(abidirs))

arch/csky/abiv1/inc/abi/pgtable-bits.h

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#define _PAGE_CACHE		(3<<9)

#define _PAGE_UNCACHE		(2<<9)

#define _PAGE_SO		_PAGE_UNCACHE



#define _CACHE_MASK		(7<<9)

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

0 → 100644
+17 −0
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_PTRACE_H

#define __ABI_CSKY_PTRACE_H



struct switch_stack {

	unsigned long r8;

	unsigned long r9;

	unsigned long r10;

	unsigned long r11;

	unsigned long r12;

	unsigned long r13;

	unsigned long r14;

	unsigned long r15;

};

#endif /* __ABI_CSKY_PTRACE_H */

arch/csky/abiv2/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,3 +8,4 @@ obj-y += strcmp.o 
obj-y				+= strcpy.o

obj-y				+= strlen.o

obj-y				+= strksyms.o

obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o