From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jun 2020 20:32:21 +0000 (-0700)
Subject: Merge tag 'mips_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
X-Git-Tag: v5.15~3731
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8226f11318bd03ae0dbf028f7c433071cf4927f4;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'mips_5.8' of git://git./linux/kernel/git/mips/linux

Pull MIPS updates from Thomas Bogendoerfer:

 - added support for MIPSr5 and P5600 cores

 - converted Loongson PCI driver into a PCI host driver using the
   generic PCI framework

 - added emulation of CPUCFG command for Loogonson64 cpus

 - removed of LASAT, PMC MSP71xx and NEC MARKEINS/EMMA

 - ioremap cleanup

 - fix for a race between two threads faulting the same page

 - various cleanups and fixes

* tag 'mips_5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (143 commits)
  MIPS: ralink: drop ralink_clk_init for mt7621
  MIPS: ralink: bootrom: mark a function as __init to save some memory
  MIPS: Loongson64: Reorder CPUCFG model match arms
  MIPS: Expose Loongson CPUCFG availability via HWCAP
  MIPS: Loongson64: Guard against future cores without CPUCFG
  MIPS: Fix build warning about "PTR_STR" redefinition
  MIPS: Loongson64: Remove not used pci.c
  MIPS: Loongson64: Define PCI_IOBASE
  MIPS: CPU_LOONGSON2EF need software to maintain cache consistency
  MIPS: DTS: Fix build errors used with various configs
  MIPS: Loongson64: select NO_EXCEPT_FILL
  MIPS: Fix IRQ tracing when call handle_fpe() and handle_msa_fpe()
  MIPS: mm: add page valid judgement in function pte_modify
  mm/memory.c: Add memory read privilege on page fault handling
  mm/memory.c: Update local TLB if PTE entry exists
  MIPS: Do not flush tlb page when updating PTE entry
  MIPS: ingenic: Default to a generic board
  MIPS: ingenic: Add support for GCW Zero prototype
  MIPS: ingenic: DTS: Add memory info of GCW Zero
  MIPS: Loongson64: Switch to generic PCI driver
  ...
---

8226f11318bd03ae0dbf028f7c433071cf4927f4
diff --cc arch/mips/include/asm/vermagic.h
index 24dc3d3,0000000..4d2dae0
mode 100644,000000..100644
--- a/arch/mips/include/asm/vermagic.h
+++ b/arch/mips/include/asm/vermagic.h
@@@ -1,66 -1,0 +1,72 @@@
 +/* SPDX-License-Identifier: GPL-2.0 */
 +#ifndef _ASM_VERMAGIC_H
 +#define _ASM_VERMAGIC_H
 +
 +#ifdef CONFIG_CPU_BMIPS
 +#define MODULE_PROC_FAMILY "BMIPS "
 +#elif defined CONFIG_CPU_MIPS32_R1
 +#define MODULE_PROC_FAMILY "MIPS32_R1 "
 +#elif defined CONFIG_CPU_MIPS32_R2
 +#define MODULE_PROC_FAMILY "MIPS32_R2 "
++#elif defined CONFIG_CPU_MIPS32_R5
++#define MODULE_PROC_FAMILY "MIPS32_R5 "
 +#elif defined CONFIG_CPU_MIPS32_R6
 +#define MODULE_PROC_FAMILY "MIPS32_R6 "
 +#elif defined CONFIG_CPU_MIPS64_R1
 +#define MODULE_PROC_FAMILY "MIPS64_R1 "
 +#elif defined CONFIG_CPU_MIPS64_R2
 +#define MODULE_PROC_FAMILY "MIPS64_R2 "
++#elif defined CONFIG_CPU_MIPS64_R5
++#define MODULE_PROC_FAMILY "MIPS64_R5 "
 +#elif defined CONFIG_CPU_MIPS64_R6
 +#define MODULE_PROC_FAMILY "MIPS64_R6 "
 +#elif defined CONFIG_CPU_R3000
 +#define MODULE_PROC_FAMILY "R3000 "
 +#elif defined CONFIG_CPU_TX39XX
 +#define MODULE_PROC_FAMILY "TX39XX "
 +#elif defined CONFIG_CPU_VR41XX
 +#define MODULE_PROC_FAMILY "VR41XX "
 +#elif defined CONFIG_CPU_R4X00
 +#define MODULE_PROC_FAMILY "R4X00 "
 +#elif defined CONFIG_CPU_TX49XX
 +#define MODULE_PROC_FAMILY "TX49XX "
 +#elif defined CONFIG_CPU_R5000
 +#define MODULE_PROC_FAMILY "R5000 "
 +#elif defined CONFIG_CPU_R5500
 +#define MODULE_PROC_FAMILY "R5500 "
 +#elif defined CONFIG_CPU_NEVADA
 +#define MODULE_PROC_FAMILY "NEVADA "
 +#elif defined CONFIG_CPU_R10000
 +#define MODULE_PROC_FAMILY "R10000 "
 +#elif defined CONFIG_CPU_RM7000
 +#define MODULE_PROC_FAMILY "RM7000 "
 +#elif defined CONFIG_CPU_SB1
 +#define MODULE_PROC_FAMILY "SB1 "
 +#elif defined CONFIG_CPU_LOONGSON32
 +#define MODULE_PROC_FAMILY "LOONGSON32 "
 +#elif defined CONFIG_CPU_LOONGSON2EF
 +#define MODULE_PROC_FAMILY "LOONGSON2EF "
 +#elif defined CONFIG_CPU_LOONGSON64
 +#define MODULE_PROC_FAMILY "LOONGSON64 "
 +#elif defined CONFIG_CPU_CAVIUM_OCTEON
 +#define MODULE_PROC_FAMILY "OCTEON "
++#elif defined CONFIG_CPU_P5600
++#define MODULE_PROC_FAMILY "P5600 "
 +#elif defined CONFIG_CPU_XLR
 +#define MODULE_PROC_FAMILY "XLR "
 +#elif defined CONFIG_CPU_XLP
 +#define MODULE_PROC_FAMILY "XLP "
 +#else
 +#error MODULE_PROC_FAMILY undefined for your processor configuration
 +#endif
 +
 +#ifdef CONFIG_32BIT
 +#define MODULE_KERNEL_TYPE "32BIT "
 +#elif defined CONFIG_64BIT
 +#define MODULE_KERNEL_TYPE "64BIT "
 +#endif
 +
 +#define MODULE_ARCH_VERMAGIC \
 +	MODULE_PROC_FAMILY MODULE_KERNEL_TYPE
 +
 +#endif /* _ASM_VERMAGIC_H */