Commit 1205b623 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-4.21' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:
 "Included in this update:

   - Florian Fainelli noticed that userspace segfaults caused by the
     lack of kernel-userspace helpers was hard to diagnose; we now issue
     a warning when userspace tries to use the helpers but the kernel
     has them disabled.

   - Ben Dooks wants compatibility for the old ATAG serial number with
     DT systems.

   - Some cleanup of assembly by Nicolas Pitre.

   - User accessors optimisation from Vincent Whitchurch.

   - More robust kdump on SMP systems from Yufen Wang.

   - Sebastian Andrzej Siewior noticed problems with the SMP "boot_lock"
     on RT kernels, and so we convert the Versatile series of platforms
     to use a raw spinlock instead, consolidating the Versatile
     implementation. We entirely remove the boot_lock on OMAP systems,
     where it's unnecessary. Further patches for other systems will be
     submitted for the following merge window.

   - Start switching old StrongARM-11x0 systems to use gpiolib rather
     than their private GPIO implementation - mostly PCMCIA bits.

   - ARM Kconfig cleanups.

   - Cleanup a mostly harmless mistake in the recent Spectre patch in
     4.20 (which had the effect that data that can be placed into the
     init sections was incorrectly always placed in the rodata section)"

* tag 'for-4.21' of git://git.armlinux.org.uk/~rmk/linux-arm: (25 commits)
  ARM: omap2: remove unnecessary boot_lock
  ARM: versatile: rename and comment SMP implementation
  ARM: versatile: convert boot_lock to raw
  ARM: vexpress/realview: consolidate immitation CPU hotplug
  ARM: fix the cockup in the previous patch
  ARM: sa1100/cerf: switch to using gpio_led_register_device()
  ARM: sa1100/assabet: switch to using gpio leds
  ARM: sa1100/assabet: add gpio keys support for right-hand two buttons
  ARM: sa1111: remove legacy GPIO interfaces
  pcmcia: sa1100*: remove redundant bvd1/bvd2 setting
  ARM: pxa/lubbock: switch PCMCIA to MAX1600 library
  ARM: pxa/mainstone: switch PCMCIA to MAX1600 library and gpiod APIs
  ARM: sa1100/neponset: switch PCMCIA to MAX1600 library and gpiod APIs
  ARM: sa1100/jornada720: switch PCMCIA to gpiod APIs
  pcmcia: add MAX1600 library
  ARM: sa1100: explicitly register sa11x0-pcmcia devices
  ARM: 8813/1: Make aligned 2-byte getuser()/putuser() atomic on ARMv6+
  ARM: 8812/1: Optimise copy_{from/to}_user for !CPU_USE_DOMAINS
  ARM: 8811/1: always list both ldrd/strd registers explicitly
  ARM: 8808/1: kexec:offline panic_smp_self_stop CPU
  ...
parents 9ee3b3f4 6de92920

arch/arm/Kconfig

+12 −13
Original line number Diff line number Diff line
@@ -28,14 +28,14 @@ config ARM 
	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_EXTABLE_SORT if MMU

	select CLONE_BACKWARDS

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select CPU_PM if SUSPEND || CPU_IDLE

	select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS

	select DMA_REMAP if MMU

	select EDAC_SUPPORT

	select EDAC_ATOMIC_SCRUB

	select GENERIC_ALLOCATOR

	select GENERIC_ARCH_TOPOLOGY if ARM_CPU_TOPOLOGY

	select GENERIC_ATOMIC64 if (CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI)

	select GENERIC_ATOMIC64 if CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_EARLY_IOREMAP
@@ -50,12 +50,12 @@ config ARM 
	select GENERIC_STRNLEN_USER

	select HANDLE_DOMAIN_IRQ

	select HARDIRQS_SW_RESEND

	select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_AUDITSYSCALL if AEABI && !OABI_COMPAT

	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU

	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU

	select HAVE_ARCH_MMAP_RND_BITS if MMU

	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_SECCOMP_FILTER if AEABI && !OABI_COMPAT

	select HAVE_ARCH_THREAD_STRUCT_WHITELIST

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARM_SMCCC if CPU_V7
@@ -64,16 +64,16 @@ config ARM 
	select HAVE_C_RECORDMCOUNT

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_CONTIGUOUS if MMU

	select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32 && MMU

	select HAVE_DYNAMIC_FTRACE if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU

	select HAVE_DYNAMIC_FTRACE_WITH_REGS if HAVE_DYNAMIC_FTRACE

	select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU

	select HAVE_EXIT_THREAD

	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)

	select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)

	select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)

	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL

	select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL

	select HAVE_FUNCTION_TRACER if !XIP_KERNEL

	select HAVE_GCC_PLUGINS

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))

	select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)

	select HAVE_IDE if PCI || ISA || PCMCIA

	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_KERNEL_GZIP
@@ -82,15 +82,15 @@ config ARM 
	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_KRETPROBES if HAVE_KPROBES

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_NMI

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

	select HAVE_OPROFILE if HAVE_PERF_EVENTS

	select HAVE_OPTPROBES if !THUMB2_KERNEL

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)

	select HAVE_RCU_TABLE_FREE if SMP && ARM_LPAE

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RSEQ

	select HAVE_STACKPROTECTOR
@@ -1738,7 +1738,6 @@ config PARAVIRT 
config PARAVIRT_TIME_ACCOUNTING

	bool "Paravirtual steal time accounting"

	select PARAVIRT

	default n

	help

	  Select this option to enable fine granularity task steal time

	  accounting. Time spent executing other tasks in parallel with

arch/arm/boot/compressed/atags_to_fdt.c

