Commit 85789536 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips 

Pull MIPS updates from James Hogan:
 "These are the main MIPS changes for 4.16.

  Rough overview:

   (1) Basic support for the Ingenic JZ4770 based GCW Zero open-source
       handheld video game console

   (2) Support for the Ranchu board (used by Android emulator)

   (3) Various cleanups and misc improvements

  More detailed summary:

  Fixes:
   - Fix generic platform's USB_*HCI_BIG_ENDIAN selects (4.9)
   - Fix vmlinuz default build when ZBOOT selected
   - Fix clean up of vmlinuz targets
   - Fix command line duplication (in preparation for Ingenic JZ4770)

  Miscellaneous:
   - Allow Processor ID reads to be to be optimised away by the compiler
     (improves performance when running in guest)
   - Push ARCH_MIGHT_HAVE_PC_SERIO/PARPORT down to platform level to
     disable on generic platform with Ranchu board support
   - Add helpers for assembler macro instructions for older assemblers
   - Use assembler macro instructions to support VZ, XPA & MSA
     operations on older assemblers, removing C wrapper duplication
   - Various improvements to VZ & XPA assembly wrappers
   - Add drivers/platform/mips/ to MIPS MAINTAINERS entry

  Minor cleanups:
   - Misc FPU emulation cleanups (removal of unnecessary include, moving
     macros to common header, checkpatch and sparse fixes)
   - Remove duplicate assignment of core in play_dead()
   - Remove duplication in watchpoint handling
   - Remove mips_dma_mapping_error() stub
   - Use NULL instead of 0 in prepare_ftrace_return()
   - Use proper kernel-doc Return keyword for
     __compute_return_epc_for_insn()
   - Remove duplicate semicolon in csum_fold()

  Platform support:

  Broadcom:
   - Enable ZBOOT on BCM47xx

  Generic platform:
   - Add Ranchu board support, used by Android emulator
   - Fix machine compatible string matching for Ranchu
   - Support GIC in EIC mode

  Ingenic platforms:
   - Add DT, defconfig and other support for JZ4770 SoC and GCW Zero
   - Support dynamnic machine types (i.e. JZ4740 / JZ4770 / JZ4780)
   - Add Ingenic JZ4770 CGU clocks
   - General Ingenic clk changes to prepare for JZ4770 SoC support
   - Use common command line handling code
   - Add DT vendor prefix to GCW (Game Consoles Worldwide)

  Loongson:
   - Add MAINTAINERS entry for Loongson2 and Loongson3 platforms
   - Drop 32-bit support for Loongson 2E/2F devices
   - Fix build failures due to multiple use of 'MEM_RESERVED'"

* tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (53 commits)
  MIPS: Malta: Sanitize mouse and keyboard configuration.
  MIPS: Update defconfigs after previous patch.
  MIPS: Push ARCH_MIGHT_HAVE_PC_SERIO down to platform level
  MIPS: Push ARCH_MIGHT_HAVE_PC_PARPORT down to platform level
  MIPS: SMP-CPS: Remove duplicate assignment of core in play_dead
  MIPS: Generic: Support GIC in EIC mode
  MIPS: generic: Fix Makefile alignment
  MIPS: generic: Fix ranchu_of_match[] termination
  MIPS: generic: Fix machine compatible matching
  MIPS: Loongson fix name confict - MEM_RESERVED
  MIPS: bcm47xx: enable ZBOOT support
  MIPS: Fix trailing semicolon
  MIPS: Watch: Avoid duplication of bits in mips_read_watch_registers
  MIPS: Watch: Avoid duplication of bits in mips_install_watch_registers.
  MIPS: MSA: Update helpers to use new asm macros
  MIPS: XPA: Standardise readx/writex accessors
  MIPS: XPA: Allow use of $0 (zero) to MTHC0
  MIPS: XPA: Use XPA instructions in assembly
  MIPS: VZ: Pass GC0 register names in $n format
  MIPS: VZ: Update helpers to use new asm macros
  ...
parents e03ab6c4 8f2256d8

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ focaltech FocalTech Systems Co.,Ltd 
friendlyarm	Guangzhou FriendlyARM Computer Tech Co., Ltd

fsl	Freescale Semiconductor

fujitsu	Fujitsu Ltd.

gcw Game Consoles Worldwide

ge	General Electric Company

geekbuying	GeekBuying

gef	GE Fanuc Intelligent Platforms Embedded Systems, Inc.

MAINTAINERS

+27 −0
Original line number Diff line number Diff line
@@ -9188,6 +9188,7 @@ S: Supported 
F:	Documentation/devicetree/bindings/mips/

F:	Documentation/mips/

F:	arch/mips/

F:	drivers/platform/mips/



MIPS BOSTON DEVELOPMENT BOARD

M:	Paul Burton <paul.burton@mips.com>
@@ -9215,6 +9216,25 @@ F: arch/mips/include/asm/mach-loongson32/ 
F:	drivers/*/*loongson1*

F:	drivers/*/*/*loongson1*



MIPS/LOONGSON2 ARCHITECTURE

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

L:	linux-mips@linux-mips.org

S:	Maintained

F:	arch/mips/loongson64/*{2e/2f}*

F:	arch/mips/include/asm/mach-loongson64/

F:	drivers/*/*loongson2*

F:	drivers/*/*/*loongson2*



MIPS/LOONGSON3 ARCHITECTURE

M:	Huacai Chen <chenhc@lemote.com>

L:	linux-mips@linux-mips.org

S:	Maintained

F:	arch/mips/loongson64/

F:	arch/mips/include/asm/mach-loongson64/

F:	drivers/platform/mips/cpu_hwmon.c

