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

Merge branch 'fixes' of git://

Pull ARM fixes from Russell King:
 "A few ARM fixes:

   - fix a crash while performing TLB maintanence on early ARM SMP cores

   - blacklist Scorpion CPUs for hardware breakpoints

   - ARMs asm/types.h has been included as part of the UAPI due to the
     way the makefiles work, move it to uapi/asm/types.h to make it

   - fix up ftrace syscall name matching"

* 'fixes' of git://
  ARM: 8613/1: Fix the uaccess crash on PB11MPCore
  MAINTAINERS: update rmk's entries
  ARM: put types.h in uapi
  ARM: 8634/1: hw_breakpoint: blacklist Scorpion CPUs
  ARM: 8632/1: ftrace: fix syscall name matching
parents ca92e6c7 90f92c63
......@@ -976,6 +976,7 @@ M: Russell King <>
L: (moderated for non-subscribers)
S: Maintained
T: git git://
F: arch/arm/
......@@ -1153,6 +1154,7 @@ ARM/CLKDEV SUPPORT
M: Russell King <>
L: (moderated for non-subscribers)
S: Maintained
T: git git:// clkdev
F: arch/arm/include/asm/clkdev.h
F: drivers/clk/clkdev.c
......@@ -7697,8 +7699,10 @@ F: drivers/net/dsa/mv88e6xxx/
F: Documentation/devicetree/bindings/net/dsa/marvell.txt
M: Russell King <>
M: Russell King <>
S: Maintained
T: git git:// drm-armada-devel
T: git git:// drm-armada-fixes
F: drivers/gpu/drm/armada/
F: include/uapi/drm/armada_drm.h
F: Documentation/devicetree/bindings/display/armada/
......@@ -8903,8 +8907,10 @@ S: Supported
F: drivers/nfc/nxp-nci
M: Russell King <>
M: Russell King <>
S: Supported
T: git git:// drm-tda998x-devel
T: git git:// drm-tda998x-fixes
F: drivers/gpu/drm/i2c/tda998x_drv.c
F: include/drm/i2c/tda998x.h
......@@ -94,6 +94,9 @@
#define ARM_CPU_XSCALE_ARCH_V2 0x4000
#define ARM_CPU_XSCALE_ARCH_V3 0x6000
/* Qualcomm implemented cores */
#define ARM_CPU_PART_SCORPION 0x510002d0
extern unsigned int processor_id;
#ifdef CONFIG_CPU_CP15
......@@ -54,6 +54,24 @@ static inline void *return_address(unsigned int level)
#define ftrace_return_address(n) return_address(n)
static inline bool arch_syscall_match_sym_name(const char *sym,
const char *name)
if (!strcmp(sym, "sys_mmap2"))
sym = "sys_mmap_pgoff";
else if (!strcmp(sym, "sys_statfs64_wrapper"))
sym = "sys_statfs64";
else if (!strcmp(sym, "sys_fstatfs64_wrapper"))
sym = "sys_fstatfs64";
else if (!strcmp(sym, "sys_arm_fadvise64_64"))
sym = "sys_fadvise64_64";
/* Ignore case since sym may start with "SyS" instead of "sys" */
return !strcasecmp(sym, name);
#endif /* ifndef __ASSEMBLY__ */
#endif /* _ASM_ARM_FTRACE */
#ifndef _ASM_TYPES_H
#define _ASM_TYPES_H
#include <asm-generic/int-ll64.h>
......@@ -37,4 +37,4 @@
#define __UINTPTR_TYPE__ unsigned long
#endif /* _ASM_TYPES_H */
#endif /* _UAPI_ASM_TYPES_H */
......@@ -1063,6 +1063,22 @@ static int __init arch_hw_breakpoint_init(void)
return 0;
* Scorpion CPUs (at least those in APQ8060) seem to set DBGPRSR.SPD
* whenever a WFI is issued, even if the core is not powered down, in
* violation of the architecture. When DBGPRSR.SPD is set, accesses to
* breakpoint and watchpoint registers are treated as undefined, so
* this results in boot time and runtime failures when these are
* accessed and we unexpectedly take a trap.
* It's not clear if/how this can be worked around, so we blacklist
* Scorpion CPUs to avoid these issues.
if (read_cpuid_part() == ARM_CPU_PART_SCORPION) {
pr_info("Scorpion CPU detected. Hardware breakpoints and watchpoints disabled\n");
return 0;
has_ossr = core_has_os_save_restore();
/* Determine how many BRPs/WRPs are available. */
......@@ -9,6 +9,7 @@
#include <linux/preempt.h>
#include <linux/smp.h>
#include <linux/uaccess.h>
#include <asm/smp_plat.h>
#include <asm/tlbflush.h>
......@@ -40,8 +41,11 @@ static inline void ipi_flush_tlb_mm(void *arg)
static inline void ipi_flush_tlb_page(void *arg)
struct tlb_args *ta = (struct tlb_args *)arg;
unsigned int __ua_flags = uaccess_save_and_enable();
local_flush_tlb_page(ta->ta_vma, ta->ta_start);
static inline void ipi_flush_tlb_kernel_page(void *arg)
......@@ -54,8 +58,11 @@ static inline void ipi_flush_tlb_kernel_page(void *arg)
static inline void ipi_flush_tlb_range(void *arg)
struct tlb_args *ta = (struct tlb_args *)arg;
unsigned int __ua_flags = uaccess_save_and_enable();
local_flush_tlb_range(ta->ta_vma, ta->ta_start, ta->ta_end);
static inline void ipi_flush_tlb_kernel_range(void *arg)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment