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

Merge tag 'loongarch-fixes-6.13-1' of... 

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

Pull LoongArch fixes from Huacai Chen:
 "Fix bugs about EFI screen info, hugetlb pte clear and Lockdep-RCU
  splat in KVM, plus some trival cleanups"

* tag 'loongarch-fixes-6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: KVM: Protect kvm_io_bus_{read,write}() with SRCU
  LoongArch: KVM: Protect kvm_check_requests() with SRCU
  LoongArch: BPF: Adjust the parameter of emit_jirl()
  LoongArch: Add architecture specific huge_pte_clear()
  LoongArch/irq: Use seq_put_decimal_ull_width() for decimal values
  LoongArch: Fix reserving screen info memory for above-4G firmware
parents 0769a8f6 7f715078

arch/loongarch/include/asm/hugetlb.h

+10 −0
Original line number Diff line number Diff line
@@ -24,6 +24,16 @@ static inline int prepare_hugepage_range(struct file *file, 
	return 0;

}



#define __HAVE_ARCH_HUGE_PTE_CLEAR

static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,

				  pte_t *ptep, unsigned long sz)

{

	pte_t clear;



	pte_val(clear) = (unsigned long)invalid_pte_table;

	set_pte_at(mm, addr, ptep, clear);

}



#define __HAVE_ARCH_HUGE_PTEP_GET_AND_CLEAR

static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,

					    unsigned long addr, pte_t *ptep)

arch/loongarch/include/asm/inst.h

+11 −1
Original line number Diff line number Diff line
@@ -683,7 +683,17 @@ DEF_EMIT_REG2I16_FORMAT(blt, blt_op) 
DEF_EMIT_REG2I16_FORMAT(bge, bge_op)

DEF_EMIT_REG2I16_FORMAT(bltu, bltu_op)

DEF_EMIT_REG2I16_FORMAT(bgeu, bgeu_op)

DEF_EMIT_REG2I16_FORMAT(jirl, jirl_op)



static inline void emit_jirl(union loongarch_instruction *insn,

			     enum loongarch_gpr rd,

			     enum loongarch_gpr rj,

			     int offset)

{

	insn->reg2i16_format.opcode = jirl_op;

	insn->reg2i16_format.immediate = offset;

	insn->reg2i16_format.rd = rd;

	insn->reg2i16_format.rj = rj;

}



#define DEF_EMIT_REG2BSTRD_FORMAT(NAME, OP)				\

static inline void emit_##NAME(union loongarch_instruction *insn,	\

arch/loongarch/kernel/efi.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ static void __init init_screen_info(void) 
	memset(si, 0, sizeof(*si));

	early_memunmap(si, sizeof(*si));



	memblock_reserve(screen_info.lfb_base, screen_info.lfb_size);

	memblock_reserve(__screen_info_lfb_base(&screen_info), screen_info.lfb_size);

}



void __init efi_init(void)

arch/loongarch/kernel/inst.c

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ u32 larch_insn_gen_jirl(enum loongarch_gpr rd, enum loongarch_gpr rj, int imm) 
		return INSN_BREAK;

	}



	emit_jirl(&insn, rj, rd, imm >> 2);

	emit_jirl(&insn, rd, rj, imm >> 2);



	return insn.word;

}

arch/loongarch/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void show_ipi_list(struct seq_file *p, int prec) 
	for (i = 0; i < NR_IPI; i++) {

		seq_printf(p, "%*s%u:%s", prec - 1, "IPI", i, prec >= 4 ? " " : "");

		for_each_online_cpu(cpu)

			seq_printf(p, "%10u ", per_cpu(irq_stat, cpu).ipi_irqs[i]);

			seq_put_decimal_ull_width(p, " ", per_cpu(irq_stat, cpu).ipi_irqs[i], 10);

		seq_printf(p, " LoongArch  %d  %s\n", i + 1, ipi_types[i]);

	}

}