+23 −0
Original line number Diff line number Diff line
@@ -98,6 +98,24 @@ static void merge_fdt_bootargs(void *fdt, const char *fdt_cmdline) 
	setprop_string(fdt, "/chosen", "bootargs", cmdline);

}



static void hex_str(char *out, uint32_t value)

{

	uint32_t digit;

	int idx;



	for (idx = 7; idx >= 0; idx--) {

		digit = value >> 28;

		value <<= 4;

		digit &= 0xf;

		if (digit < 10)

			digit += '0';

		else

			digit += 'A'-10;

		*out++ = digit;

	}

	*out = '\0';

}



/*

 * Convert and fold provided ATAGs into the provided FDT.

 *
@@ -180,6 +198,11 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) 
					initrd_start);

			setprop_cell(fdt, "/chosen", "linux,initrd-end",

					initrd_start + initrd_size);

		} else if (atag->hdr.tag == ATAG_SERIAL) {

			char serno[16+2];

			hex_str(serno, atag->u.serialnr.high);

			hex_str(serno+8, atag->u.serialnr.low);

			setprop_string(fdt, "/", "serial-number", serno);

		}

	}

arch/arm/common/sa1111.c

+0 −59
Original line number Diff line number Diff line
@@ -1282,65 +1282,6 @@ int sa1111_get_audio_rate(struct sa1111_dev *sadev) 
}

EXPORT_SYMBOL(sa1111_get_audio_rate);



void sa1111_set_io_dir(struct sa1111_dev *sadev,

		       unsigned int bits, unsigned int dir,

		       unsigned int sleep_dir)

{

	struct sa1111 *sachip = sa1111_chip_driver(sadev);

	unsigned long flags;

	unsigned int val;

	void __iomem *gpio = sachip->base + SA1111_GPIO;



#define MODIFY_BITS(port, mask, dir)		\

	if (mask) {				\

		val = readl_relaxed(port);	\

		val &= ~(mask);			\

		val |= (dir) & (mask);		\

		writel_relaxed(val, port);	\

	}



	spin_lock_irqsave(&sachip->lock, flags);

	MODIFY_BITS(gpio + SA1111_GPIO_PADDR, bits & 15, dir);

	MODIFY_BITS(gpio + SA1111_GPIO_PBDDR, (bits >> 8) & 255, dir >> 8);

	MODIFY_BITS(gpio + SA1111_GPIO_PCDDR, (bits >> 16) & 255, dir >> 16);



	MODIFY_BITS(gpio + SA1111_GPIO_PASDR, bits & 15, sleep_dir);

	MODIFY_BITS(gpio + SA1111_GPIO_PBSDR, (bits >> 8) & 255, sleep_dir >> 8);

	MODIFY_BITS(gpio + SA1111_GPIO_PCSDR, (bits >> 16) & 255, sleep_dir >> 16);

	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_set_io_dir);



void sa1111_set_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v)

{

	struct sa1111 *sachip = sa1111_chip_driver(sadev);

	unsigned long flags;

	unsigned int val;

	void __iomem *gpio = sachip->base + SA1111_GPIO;



	spin_lock_irqsave(&sachip->lock, flags);

	MODIFY_BITS(gpio + SA1111_GPIO_PADWR, bits & 15, v);

	MODIFY_BITS(gpio + SA1111_GPIO_PBDWR, (bits >> 8) & 255, v >> 8);

	MODIFY_BITS(gpio + SA1111_GPIO_PCDWR, (bits >> 16) & 255, v >> 16);

	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_set_io);



void sa1111_set_sleep_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v)

{

	struct sa1111 *sachip = sa1111_chip_driver(sadev);

	unsigned long flags;

	unsigned int val;

	void __iomem *gpio = sachip->base + SA1111_GPIO;



	spin_lock_irqsave(&sachip->lock, flags);

	MODIFY_BITS(gpio + SA1111_GPIO_PASSR, bits & 15, v);

	MODIFY_BITS(gpio + SA1111_GPIO_PBSSR, (bits >> 8) & 255, v >> 8);

	MODIFY_BITS(gpio + SA1111_GPIO_PCSSR, (bits >> 16) & 255, v >> 16);

	spin_unlock_irqrestore(&sachip->lock, flags);

}

EXPORT_SYMBOL(sa1111_set_sleep_io);



/*

 * Individual device operations.

 */

arch/arm/include/asm/assembler.h

+4 −2
Original line number Diff line number Diff line
@@ -243,13 +243,15 @@ 
	.endm

#endif



#define USER(x...)				\

#define USERL(l, x...)				\

9999:	x;					\

	.pushsection __ex_table,"a";		\

	.align	3;				\

	.long	9999b,9001f;			\

	.long	9999b,l;			\

	.popsection



#define USER(x...)	USERL(9001f, x)



#ifdef CONFIG_SMP

#define ALT_SMP(instr...)					\

9998:	instr

arch/arm/include/asm/hardware/sa1111.h

+0 −4
Original line number Diff line number Diff line
@@ -433,10 +433,6 @@ int sa1111_check_dma_bug(dma_addr_t addr); 
int sa1111_driver_register(struct sa1111_driver *);

void sa1111_driver_unregister(struct sa1111_driver *);



void sa1111_set_io_dir(struct sa1111_dev *sadev, unsigned int bits, unsigned int dir, unsigned int sleep_dir);

void sa1111_set_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v);

void sa1111_set_sleep_io(struct sa1111_dev *sadev, unsigned int bits, unsigned int v);



struct sa1111_platform_data {

	int	irq_base;	/* base for cascaded on-chip IRQs */

	unsigned disable_devs;

CRA Git | Maintained and supported by SUSTech CRA and CCSE