Commit 8312f41f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull MIPS updates from Thomas Bogendoerfer:

 - enable GCOV

 - rework setup of protection map

 - add support for more MSCC platforms

 - add sysfs boardinfo for Loongson64

 - enable KASLR for Loogson64

 - add reset controller for BCM63xx

 - cleanups and fixes

* tag 'mips_5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (70 commits)
  mips: fix Section mismatch in reference
  MAINTAINERS: Add linux-mips mailing list to JZ47xx entries
  MAINTAINERS: Remove JZ4780 DMA driver entry
  MAINTAINERS: chenhc@lemote.com -> chenhuacai@kernel.org
  MIPS: Octeon: irq: Alloc desc before configuring IRQ
  MIPS: mm: Add back define for PAGE_SHARED
  MIPS: Select ARCH_KEEP_MEMBLOCK if DEBUG_KERNEL to enable sysfs memblock debug
  mips: lib: uncached: fix non-standard usage of variable 'sp'
  MIPS: DTS: img: Fix schema warnings for pwm-leds
  MIPS: KASLR: Avoid endless loop in sync_icache if synci_step is zero
  MIPS: Move memblock_dump_all() to the end of setup_arch()
  MIPS: SMP-CPS: Add support for irq migration when CPU offline
  MIPS: OCTEON: Don't add kernel sections into memblock allocator
  MIPS: Don't round up kernel sections size for memblock_add()
  MIPS: Enable GCOV
  MIPS: configs: drop unused BACKLIGHT_GENERIC option
  MIPS: Loongson64: Fix up reserving kernel memory range
  MIPS: mm: Remove unused is_aligned_hugepage_range
  MIPS: No need to check CPU 0 in {loongson3,bmips,octeon}_cpu_disable()
  mips: cdmm: fix use-after-free in mips_cdmm_bus_discover
  ...
parents 66fc6a62 ad4fddef

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ Henk Vergonet <Henk.Vergonet@gmail.com> 
Henrik Kretzschmar <henne@nachtwindheim.de>

Henrik Rydberg <rydberg@bitmath.org>

Herbert Xu <herbert@gondor.apana.org.au>

Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>

Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>

Jacob Shin <Jacob.Shin@amd.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>

Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>

Documentation/ABI/testing/sysfs-firmware-lefi-boardinfo

0 → 100644
+35 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/lefi/boardinfo

Date:		October 2020

Contact:	Tiezhu Yang <yangtiezhu@loongson.cn>

Description:

		Get mainboard and BIOS info easily on the Loongson platform,

		this is useful to point out the current used mainboard type

		and BIOS version when there exists problems related with

		hardware or firmware.



		The related structures are already defined in the interface

		specification about firmware and kernel which are common

		requirement and specific for Loongson64, so only add a new

		boardinfo.c file in arch/mips/loongson64.



		For example:



		[loongson@linux ~]$ cat /sys/firmware/lefi/boardinfo

		Board Info

		Manufacturer            : LEMOTE

		Board Name              : LEMOTE-LS3A4000-7A1000-1w-V01-pc

		Family                  : LOONGSON3



		BIOS Info

		Vendor                  : Kunlun

		Version                 : Kunlun-A1901-V4.1.3-20200414093938

		ROM Size                : 4 KB

		Release Date            : 2020-04-14



		By the way, using dmidecode command can get the similar info if there

		exists SMBIOS in firmware, but the fact is that there is no SMBIOS on

		some machines, we can see nothing when execute dmidecode, like this:



		[root@linux loongson]# dmidecode

		# dmidecode 2.12

		# No SMBIOS nor DMI entry point found, sorry.

Documentation/devicetree/bindings/mips/mscc.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Boards with a SoC of the Microsemi MIPS family shall have the following 
properties:



Required properties:

- compatible: "mscc,ocelot"

- compatible: "mscc,ocelot", "mscc,luton", "mscc,serval" or "mscc,jr2"





* Other peripherals:

Documentation/devicetree/bindings/reset/brcm,bcm6345-reset.yaml

0 → 100644
+37 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: "http://devicetree.org/schemas/reset/brcm,bcm6345-reset.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"



title: BCM6345 reset controller



description: This document describes the BCM6345 reset controller.



maintainers:

  - Álvaro Fernández Rojas <noltari@gmail.com>



properties:

  compatible:

    const: brcm,bcm6345-reset



  reg:

    maxItems: 1



  "#reset-cells":

    const: 1



required:

  - compatible

  - reg

  - "#reset-cells"



additionalProperties: false



examples:

  - |

    reset-controller@10000010 {

      compatible = "brcm,bcm6345-reset";

      reg = <0x10000010 0x4>;

      #reset-cells = <1>;

    };

MAINTAINERS

+4 −7
Original line number Diff line number Diff line
@@ -8736,19 +8736,16 @@ F: include/uapi/rdma/ 
F:	samples/bpf/ibumad_kern.c

F:	samples/bpf/ibumad_user.c









INGENIC JZ4780 DMA Driver









M:	Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>









S:	Maintained









F:	drivers/dma/dma-jz4780.c

















INGENIC JZ4780 NAND DRIVER









M:	Harvey Hunt <harveyhuntnexus@gmail.com>









L:	linux-mtd@lists.infradead.org









L:	linux-mips@vger.kernel.org









S:	Maintained









F:	drivers/mtd/nand/raw/ingenic/

















INGENIC JZ47xx SoCs









M:	Paul Cercueil <paul@crapouillou.net>









L:	linux-mips@vger.kernel.org









S:	Maintained









F:	arch/mips/boot/dts/ingenic/









F:	arch/mips/generic/board-ingenic.c








@@ -9710,7 +9707,7 @@ F:	arch/arm64/kvm/







F:	include/kvm/arm_*

















KERNEL VIRTUAL MACHINE FOR MIPS (KVM/mips)









M:	Huacai Chen <chenhc@lemote.com>









M:	Huacai Chen <chenhuacai@kernel.org>









M:	Aleksandar Markovic <aleksandar.qemu.devel@gmail.com>









L:	linux-mips@vger.kernel.org









L:	kvm@vger.kernel.org








@@ -11852,7 +11849,7 @@ F:	drivers/*/*/*loongson2*







F:	drivers/*/*loongson2*

















MIPS/LOONGSON64 ARCHITECTURE









M:	Huacai Chen <chenhc@lemote.com>









M:	Huacai Chen <chenhuacai@kernel.org>









M:	Jiaxun Yang <jiaxun.yang@flygoat.com>









L:	linux-mips@vger.kernel.org









S:	Maintained








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE