Commit 93397d3a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull LoongArch fixes from Huacai Chen:
 "Fix lockdep, fix a boot failure, fix some build warnings, fix document
  links, and some cleanups"

* tag 'loongarch-fixes-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  docs/zh_CN/LoongArch: Update the links of ABI
  docs/LoongArch: Update the links of ABI
  LoongArch: Don't inline kasan_mem_to_shadow()/kasan_shadow_to_mem()
  kasan: Cleanup the __HAVE_ARCH_SHADOW_MAP usage
  LoongArch: Set all reserved memblocks on Node#0 at initialization
  LoongArch: Remove dead code in relocate_new_kernel
  LoongArch: Use _UL() and _ULL()
  LoongArch: Fix some build warnings with W=1
  LoongArch: Fix lockdep static memory detection
parents 2e3d3911 e74a6b7f

Documentation/arch/loongarch/introduction.rst

+2 −2
Original line number Diff line number Diff line
@@ -381,9 +381,9 @@ Documentation of LoongArch ISA: 


Documentation of LoongArch ELF psABI:



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-CN.pdf (in Chinese)

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-CN.pdf (in Chinese)



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-EN.pdf (in English)

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-EN.pdf (in English)



Linux kernel repository of Loongson and LoongArch:

Documentation/translations/zh_CN/arch/loongarch/introduction.rst

+2 −2
Original line number Diff line number Diff line
@@ -344,9 +344,9 @@ LoongArch指令集架构的文档： 


LoongArch的ELF psABI文档：



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-CN.pdf （中文版）

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-CN.pdf （中文版）



  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.00-EN.pdf （英文版）

  https://github.com/loongson/LoongArch-Documentation/releases/latest/download/LoongArch-ELF-ABI-v2.01-EN.pdf （英文版）



Loongson与LoongArch的Linux内核源码仓库：

arch/loongarch/include/asm/addrspace.h

+6 −6
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 */

#ifndef __ASSEMBLY__

#ifndef PHYS_OFFSET

#define PHYS_OFFSET	_AC(0, UL)

#define PHYS_OFFSET	_UL(0)

#endif

extern unsigned long vm_map_base;

#endif /* __ASSEMBLY__ */
@@ -43,7 +43,7 @@ extern unsigned long vm_map_base; 
 * Memory above this physical address will be considered highmem.

 */

#ifndef HIGHMEM_START

#define HIGHMEM_START		(_AC(1, UL) << _AC(DMW_PABITS, UL))

#define HIGHMEM_START		(_UL(1) << _UL(DMW_PABITS))

#endif



#define TO_PHYS(x)		(		((x) & TO_PHYS_MASK))
@@ -65,16 +65,16 @@ extern unsigned long vm_map_base; 
#define _ATYPE_

#define _ATYPE32_

#define _ATYPE64_

#define _CONST64_(x)	x

#else

#define _ATYPE_		__PTRDIFF_TYPE__

#define _ATYPE32_	int

#define _ATYPE64_	__s64

#endif



#ifdef CONFIG_64BIT

#define _CONST64_(x)	x ## UL

#define _CONST64_(x)	_UL(x)

#else

#define _CONST64_(x)	x ## ULL

#endif

#define _CONST64_(x)	_ULL(x)

#endif



/*

arch/loongarch/include/asm/exception.h

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */



#ifndef __ASM_EXCEPTION_H

#define __ASM_EXCEPTION_H



#include <asm/ptrace.h>

#include <linux/kprobes.h>



void show_registers(struct pt_regs *regs);



asmlinkage void cache_parity_error(void);

asmlinkage void noinstr do_ade(struct pt_regs *regs);

asmlinkage void noinstr do_ale(struct pt_regs *regs);

asmlinkage void noinstr do_bce(struct pt_regs *regs);

asmlinkage void noinstr do_bp(struct pt_regs *regs);

asmlinkage void noinstr do_ri(struct pt_regs *regs);

asmlinkage void noinstr do_fpu(struct pt_regs *regs);

asmlinkage void noinstr do_fpe(struct pt_regs *regs, unsigned long fcsr);

asmlinkage void noinstr do_lsx(struct pt_regs *regs);

asmlinkage void noinstr do_lasx(struct pt_regs *regs);

asmlinkage void noinstr do_lbt(struct pt_regs *regs);

asmlinkage void noinstr do_watch(struct pt_regs *regs);