F:	drivers/*/*loongson3*

F:	drivers/*/*/*loongson3*



MIPS RINT INSTRUCTION EMULATION

M:	Aleksandar Markovic <aleksandar.markovic@mips.com>

L:	linux-mips@linux-mips.org
@@ -11586,6 +11606,13 @@ S: Maintained 
F:	Documentation/blockdev/ramdisk.txt

F:	drivers/block/brd.c



RANCHU VIRTUAL BOARD FOR MIPS

M:	Miodrag Dinic <miodrag.dinic@mips.com>

L:	linux-mips@linux-mips.org

S:	Supported

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

F:	arch/mips/configs/generic/board-ranchu.config



RANDOM NUMBER DRIVER

M:	"Theodore Ts'o" <tytso@mit.edu>

S:	Maintained

arch/mips/Kconfig

+15 −8
Original line number Diff line number Diff line
@@ -7,8 +7,6 @@ config MIPS 
	select ARCH_DISCARD_MEMBLOCK

	select ARCH_HAS_ELF_RANDOMIZE

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select ARCH_SUPPORTS_UPROBES

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
@@ -119,12 +117,12 @@ config MIPS_GENERIC 
	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_RELOCATABLE

	select SYS_SUPPORTS_SMARTMIPS

	select USB_EHCI_BIG_ENDIAN_DESC if BIG_ENDIAN

	select USB_EHCI_BIG_ENDIAN_MMIO if BIG_ENDIAN

	select USB_OHCI_BIG_ENDIAN_DESC if BIG_ENDIAN

	select USB_OHCI_BIG_ENDIAN_MMIO if BIG_ENDIAN

	select USB_UHCI_BIG_ENDIAN_DESC if BIG_ENDIAN

	select USB_UHCI_BIG_ENDIAN_MMIO if BIG_ENDIAN

	select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN

	select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN

	select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN

	select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN

	select USB_UHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN

	select USB_UHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN

	select USE_OF

	help

	  Select this to build a kernel which aims to support multiple boards,
@@ -253,6 +251,7 @@ config BCM47XX 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_LITTLE_ENDIAN

	select SYS_SUPPORTS_MIPS16

	select SYS_SUPPORTS_ZBOOT

	select SYS_HAS_EARLY_PRINTK

	select USE_GENERIC_EARLY_PRINTK_8250

	select GPIOLIB
@@ -341,6 +340,8 @@ config MACH_DECSTATION 


config MACH_JAZZ

	bool "Jazz family of machines"

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select FW_ARC

	select FW_ARC32

	select ARCH_MAY_HAVE_PC_FDC
@@ -476,6 +477,8 @@ config MACH_PISTACHIO 
config MIPS_MALTA

	bool "MIPS Malta board"

	select ARCH_MAY_HAVE_PC_FDC

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select BOOT_ELF32

	select BOOT_RAW

	select BUILTIN_DTB
@@ -613,6 +616,7 @@ config SGI_IP22 
	bool "SGI IP22 (Indy/Indigo2)"

	select FW_ARC

	select FW_ARC32

	select ARCH_MIGHT_HAVE_PC_SERIO

	select BOOT_ELF32

	select CEVT_R4K

	select CSRC_R4K
@@ -675,6 +679,7 @@ config SGI_IP28 
	bool "SGI IP28 (Indigo2 R10k)"

	select FW_ARC

	select FW_ARC64

	select ARCH_MIGHT_HAVE_PC_SERIO

	select BOOT_ELF64

	select CEVT_R4K

	select CSRC_R4K
@@ -824,6 +829,8 @@ config SNI_RM 
	select FW_ARC32 if CPU_LITTLE_ENDIAN

	select FW_SNIPROM if CPU_BIG_ENDIAN

	select ARCH_MAY_HAVE_PC_FDC

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_MIGHT_HAVE_PC_SERIO

	select BOOT_ELF32

	select CEVT_R4K

	select CSRC_R4K

arch/mips/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -216,6 +216,12 @@ cflags-$(toolchain-msa) += -DTOOLCHAIN_SUPPORTS_MSA 
endif

toolchain-virt				:= $(call cc-option-yn,$(mips-cflags) -mvirt)

cflags-$(toolchain-virt)		+= -DTOOLCHAIN_SUPPORTS_VIRT

# For -mmicromips, use -Wa,-fatal-warnings to catch unsupported -mxpa which

# only warns

xpa-cflags-y				:= $(mips-cflags)

xpa-cflags-$(micromips-ase)		+= -mmicromips -Wa$(comma)-fatal-warnings

toolchain-xpa				:= $(call cc-option-yn,$(xpa-cflags-y) -mxpa)

cflags-$(toolchain-xpa)			+= -DTOOLCHAIN_SUPPORTS_XPA



#

# Firmware support
@@ -228,7 +234,7 @@ libs-y += arch/mips/fw/lib/ 
#

# Kernel compression

#

ifdef SYS_SUPPORTS_ZBOOT

ifdef CONFIG_SYS_SUPPORTS_ZBOOT

COMPRESSION_FNAME		= vmlinuz

else

COMPRESSION_FNAME		= vmlinux

arch/mips/bcm47xx/Platform

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ platform-$(CONFIG_BCM47XX) += bcm47xx/ 
cflags-$(CONFIG_BCM47XX)	+=					\

		-I$(srctree)/arch/mips/include/asm/mach-bcm47xx

load-$(CONFIG_BCM47XX)		:= 0xffffffff80001000

zload-$(CONFIG_BCM47XX)		+= 0xffffffff80400000

CRA Git | Maintained and supported by SUSTech CRA and CCSE