Commit 92fab77b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS updates from Paul Burton:

 - A set of memblock initialization improvements thanks to Serge Semin,
   tidying up after our conversion from bootmem to memblock back in
   v4.20.

 - Our eBPF JIT the previously supported only MIPS64r2 through MIPS64r5
   is improved to also support MIPS64r6. Support for MIPS32 systems is
   introduced, with the caveat that it only works for programs that
   don't use 64 bit registers or operations - those will bail out & need
   to be interpreted.

 - Improvements to the allocation & configuration of our exception
   vector that should fix issues seen on some platforms using recent
   versions of U-Boot.

 - Some minor improvements to code generated for jump labels, along with
   enabling them by default for generic kernels.

* tag 'mips_5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (27 commits)
  mips: Manually call fdt_init_reserved_mem() method
  mips: Make sure dt memory regions are valid
  mips: Perform early low memory test
  mips: Dump memblock regions for debugging
  mips: Add reserve-nomap memory type support
  mips: Use memblock to reserve the __nosave memory range
  mips: Discard post-CMA-init foreach loop
  mips: Reserve memory for the kernel image resources
  MIPS: Remove duplicate EBase configuration
  MIPS: Sync icache for whole exception vector
  MIPS: Always allocate exception vector for MIPSr2+
  MIPS: Use memblock_phys_alloc() for exception vector
  mips: Combine memblock init and memory reservation loops
  mips: Discard rudiments from bootmem_init
  mips: Make sure kernel .bss exists in boot mem pool
  mips: vdso: drop unnecessary cc-ldoption
  Revert "MIPS: ralink: fix cpu clock of mt7621 and add dt clk devices"
  MIPS: generic: Enable CONFIG_JUMP_LABEL
  MIPS: jump_label: Use compact branches for >= r6
  MIPS: jump_label: Remove redundant nops
  ...
parents ef75bd71 3751cbda

arch/mips/Kconfig

+31 −33
Original line number Diff line number Diff line
@@ -44,8 +44,7 @@ config MIPS 
	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARCH_TRANSPARENT_HUGEPAGE if CPU_SUPPORTS_HUGEPAGES && 64BIT

	select HAVE_CBPF_JIT if (!64BIT && !CPU_MICROMIPS)

	select HAVE_EBPF_JIT if (64BIT && !CPU_MICROMIPS)

	select HAVE_EBPF_JIT if (!CPU_MICROMIPS)

	select HAVE_CONTEXT_TRACKING

	select HAVE_COPY_THREAD_TLS

	select HAVE_C_RECORDMCOUNT
@@ -2474,7 +2473,6 @@ config SB1_PASS_2_1_WORKAROUNDS 
	depends on CPU_SB1 && CPU_SB1_PASS_2

	default y





choice

	prompt "SmartMIPS or microMIPS ASE support"

arch/mips/configs/generic_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_MIPS_CPS=y 
CONFIG_HIGHMEM=y

CONFIG_NR_CPUS=16

CONFIG_MIPS_O32_FP64_SUPPORT=y

CONFIG_JUMP_LABEL=y

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_TRIM_UNUSED_KSYMS=y

arch/mips/include/asm/bootinfo.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ extern unsigned long mips_machtype; 
#define BOOT_MEM_ROM_DATA	2

#define BOOT_MEM_RESERVED	3

#define BOOT_MEM_INIT_RAM	4

#define BOOT_MEM_NOMAP		5



/*

 * A memory map that's built upon what was determined

arch/mips/include/asm/jump_label.h

+10 −5
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#ifndef __ASSEMBLY__



#include <linux/types.h>

#include <asm/isa-rev.h>



#define JUMP_LABEL_NOP_SIZE 4
@@ -22,14 +23,19 @@ 


#ifdef CONFIG_CPU_MICROMIPS

# define B_INSN "b32"

# define J_INSN "j32"

#elif MIPS_ISA_REV >= 6

# define B_INSN "bc"

# define J_INSN "bc"

#else

# define B_INSN "b"

# define J_INSN "j"

#endif



static __always_inline bool arch_static_branch(struct static_key *key, bool branch)

{

	asm_volatile_goto("1:\t" B_INSN " 2f\n\t"

		"2:\tnop\n\t"

		"2:\t.insn\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		WORD_INSN " 1b, %l[l_yes], %0\n\t"

		".popsection\n\t"
@@ -42,8 +48,7 @@ l_yes: 


static __always_inline bool arch_static_branch_jump(struct static_key *key, bool branch)

{

	asm_volatile_goto("1:\tj %l[l_yes]\n\t"

		"nop\n\t"

	asm_volatile_goto("1:\t" J_INSN " %l[l_yes]\n\t"

		".pushsection __jump_table,  \"aw\"\n\t"

		WORD_INSN " 1b, %l[l_yes], %0\n\t"

		".popsection\n\t"

arch/mips/include/asm/uasm.h

+8 −0
Original line number Diff line number Diff line
@@ -86,14 +86,18 @@ Ip_u2u1(_ctcmsa); 
Ip_u2u1s3(_daddiu);

Ip_u3u1u2(_daddu);

Ip_u1u2(_ddivu);

Ip_u3u1u2(_ddivu_r6);

Ip_u1(_di);

Ip_u2u1msbu3(_dins);

Ip_u2u1msbu3(_dinsm);

Ip_u2u1msbu3(_dinsu);

Ip_u1u2(_divu);

Ip_u3u1u2(_divu_r6);

Ip_u1u2u3(_dmfc0);

Ip_u3u1u2(_dmodu);

Ip_u1u2u3(_dmtc0);

Ip_u1u2(_dmultu);

Ip_u3u1u2(_dmulu);

Ip_u2u1u3(_drotr);

Ip_u2u1u3(_drotr32);

Ip_u2u1(_dsbh);
@@ -131,6 +135,7 @@ Ip_u1u2u3(_mfc0); 
Ip_u1u2u3(_mfhc0);

Ip_u1(_mfhi);

Ip_u1(_mflo);

Ip_u3u1u2(_modu);

Ip_u3u1u2(_movn);

Ip_u3u1u2(_movz);

Ip_u1u2u3(_mtc0);
@@ -139,6 +144,7 @@ Ip_u1(_mthi); 
Ip_u1(_mtlo);

Ip_u3u1u2(_mul);

Ip_u1u2(_multu);

Ip_u3u1u2(_mulu);

Ip_u3u1u2(_nor);

Ip_u3u1u2(_or);

Ip_u2u1u3(_ori);
@@ -149,6 +155,8 @@ Ip_u2s3u1(_sb); 
Ip_u2s3u1(_sc);

Ip_u2s3u1(_scd);

Ip_u2s3u1(_sd);

Ip_u3u1u2(_seleqz);

Ip_u3u1u2(_selnez);

Ip_u2s3u1(_sh);

Ip_u2u1u3(_sll);

Ip_u3u2u1(_sllv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE