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

Merge tag 'loongarch-fixes-6.15-2' of... 

Merge tag 'loongarch-fixes-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch fixes from Huacai Chen:
 "Fix some bugs in kernel-fpu, cpu idle function, hibernation and
  uprobes"

* tag 'loongarch-fixes-6.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: uprobes: Remove redundant code about resume_era
  LoongArch: uprobes: Remove user_{en,dis}able_single_step()
  LoongArch: Save and restore CSR.CNTC for hibernation
  LoongArch: Move __arch_cpu_idle() to .cpuidle.text section
  LoongArch: Fix MAX_REG_OFFSET calculation
  LoongArch: Prevent cond_resched() occurring within kernel-fpu
parents a1317e1c 12614f79

arch/loongarch/include/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static inline void instruction_pointer_set(struct pt_regs *regs, unsigned long v 


/* Query offset/name of register from its name/offset */

extern int regs_query_register_offset(const char *name);

#define MAX_REG_OFFSET (offsetof(struct pt_regs, __last))

#define MAX_REG_OFFSET (offsetof(struct pt_regs, __last) - sizeof(unsigned long))



/**

 * regs_get_register() - get register value from its offset

arch/loongarch/include/asm/uprobes.h

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ typedef u32 uprobe_opcode_t; 
#define UPROBE_XOLBP_INSN	__emit_break(BRK_UPROBE_XOLBP)



struct arch_uprobe {

	unsigned long	resume_era;

	u32	insn[2];

	u32	ixol[2];

	bool	simulate;

arch/loongarch/kernel/genex.S

+5 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <asm/stackframe.h>

#include <asm/thread_info.h>



	.section .cpuidle.text, "ax"

	.align	5

SYM_FUNC_START(__arch_cpu_idle)

	/* start of idle interrupt region */
@@ -31,14 +32,16 @@ SYM_FUNC_START(__arch_cpu_idle) 
	 */

	idle	0

	/* end of idle interrupt region */

1:	jr	ra

idle_exit:

	jr	ra

SYM_FUNC_END(__arch_cpu_idle)

	.previous



SYM_CODE_START(handle_vint)

	UNWIND_HINT_UNDEFINED

	BACKUP_T0T1

	SAVE_ALL

	la_abs	t1, 1b

	la_abs	t1, idle_exit

	LONG_L	t0, sp, PT_ERA

	/* 3 instructions idle interrupt region */

	ori	t0, t0, 0b1100

arch/loongarch/kernel/kfpu.c

+20 −2
Original line number Diff line number Diff line
@@ -18,11 +18,28 @@ static unsigned int euen_mask = CSR_EUEN_FPEN; 
static DEFINE_PER_CPU(bool, in_kernel_fpu);

static DEFINE_PER_CPU(unsigned int, euen_current);



static inline void fpregs_lock(void)

{

	if (IS_ENABLED(CONFIG_PREEMPT_RT))

		preempt_disable();

	else

		local_bh_disable();

}



static inline void fpregs_unlock(void)

{

	if (IS_ENABLED(CONFIG_PREEMPT_RT))

		preempt_enable();

	else

		local_bh_enable();

}



void kernel_fpu_begin(void)

{

	unsigned int *euen_curr;



	preempt_disable();

	if (!irqs_disabled())

		fpregs_lock();



	WARN_ON(this_cpu_read(in_kernel_fpu));
@@ -73,7 +90,8 @@ void kernel_fpu_end(void) 


	this_cpu_write(in_kernel_fpu, false);



	preempt_enable();

	if (!irqs_disabled())

		fpregs_unlock();

}

EXPORT_SYMBOL_GPL(kernel_fpu_end);

arch/loongarch/kernel/time.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static unsigned long __init get_loops_per_jiffy(void) 
	return lpj;

}



static long init_offset __nosavedata;

static long init_offset;



void save_counter(void)

{