Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'mips_fixes_4.15_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips 

Pull MIPS fixes from James Hogan:
 "Some final MIPS fixes for 4.15, including important build fixes and a
  MAINTAINERS update:

   - Add myself as MIPS co-maintainer.

   - Fix various all*config build failures (particularly as a result of
     switching the default MIPS platform to the "generic" platform).

   - Fix GCC7 build failures (duplicate const and questionable calls to
     missing __multi3 intrinsic on mips64r6).

   - Fix warnings when CPU Idle is enabled (4.14).

   - Fix AR7 serial output (since 3.17).

   - Fix ralink platform_get_irq error checking (since 3.12)"

* tag 'mips_fixes_4.15_2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips:
  MAINTAINERS: Add James as MIPS co-maintainer
  MIPS: Fix undefined reference to physical_memsize
  MIPS: Implement __multi3 for GCC7 MIPS64r6 builds
  MIPS: mm: Fix duplicate "const" on insn_table_MM
  MIPS: CM: Drop WARN_ON(vp != 0)
  MIPS: ralink: Fix platform_get_irq's error checking
  MIPS: Fix CPS SMP NS16550 UART defaults
  MIPS: BCM47XX Avoid compile error with MIPS allnoconfig
  MIPS: RB532: Avoid undefined mac_pton without GENERIC_NET_UTILS
  MIPS: RB532: Avoid undefined early_serial_setup() without SERIAL_8250_CONSOLE
  MIPS: ath25: Avoid undefined early_serial_setup() without SERIAL_8250_CONSOLE
  MIPS: AR7: ensure the port type's FCR value is used
parents 8dd903d2 18696edc

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9085,6 +9085,7 @@ F: drivers/usb/image/microtek.* 


MIPS

M:	Ralf Baechle <ralf@linux-mips.org>

M:	James Hogan <jhogan@kernel.org>

L:	linux-mips@linux-mips.org

W:	http://www.linux-mips.org/

T:	git git://git.linux-mips.org/pub/scm/ralf/linux.git

arch/mips/Kconfig

+11 −1
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ config BCM47XX 
	select LEDS_GPIO_REGISTER

	select BCM47XX_NVRAM

	select BCM47XX_SPROM

	select BCM47XX_SSB if !BCM47XX_BCMA

	help

	 Support for BCM47XX based boards
@@ -389,6 +390,7 @@ config LANTIQ 
	select SYS_SUPPORTS_32BIT_KERNEL

	select SYS_SUPPORTS_MIPS16

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_VPE_LOADER

	select SYS_HAS_EARLY_PRINTK

	select GPIOLIB

	select SWAP_IO_SPACE
@@ -516,6 +518,7 @@ config MIPS_MALTA 
	select SYS_SUPPORTS_MIPS16

	select SYS_SUPPORTS_MULTITHREADING

	select SYS_SUPPORTS_SMARTMIPS

	select SYS_SUPPORTS_VPE_LOADER

	select SYS_SUPPORTS_ZBOOT

	select SYS_SUPPORTS_RELOCATABLE

	select USE_OF
@@ -2281,9 +2284,16 @@ config MIPSR2_TO_R6_EMULATOR 
	  The only reason this is a build-time option is to save ~14K from the

	  final kernel image.



config SYS_SUPPORTS_VPE_LOADER

	bool

	depends on SYS_SUPPORTS_MULTITHREADING

	help

	  Indicates that the platform supports the VPE loader, and provides

	  physical_memsize.



config MIPS_VPE_LOADER

	bool "VPE loader support."

	depends on SYS_SUPPORTS_MULTITHREADING && MODULES

	depends on SYS_SUPPORTS_VPE_LOADER && MODULES

	select CPU_MIPSR2_IRQ_VI

	select CPU_MIPSR2_IRQ_EI

	select MIPS_MT

arch/mips/Kconfig.debug

+10 −4
Original line number Diff line number Diff line
@@ -124,30 +124,36 @@ config SCACHE_DEBUGFS 


	  If unsure, say N.



menuconfig MIPS_CPS_NS16550

menuconfig MIPS_CPS_NS16550_BOOL

	bool "CPS SMP NS16550 UART output"

	depends on MIPS_CPS

	help

	  Output debug information via an ns16550 compatible UART if exceptions

	  occur early in the boot process of a secondary core.



if MIPS_CPS_NS16550

if MIPS_CPS_NS16550_BOOL



config MIPS_CPS_NS16550

	def_bool MIPS_CPS_NS16550_BASE != 0



config MIPS_CPS_NS16550_BASE

	hex "UART Base Address"

	default 0x1b0003f8 if MIPS_MALTA

	default 0

	help

	  The base address of the ns16550 compatible UART on which to output

	  debug information from the early stages of core startup.



	  This is only used if non-zero.



config MIPS_CPS_NS16550_SHIFT

	int "UART Register Shift"

	default 0 if MIPS_MALTA

	default 0

	help

	  The number of bits to shift ns16550 register indices by in order to

	  form their addresses. That is, log base 2 of the span between

	  adjacent ns16550 registers in the system.



endif # MIPS_CPS_NS16550

endif # MIPS_CPS_NS16550_BOOL



endmenu

arch/mips/ar7/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static int __init ar7_register_uarts(void) 
	uart_port.type		= PORT_AR7;

	uart_port.uartclk	= clk_get_rate(bus_clk) / 2;

	uart_port.iotype	= UPIO_MEM32;

	uart_port.flags		= UPF_FIXED_TYPE;

	uart_port.flags		= UPF_FIXED_TYPE | UPF_BOOT_AUTOCONF;

	uart_port.regshift	= 2;



	uart_port.line		= 0;

arch/mips/ath25/devices.c

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ const char *get_system_type(void) 


void __init ath25_serial_setup(u32 mapbase, int irq, unsigned int uartclk)

{

#ifdef CONFIG_SERIAL_8250_CONSOLE

	struct uart_port s;



	memset(&s, 0, sizeof(s));
@@ -85,6 +86,7 @@ void __init ath25_serial_setup(u32 mapbase, int irq, unsigned int uartclk) 
	s.uartclk = uartclk;



	early_serial_setup(&s);

#endif /* CONFIG_SERIAL_8250_CONSOLE */

}



int __init ath25_add_wmac(int nr, u32 base, int irq)