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

Commit 65738c6b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Catalin Marinas:
 "arm64 and perf fixes:

   - build error when accessing MPIDR_HWID_BITMASK from .S

   - fix CTR_EL0 field definitions

   - remove/disable some kernel messages on user faults (unhandled
     signals, unimplemented syscalls)

   - fix kernel page fault in unwind_frame() with function graph tracing

   - fix perf sleeping while atomic errors when booting with ACPI"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: fix unwind_frame() for filtered out fn for function graph tracing
  arm64: Enforce BBM for huge IO/VMAP mappings
  arm64: perf: correct PMUVer probing
  arm_pmu: acpi: request IRQs up-front
  arm_pmu: note IRQs and PMUs per-cpu
  arm_pmu: explicitly enable/disable SPIs at hotplug
  arm_pmu: acpi: check for mismatched PPIs
  arm_pmu: add armpmu_alloc_atomic()
  arm_pmu: fold platform helpers into platform code
  arm_pmu: kill arm_pmu_platdata
  ARM: ux500: remove PMU IRQ bouncer
  arm64: __show_regs: Only resolve kernel symbols when running at EL1
  arm64: Remove unimplemented syscall log message
  arm64: Disable unhandled signal log messages by default
  arm64: cpufeature: Fix CTR_EL0 field definitions
  arm64: uaccess: Formalise types for access_ok()
  arm64: Fix compilation error while accessing MPIDR_HWID_BITMASK from .S files
parents 2bd06ce7 9f416319

arch/arm/mach-ux500/cpu-db8500.c

+0 −35
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_platform.h>

#include <linux/perf/arm_pmu.h>

#include <linux/regulator/machine.h>



#include <asm/outercache.h>
@@ -112,37 +111,6 @@ static void ux500_restart(enum reboot_mode mode, const char *cmd) 
	prcmu_system_reset(0);

}



/*

 * The PMU IRQ lines of two cores are wired together into a single interrupt.

 * Bounce the interrupt to the other core if it's not ours.

 */

static irqreturn_t db8500_pmu_handler(int irq, void *dev, irq_handler_t handler)

{

	irqreturn_t ret = handler(irq, dev);

	int other = !smp_processor_id();



	if (ret == IRQ_NONE && cpu_online(other))

		irq_set_affinity(irq, cpumask_of(other));



	/*

	 * We should be able to get away with the amount of IRQ_NONEs we give,

	 * while still having the spurious IRQ detection code kick in if the

	 * interrupt really starts hitting spuriously.

	 */

	return ret;

}



static struct arm_pmu_platdata db8500_pmu_platdata = {

	.handle_irq		= db8500_pmu_handler,

	.irq_flags		= IRQF_NOBALANCING | IRQF_NO_THREAD,

};



static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {

	/* Requires call-back bindings. */

	OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata),

	{},

};



static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = {

	OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", NULL),

	{},
@@ -165,9 +133,6 @@ static void __init u8500_init_machine(void) 
	if (of_machine_is_compatible("st-ericsson,u8540"))

		of_platform_populate(NULL, u8500_local_bus_nodes,

				     u8540_auxdata_lookup, NULL);

	else

		of_platform_populate(NULL, u8500_local_bus_nodes,

				     u8500_auxdata_lookup, NULL);

}



static const char * stericsson_dt_platform_compat[] = {

arch/arm64/include/asm/cputype.h

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#define MPIDR_UP_BITMASK	(0x1 << 30)

#define MPIDR_MT_BITMASK	(0x1 << 24)

#define MPIDR_HWID_BITMASK	0xff00ffffffUL

#define MPIDR_HWID_BITMASK	UL(0xff00ffffff)



#define MPIDR_LEVEL_BITS_SHIFT	3

#define MPIDR_LEVEL_BITS	(1 << MPIDR_LEVEL_BITS_SHIFT)

arch/arm64/include/asm/stacktrace.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct stackframe { 
	unsigned long fp;

	unsigned long pc;

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

	unsigned int graph;

	int graph;

#endif

};

arch/arm64/include/asm/uaccess.h

+6 −6
Original line number Diff line number Diff line
@@ -72,15 +72,15 @@ static inline void set_fs(mm_segment_t fs) 
 * This is equivalent to the following test:

 * (u65)addr + (u65)size <= (u65)current->addr_limit + 1

 */

static inline unsigned long __range_ok(unsigned long addr, unsigned long size)

static inline unsigned long __range_ok(const void __user *addr, unsigned long size)

{

	unsigned long limit = current_thread_info()->addr_limit;

	unsigned long ret, limit = current_thread_info()->addr_limit;



	__chk_user_ptr(addr);

	asm volatile(

	// A + B <= C + 1 for all A,B,C, in four easy steps:

	// 1: X = A + B; X' = X % 2^64

	"	adds	%0, %0, %2\n"

	"	adds	%0, %3, %2\n"

	// 2: Set C = 0 if X > 2^64, to guarantee X' > C in step 4

	"	csel	%1, xzr, %1, hi\n"

	// 3: Set X' = ~0 if X >= 2^64. For X == 2^64, this decrements X'
@@ -92,9 +92,9 @@ static inline unsigned long __range_ok(unsigned long addr, unsigned long size) 
	//    testing X' - C == 0, subject to the previous adjustments.

	"	sbcs	xzr, %0, %1\n"

	"	cset	%0, ls\n"

	: "+r" (addr), "+r" (limit) : "Ir" (size) : "cc");

	: "=&r" (ret), "+r" (limit) : "Ir" (size), "0" (addr) : "cc");



	return addr;

	return ret;

}



/*
@@ -104,7 +104,7 @@ static inline unsigned long __range_ok(unsigned long addr, unsigned long size) 
 */

#define untagged_addr(addr)		sign_extend64(addr, 55)



#define access_ok(type, addr, size)	__range_ok((unsigned long)(addr), size)

#define access_ok(type, addr, size)	__range_ok(addr, size)

#define user_addr_max			get_fs



#define _ASM_EXTABLE(from, to)						\

arch/arm64/kernel/armv8_deprecated.c

+3 −1
Original line number Diff line number Diff line
@@ -370,6 +370,7 @@ static unsigned int __kprobes aarch32_check_condition(u32 opcode, u32 psr) 
static int swp_handler(struct pt_regs *regs, u32 instr)

{

	u32 destreg, data, type, address = 0;

	const void __user *user_ptr;

	int rn, rt2, res = 0;



	perf_sw_event(PERF_COUNT_SW_EMULATION_FAULTS, 1, regs, regs->pc);
@@ -401,7 +402,8 @@ static int swp_handler(struct pt_regs *regs, u32 instr) 
		aarch32_insn_extract_reg_num(instr, A32_RT2_OFFSET), data);



	/* Check access in reasonable access range for both SWP and SWPB */

	if (!access_ok(VERIFY_WRITE, (address & ~3), 4)) {

	user_ptr = (const void __user *)(unsigned long)(address & ~3);

	if (!access_ok(VERIFY_WRITE, user_ptr, 4)) {

		pr_debug("SWP{B} emulation: access to 0x%08x not allowed!\n",

			address);

		goto fault;