Commit 26b089a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull csky updates from Guo Ren:

 - fix for copy_from/to_user (a hard-to-find bug, thx Viro)

 - fix for calltrace panic without FRAME_POINT

 - two fixes for perf

 - two build fixes

 - four fixes for non-fatal bugs (msa, rm dis_irq, cleanup psr,
   gdbmacros.txt)

* tag 'csky-for-linus-5.7-rc6' of git://github.com/c-sky/csky-linux:
  csky: Fixup raw_copy_from_user()
  csky: Fixup gdbmacros.txt with name sp in thread_struct
  csky: Fixup remove unnecessary save/restore PSR code
  csky: Fixup remove duplicate irq_disable
  csky: Fixup calltrace panic
  csky: Fixup perf callchain unwind
  csky: Fixup msa highest 3 bits mask
  csky: Fixup perf probe -x hungup
  csky: Fixup compile error for abiv1 entry.S
  csky/ftrace: Fixup error when disable CONFIG_DYNAMIC_FTRACE
parents 5c33696f 51bb38cb

arch/csky/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ config CSKY 
	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_QUEUED_RWLOCKS if NR_CPUS>2

	select ARCH_WANT_FRAME_POINTERS if !CPU_CK610

	select COMMON_CLK

	select CLKSRC_MMIO

	select CSKY_MPINTC if CPU_CK860
@@ -38,6 +39,7 @@ config CSKY 
	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_COPY_THREAD_TLS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE_WITH_REGS

	select HAVE_FUNCTION_TRACER

arch/csky/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ ifeq ($(CSKYABI),abiv2) 
KBUILD_CFLAGS += -mno-stack-size

endif



ifdef CONFIG_STACKTRACE

ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS += -mbacktrace

endif

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

+2 −2
Original line number Diff line number Diff line
@@ -167,8 +167,8 @@ 
	 *   BA     Reserved  C   D   V

	 */

	cprcr	r6, cpcr30

	lsri	r6, 28

	lsli	r6, 28

	lsri	r6, 29

	lsli	r6, 29

	addi	r6, 0xe

	cpwcr	r6, cpcr30

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

+2 −2
Original line number Diff line number Diff line
@@ -285,8 +285,8 @@ 
	 */

	mfcr	r6, cr<30, 15> /* Get MSA0 */

2:

	lsri	r6, 28

	lsli	r6, 28

	lsri	r6, 29

	lsli	r6, 29

	addi	r6, 0x1ce

	mtcr	r6, cr<30, 15> /* Set MSA0 */

arch/csky/abiv2/mcount.S

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ ENTRY(_mcount) 
	mov	a0, lr

	subi	a0, 4

	ldw	a1, (sp, 24)

	lrw	a2, function_trace_op

	ldw	a2, (a2, 0)



	jsr	r26

CRA Git | Maintained and supported by SUSTech CRA and CCSE