asmlinkage void noinstr do_syscall(struct pt_regs *regs);

asmlinkage void noinstr do_reserved(struct pt_regs *regs);

asmlinkage void noinstr do_vint(struct pt_regs *regs, unsigned long sp);

asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,

				unsigned long write, unsigned long address);



asmlinkage void handle_ade(void);

asmlinkage void handle_ale(void);

asmlinkage void handle_bce(void);

asmlinkage void handle_sys(void);

asmlinkage void handle_bp(void);

asmlinkage void handle_ri(void);

asmlinkage void handle_fpu(void);

asmlinkage void handle_fpe(void);

asmlinkage void handle_lsx(void);

asmlinkage void handle_lasx(void);

asmlinkage void handle_lbt(void);

asmlinkage void handle_watch(void);

asmlinkage void handle_reserved(void);

asmlinkage void handle_vint(void);

asmlinkage void noinstr handle_loongarch_irq(struct pt_regs *regs);



#endif	/* __ASM_EXCEPTION_H */

arch/loongarch/include/asm/kasan.h

+9 −50
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ 
#include <asm/io.h>

#include <asm/pgtable.h>



#define __HAVE_ARCH_SHADOW_MAP



#define KASAN_SHADOW_SCALE_SHIFT 3

#define KASAN_SHADOW_OFFSET	_AC(CONFIG_KASAN_SHADOW_OFFSET, UL)
@@ -62,61 +60,22 @@ 
extern bool kasan_early_stage;

extern unsigned char kasan_early_shadow_page[PAGE_SIZE];



#define kasan_mem_to_shadow kasan_mem_to_shadow

void *kasan_mem_to_shadow(const void *addr);



#define kasan_shadow_to_mem kasan_shadow_to_mem

const void *kasan_shadow_to_mem(const void *shadow_addr);



#define kasan_arch_is_ready kasan_arch_is_ready

static __always_inline bool kasan_arch_is_ready(void)

{

	return !kasan_early_stage;

}



static inline void *kasan_mem_to_shadow(const void *addr)

#define addr_has_metadata addr_has_metadata

static __always_inline bool addr_has_metadata(const void *addr)

{

	if (!kasan_arch_is_ready()) {

		return (void *)(kasan_early_shadow_page);

	} else {

		unsigned long maddr = (unsigned long)addr;

		unsigned long xrange = (maddr >> XRANGE_SHIFT) & 0xffff;

		unsigned long offset = 0;



		maddr &= XRANGE_SHADOW_MASK;

		switch (xrange) {

		case XKPRANGE_CC_SEG:

			offset = XKPRANGE_CC_SHADOW_OFFSET;

			break;

		case XKPRANGE_UC_SEG:

			offset = XKPRANGE_UC_SHADOW_OFFSET;

			break;

		case XKVRANGE_VC_SEG:

			offset = XKVRANGE_VC_SHADOW_OFFSET;

			break;

		default:

			WARN_ON(1);

			return NULL;

		}



		return (void *)((maddr >> KASAN_SHADOW_SCALE_SHIFT) + offset);

	}

}



static inline const void *kasan_shadow_to_mem(const void *shadow_addr)

{

	unsigned long addr = (unsigned long)shadow_addr;



	if (unlikely(addr > KASAN_SHADOW_END) ||

		unlikely(addr < KASAN_SHADOW_START)) {

		WARN_ON(1);

		return NULL;

	}



	if (addr >= XKVRANGE_VC_SHADOW_OFFSET)

		return (void *)(((addr - XKVRANGE_VC_SHADOW_OFFSET) << KASAN_SHADOW_SCALE_SHIFT) + XKVRANGE_VC_START);

	else if (addr >= XKPRANGE_UC_SHADOW_OFFSET)

		return (void *)(((addr - XKPRANGE_UC_SHADOW_OFFSET) << KASAN_SHADOW_SCALE_SHIFT) + XKPRANGE_UC_START);

	else if (addr >= XKPRANGE_CC_SHADOW_OFFSET)

		return (void *)(((addr - XKPRANGE_CC_SHADOW_OFFSET) << KASAN_SHADOW_SCALE_SHIFT) + XKPRANGE_CC_START);

	else {

		WARN_ON(1);

		return NULL;

	}

	return (kasan_mem_to_shadow((void *)addr) != NULL);

}



void kasan_init(void);