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

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

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Various fixes and post-merge window updates.  Included here are:
   - ensure Kconfig things which should be sorted remain sorted
   - fix three big-endian bugs which crept in during the last merge
     window
   - add the renameat2 syscall
   - fix big.LITTLE switcher initialisation checks
   - fix kdump vmcore for LPAE kernels"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: add renameat2 syscall
  ARM: keep arch/arm/Kconfig and arch/arm/mm/Kconfig select entries sorted
  ARM: 8033/1: fix big endian __pv_phys_pfn_offset size related issue
  ARM: 8032/1: bL_switcher: fix validation check before its activation
  ARM: 8030/1: ARM : kdump : add arch_crash_save_vmcoreinfo
  ARM: 8027/1: fix do_div() bug in big-endian systems
  ARM: 8026/1: Fix emulation of multiply accumulate instructions
  ARM: 8024/1: Keep DEBUG_UART_{PHYS,VIRT} entries sorted
parents 1aae31c8 556d3f7f

arch/arm/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ config ARM 
	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_TRACEHOOK

	select HAVE_BPF_JIT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CONTEXT_TRACKING

	select HAVE_C_RECORDMCOUNT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS
@@ -422,8 +422,8 @@ config ARCH_EFM32 
	bool "Energy Micro efm32"

	depends on !MMU

	select ARCH_REQUIRE_GPIOLIB

	select AUTO_ZRELADDR

	select ARM_NVIC

	select AUTO_ZRELADDR

	select CLKSRC_OF

	select COMMON_CLK

	select CPU_V7M
@@ -511,8 +511,8 @@ config ARCH_IXP4XX 
	bool "IXP4xx-based"

	depends on MMU

	select ARCH_HAS_DMA_SET_COHERENT_MASK

	select ARCH_SUPPORTS_BIG_ENDIAN

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_SUPPORTS_BIG_ENDIAN

	select CLKSRC_MMIO

	select CPU_XSCALE

	select DMABOUNCE if PCI
@@ -1575,8 +1575,8 @@ config BIG_LITTLE 
config BL_SWITCHER

	bool "big.LITTLE switcher support"

	depends on BIG_LITTLE && MCPM && HOTPLUG_CPU

	select CPU_PM

	select ARM_CPU_SUSPEND

	select CPU_PM

	help

	  The big.LITTLE "switcher" provides the core functionality to

	  transparently handle transition between a cluster of A15's
@@ -1920,9 +1920,9 @@ config XEN 
	depends on CPU_V7 && !CPU_V6

	depends on !GENERIC_ATOMIC64

	depends on MMU

	select ARCH_DMA_ADDR_T_64BIT

	select ARM_PSCI

	select SWIOTLB_XEN

	select ARCH_DMA_ADDR_T_64BIT

	help

	  Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.

arch/arm/Kconfig.debug

+6 −6
Original line number Diff line number Diff line
@@ -1030,9 +1030,9 @@ config DEBUG_UART_PHYS 
	default 0x40100000 if DEBUG_PXA_UART1

	default 0x42000000 if ARCH_GEMINI

	default 0x7c0003f8 if FOOTBRIDGE

	default 0x80230000 if DEBUG_PICOXCELL_UART

	default 0x80070000 if DEBUG_IMX23_UART

	default 0x80074000 if DEBUG_IMX28_UART

	default 0x80230000 if DEBUG_PICOXCELL_UART

	default 0x808c0000 if ARCH_EP93XX

	default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART

	default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
@@ -1096,22 +1096,22 @@ config DEBUG_UART_VIRT 
	default 0xfeb26000 if DEBUG_RK3X_UART1

	default 0xfeb30c00 if DEBUG_KEYSTONE_UART0

	default 0xfeb31000 if DEBUG_KEYSTONE_UART1

	default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE

	default 0xfed60000 if DEBUG_RK29_UART0

	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2

	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

	default 0xfec02000 if DEBUG_SOCFPGA_UART

	default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE

	default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0

	default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1

	default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2

	default 0xfed12000 if ARCH_KIRKWOOD

	default 0xfed60000 if DEBUG_RK29_UART0

	default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2

	default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3

	default 0xfedc0000 if ARCH_EP93XX

	default 0xfee003f8 if FOOTBRIDGE

	default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART

	default 0xfef36000 if DEBUG_HIGHBANK_UART

	default 0xfee82340 if ARCH_IOP13XX

	default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN

	default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN

	default 0xfef36000 if DEBUG_HIGHBANK_UART

	default 0xfefff700 if ARCH_IOP33X

	default 0xff003000 if DEBUG_U300_UART

	default DEBUG_UART_PHYS if !MMU

arch/arm/common/bL_switcher.c

+2 −4
Original line number Diff line number Diff line
@@ -797,10 +797,8 @@ static int __init bL_switcher_init(void) 
{

	int ret;



	if (MAX_NR_CLUSTERS != 2) {

		pr_err("%s: only dual cluster systems are supported\n", __func__);

		return -EINVAL;

	}

	if (!mcpm_is_available())

		return -ENODEV;



	cpu_notifier(bL_switcher_hotplug_callback, 0);

arch/arm/common/mcpm_entry.c

+5 −0
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ int __init mcpm_platform_register(const struct mcpm_platform_ops *ops) 
	return 0;

}



bool mcpm_is_available(void)

{

	return (platform_ops) ? true : false;

}



int mcpm_cpu_power_up(unsigned int cpu, unsigned int cluster)

{

	if (!platform_ops)

arch/arm/include/asm/div64.h

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ 
		/* Select the best insn combination to perform the   */	\

		/* actual __m * __n / (__p << 64) operation.         */	\

		if (!__c) {						\

			asm (	"umull	%Q0, %R0, %1, %Q2\n\t"		\

			asm (	"umull	%Q0, %R0, %Q1, %Q2\n\t"		\

				"mov	%Q0, #0"			\

				: "=&r" (__res)				\

				: "r" (__m), "r" (__n)			\