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

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

Pull ARC fixes from Vineet Gupta:

 - Assorted fixes

* tag 'arc-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: remove redundant READ_ONCE() in cmpxchg loop
  ARC: atomic: cleanup atomic-llsc definitions
  arc: drop definitions of pgd_index() and pgd_offset{, _k}() entirely
  ARC: dts: align SPI NOR node name with dtschema
  ARC: Remove a redundant memset()
  ARC: fix typos in comments
  ARC: entry: fix syscall_trace_exit argument
parents 6fc2586d c6ed4d84

arch/arc/boot/dts/hsdk.dts

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,7 @@ 
			cs-gpios = <&creg_gpio 0 GPIO_ACTIVE_LOW>,

				   <&creg_gpio 1 GPIO_ACTIVE_LOW>;



			spi-flash@0 {

			flash@0 {

				compatible = "sst26wf016b", "jedec,spi-nor";

				reg = <0>;

				#address-cells = <1>;

arch/arc/include/asm/atomic-llsc.h

+16 −16
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 


#define arch_atomic_set(v, i) WRITE_ONCE(((v)->counter), (i))



#define ATOMIC_OP(op, c_op, asm_op)					\

#define ATOMIC_OP(op, asm_op)					\

static inline void arch_atomic_##op(int i, atomic_t *v)			\

{									\

	unsigned int val;						\
@@ -21,7 +21,7 @@ static inline void arch_atomic_##op(int i, atomic_t *v) \ 
	: "cc");							\

}									\



#define ATOMIC_OP_RETURN(op, c_op, asm_op)				\

#define ATOMIC_OP_RETURN(op, asm_op)				\

static inline int arch_atomic_##op##_return_relaxed(int i, atomic_t *v)	\

{									\

	unsigned int val;						\
@@ -42,7 +42,7 @@ static inline int arch_atomic_##op##_return_relaxed(int i, atomic_t *v) \ 
#define arch_atomic_add_return_relaxed		arch_atomic_add_return_relaxed

#define arch_atomic_sub_return_relaxed		arch_atomic_sub_return_relaxed



#define ATOMIC_FETCH_OP(op, c_op, asm_op)				\

#define ATOMIC_FETCH_OP(op, asm_op)				\

static inline int arch_atomic_fetch_##op##_relaxed(int i, atomic_t *v)	\

{									\

	unsigned int val, orig;						\
@@ -69,23 +69,23 @@ static inline int arch_atomic_fetch_##op##_relaxed(int i, atomic_t *v) \ 
#define arch_atomic_fetch_or_relaxed		arch_atomic_fetch_or_relaxed

#define arch_atomic_fetch_xor_relaxed		arch_atomic_fetch_xor_relaxed



#define ATOMIC_OPS(op, c_op, asm_op)					\

	ATOMIC_OP(op, c_op, asm_op)					\

	ATOMIC_OP_RETURN(op, c_op, asm_op)				\

	ATOMIC_FETCH_OP(op, c_op, asm_op)

#define ATOMIC_OPS(op, asm_op)					\

	ATOMIC_OP(op, asm_op)					\

	ATOMIC_OP_RETURN(op, asm_op)				\

	ATOMIC_FETCH_OP(op, asm_op)



ATOMIC_OPS(add, +=, add)

ATOMIC_OPS(sub, -=, sub)

ATOMIC_OPS(add, add)

ATOMIC_OPS(sub, sub)



#undef ATOMIC_OPS

#define ATOMIC_OPS(op, c_op, asm_op)					\

	ATOMIC_OP(op, c_op, asm_op)					\

	ATOMIC_FETCH_OP(op, c_op, asm_op)

#define ATOMIC_OPS(op, asm_op)					\

	ATOMIC_OP(op, asm_op)					\

	ATOMIC_FETCH_OP(op, asm_op)



ATOMIC_OPS(and, &=, and)

ATOMIC_OPS(andnot, &= ~, bic)

ATOMIC_OPS(or, |=, or)

ATOMIC_OPS(xor, ^=, xor)

ATOMIC_OPS(and, and)

ATOMIC_OPS(andnot, bic)

ATOMIC_OPS(or, or)

ATOMIC_OPS(xor, xor)



#define arch_atomic_andnot		arch_atomic_andnot

arch/arc/include/asm/pgtable-levels.h

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ 
/*

 * 1st level paging: pgd

 */

#define pgd_index(addr)		((addr) >> PGDIR_SHIFT)

#define pgd_offset(mm, addr)	(((mm)->pgd) + pgd_index(addr))

#define pgd_offset_k(addr)	pgd_offset(&init_mm, addr)

#define pgd_ERROR(e) \

	pr_crit("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))

arch/arc/kernel/disasm.c

+1 −2
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ void __kprobes disasm_instr(unsigned long addr, struct disasm_state *state, 
	case op_SP:	/* LD_S|LDB_S b,[sp,u7], ST_S|STB_S b,[sp,u7] */

		/* note: we are ignoring possibility of:

		 * ADD_S, SUB_S, PUSH_S, POP_S as these should not

		 * cause unaliged exception anyway */

		 * cause unaligned exception anyway */

		state->write = BITS(state->words[0], 6, 6);

		state->zz = BITS(state->words[0], 5, 5);

		if (state->zz)
@@ -503,7 +503,6 @@ int __kprobes disasm_next_pc(unsigned long pc, struct pt_regs *regs, 
{

	struct disasm_state instr;



	memset(&instr, 0, sizeof(struct disasm_state));

	disasm_instr(pc, &instr, 0, regs, cregs);



	*next_pc = pc + instr.instr_len;

arch/arc/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -196,6 +196,7 @@ tracesys_exit: 
	st  r0, [sp, PT_r0]     ; sys call return value in pt_regs



	;POST Sys Call Ptrace Hook

	mov r0, sp		; pt_regs needed

	bl  @syscall_trace_exit

	b   ret_from_exception ; NOT ret_from_system_call at is saves r0 which

	; we'd done before calling post hook above