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

Merge tag 'arc-4.4-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fixes from Vineet Gupta:
 "Found a couple of brown paper bag bugs with the prev pull request
  (including a SMP build breakage report from Guenter).  Since these are
  urgent I also decided to send over a bunch of other pending fixes
  which could have otherwise waited an rc or two.

  Summary:

   - A bunch of brown paper bag bugs (MAINTAINERS list email, SMP build
     failure)
   - cpu_relax() now compiler barrier for UP as well
   - handling of userspace Bus Errors for ARCompact builds"

* tag 'arc-4.4-rc1-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: Fix silly typo in MAINTAINERS file
  ARC: cpu_relax() to be compiler barrier even for UP
  ARC: use ASL assembler mnemonic
  ARC: [arcompact] Handle bus error from userspace as Interrupt not exception
  ARC: remove extraneous header include
  ARCv2: lib: memcpy: use local symbols
parents 63f4f7e8 30b9dbee

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10300,7 +10300,7 @@ F: include/net/switchdev.h 


SYNOPSYS ARC ARCHITECTURE

M:	Vineet Gupta <vgupta@synopsys.com>

L:	linux-snps-arc@lists.infraded.org

L:	linux-snps-arc@lists.infradead.org

S:	Supported

F:	arch/arc/

F:	Documentation/devicetree/bindings/arc/*

arch/arc/include/asm/processor.h

+0 −4
Original line number Diff line number Diff line
@@ -57,11 +57,7 @@ struct task_struct; 
 * A lot of busy-wait loops in SMP are based off of non-volatile data otherwise

 * get optimised away by gcc

 */

#ifdef CONFIG_SMP

#define cpu_relax()	__asm__ __volatile__ ("" : : : "memory")

#else

#define cpu_relax()	do { } while (0)

#endif



#define cpu_relax_lowlatency() cpu_relax()

arch/arc/kernel/entry-arcv2.S

+19 −0
Original line number Diff line number Diff line
@@ -91,6 +91,25 @@ ENTRY(EV_DCError) 
	flag 1

END(EV_DCError)



; ---------------------------------------------

; Memory Error Exception Handler

;   - Unlike ARCompact, handles Bus errors for both User/Kernel mode,

;     Instruction fetch or Data access, under a single Exception Vector

; ---------------------------------------------



ENTRY(mem_service)



	EXCEPTION_PROLOGUE



	lr  r0, [efa]

	mov r1, sp



	FAKE_RET_FROM_EXCPN



	bl  do_memory_error

	b   ret_from_exception

END(mem_service)



ENTRY(EV_Misaligned)



	EXCEPTION_PROLOGUE

arch/arc/kernel/entry-compact.S

+25 −4
Original line number Diff line number Diff line
@@ -142,16 +142,12 @@ int1_saved_reg: 
	.zero 4



/* Each Interrupt level needs its own scratch */

#ifdef CONFIG_ARC_COMPACT_IRQ_LEVELS



ARCFP_DATA int2_saved_reg

	.type   int2_saved_reg, @object

	.size   int2_saved_reg, 4

int2_saved_reg:

	.zero 4



#endif



; ---------------------------------------------

	.section .text, "ax",@progbits
@@ -215,6 +211,31 @@ END(handle_interrupt_level2) 


#endif



; ---------------------------------------------

; User Mode Memory Bus Error Interrupt Handler

; (Kernel mode memory errors handled via seperate exception vectors)

; ---------------------------------------------

ENTRY(mem_service)



	INTERRUPT_PROLOGUE 2



	mov r0, ilink2

	mov r1, sp



	; User process needs to be killed with SIGBUS, but first need to get

	; out of the L2 interrupt context (drop to pure kernel mode) and jump

	; off to "C" code where SIGBUS in enqueued

	lr  r3, [status32]

	bclr r3, r3, STATUS_A2_BIT

	or  r3, r3, (STATUS_E1_MASK|STATUS_E2_MASK)

	sr  r3, [status32_l2]

	mov ilink2, 1f

	rtie

1:

	bl  do_memory_error

	b   ret_from_exception

END(mem_service)



; ---------------------------------------------

;  Level 1 ISR

; ---------------------------------------------

arch/arc/kernel/entry.S

+0 −17
Original line number Diff line number Diff line
@@ -92,23 +92,6 @@ ENTRY(instr_service) 
	b   ret_from_exception

END(instr_service)



; ---------------------------------------------

; Memory Error Exception Handler

; ---------------------------------------------



ENTRY(mem_service)



	EXCEPTION_PROLOGUE



	lr  r0, [efa]

	mov r1, sp



	FAKE_RET_FROM_EXCPN



	bl  do_memory_error

	b   ret_from_exception

END(mem_service)



; ---------------------------------------------

; Machine Check Exception Handler

; ---------------------------------------------

CRA Git | Maintained and supported by SUSTech CRA and CCSE