Commit 9c39198a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips-fixes_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux 

Pull MIPS fixes from Thomas Bogendoerfer:

 - fixes for boot breakage because of misaligned FDTs

 - fix for overwritten exception handlers

 - enable MIPS optimized crypto for all MIPS CPUs to improve wireguard
   performance

* tag 'mips-fixes_5.12_1' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
  MIPS: kernel: Reserve exception base early to prevent corruption
  MIPS: vmlinux.lds.S: align raw appended dtb to 8 bytes
  crypto: mips/poly1305 - enable for all MIPS processors
  MIPS: boot/compressed: Copy DTB to aligned address
parents 987a0874 bd67b711

arch/mips/boot/compressed/decompress.c

+8 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include <asm/addrspace.h>

#include <asm/unaligned.h>

#include <asm-generic/vmlinux.lds.h>



/*

 * These two variables specify the free mem region
@@ -120,6 +121,13 @@ void decompress_kernel(unsigned long boot_heap_start) 
		/* last four bytes is always image size in little endian */

		image_size = get_unaligned_le32((void *)&__image_end - 4);



		/* The device tree's address must be properly aligned  */

		image_size = ALIGN(image_size, STRUCT_ALIGNMENT);



		puts("Copy device tree to address  ");

		puthex(VMLINUX_LOAD_ADDRESS_ULL + image_size);

		puts("\n");



		/* copy dtb to where the booted kernel will expect it */

		memcpy((void *)VMLINUX_LOAD_ADDRESS_ULL + image_size,

		       __appended_dtb, dtb_size);

arch/mips/crypto/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ AFLAGS_chacha-core.o += -O2 # needed to fill branch delay slots 
obj-$(CONFIG_CRYPTO_POLY1305_MIPS) += poly1305-mips.o

poly1305-mips-y := poly1305-core.o poly1305-glue.o



perlasm-flavour-$(CONFIG_CPU_MIPS32) := o32

perlasm-flavour-$(CONFIG_CPU_MIPS64) := 64

perlasm-flavour-$(CONFIG_32BIT) := o32

perlasm-flavour-$(CONFIG_64BIT) := 64



quiet_cmd_perlasm = PERLASM $@

      cmd_perlasm = $(PERL) $(<) $(perlasm-flavour-y) $(@)

arch/mips/include/asm/traps.h

+3 −0
Original line number Diff line number Diff line
@@ -24,8 +24,11 @@ extern void (*board_ebase_setup)(void); 
extern void (*board_cache_error_setup)(void);



extern int register_nmi_notifier(struct notifier_block *nb);

extern void reserve_exception_space(phys_addr_t addr, unsigned long size);

extern char except_vec_nmi[];



#define VECTORSPACING 0x100	/* for EI/VI mode */



#define nmi_notifier(fn, pri)						\

({									\

	static struct notifier_block fn##_nb = {			\

arch/mips/kernel/cpu-probe.c

+6 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <asm/elf.h>

#include <asm/pgtable-bits.h>

#include <asm/spram.h>

#include <asm/traps.h>

#include <linux/uaccess.h>



#include "fpu-probe.h"
@@ -1628,6 +1629,7 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu) 
		c->cputype = CPU_BMIPS3300;

		__cpu_name[cpu] = "Broadcom BMIPS3300";

		set_elf_platform(cpu, "bmips3300");

		reserve_exception_space(0x400, VECTORSPACING * 64);

		break;

	case PRID_IMP_BMIPS43XX: {

		int rev = c->processor_id & PRID_REV_MASK;
@@ -1638,6 +1640,7 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu) 
			__cpu_name[cpu] = "Broadcom BMIPS4380";

			set_elf_platform(cpu, "bmips4380");

			c->options |= MIPS_CPU_RIXI;

			reserve_exception_space(0x400, VECTORSPACING * 64);

		} else {

			c->cputype = CPU_BMIPS4350;

			__cpu_name[cpu] = "Broadcom BMIPS4350";
@@ -1654,6 +1657,7 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu) 
			__cpu_name[cpu] = "Broadcom BMIPS5000";

		set_elf_platform(cpu, "bmips5000");

		c->options |= MIPS_CPU_ULRI | MIPS_CPU_RIXI;

		reserve_exception_space(0x1000, VECTORSPACING * 64);

		break;

	}

}
@@ -2133,6 +2137,8 @@ void cpu_probe(void) 
	if (cpu == 0)

		__ua_limit = ~((1ull << cpu_vmbits) - 1);

#endif



	reserve_exception_space(0, 0x1000);

}



void cpu_report(void)

arch/mips/kernel/cpu-r3k-probe.c

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <asm/fpu.h>

#include <asm/mipsregs.h>

#include <asm/elf.h>

#include <asm/traps.h>



#include "fpu-probe.h"
@@ -158,6 +159,8 @@ void cpu_probe(void) 
		cpu_set_fpu_opts(c);

	else

		cpu_set_nofpu_opts(c);



	reserve_exception_space(0, 0x400);

}



void cpu_report(void)