Commit 3c9e6656 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fixes from Vineet Gupta:

 - fix recent DSP code regression on ARC700 platforms

 - fix thinkos in ICCM/DCCM size checks

 - USB regression fix

 - other small fixes here and there

* tag 'arc-5.7-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: show_regs: avoid extra line of output
  ARC: guard dsp early init against non ARCv2
  ARC: [plat-eznps]: Restrict to CONFIG_ISA_ARCOMPACT
  ARC: entry: comment
  arc: remove #ifndef CONFIG_AS_CFI_SIGNAL_FRAME
  arc: ptrace: hard-code "arc" instead of UTS_MACHINE
  ARC: [plat-hsdk]: fix USB regression
  ARC: Fix ICCM & DCCM runtime size checks
parents 03fb3aca 79155023

arch/arc/configs/hsdk_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ CONFIG_DRM_UDL=y 
CONFIG_DRM_ETNAVIV=y

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_HCD_PLATFORM=y

CONFIG_USB_OHCI_HCD=y

arch/arc/include/asm/dsp-impl.h

+2 −0
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ 


/* clobbers r5 register */

.macro DSP_EARLY_INIT

#ifdef CONFIG_ISA_ARCV2

	lr	r5, [ARC_AUX_DSP_BUILD]

	bmsk	r5, r5, 7

	breq    r5, 0, 1f

	mov	r5, DSP_CTRL_DISABLED_ALL

	sr	r5, [ARC_AUX_DSP_CTRL]

1:

#endif

.endm



/* clobbers r10, r11 registers pair */

arch/arc/include/asm/entry-arcv2.h

+2 −0
Original line number Diff line number Diff line
@@ -233,6 +233,8 @@ 


#ifdef CONFIG_ARC_IRQ_NO_AUTOSAVE

	__RESTORE_REGFILE_HARD



	; SP points to PC/STAT32: hw restores them despite NO_AUTOSAVE

	add	sp, sp, SZ_PT_REGS - 8

#else

	add	sp, sp, PT_r0

arch/arc/kernel/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 
# Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)

#



# Pass UTS_MACHINE for user_regset definition

CFLAGS_ptrace.o		+= -DUTS_MACHINE='"$(UTS_MACHINE)"'



obj-y	:= arcksyms.o setup.o irq.o reset.o ptrace.o process.o devtree.o

obj-y	+= signal.o traps.o sys.o troubleshoot.o stacktrace.o disasm.o

obj-$(CONFIG_ISA_ARCOMPACT)		+= entry-compact.o intc-compact.o

arch/arc/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ static const struct user_regset arc_regsets[] = { 
};



static const struct user_regset_view user_arc_view = {

	.name		= UTS_MACHINE,

	.name		= "arc",

	.e_machine	= EM_ARC_INUSE,

	.regsets	= arc_regsets,

	.n		= ARRAY_SIZE(arc_regsets)

CRA Git | Maintained and supported by SUSTech CRA and CCSE