diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-19 06:23:08 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-11-19 06:23:08 -0500 |
| commit | c71d4aa7e98f30d4011b44b168263abc72f676bd (patch) | |
| tree | 3daa760c738a6e90f8af4b9ff163e608f10884e4 /arch/arm/include | |
| parent | 667832da846b5748e6c7b3139bbe015c7ea189f7 (diff) | |
| parent | f600b9fcd2bcb8ee0adb235f54ccdd93c729c442 (diff) | |
Merge branch 'hw-breakpoint' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/cti.h | 20 | ||||
| -rw-r--r-- | arch/arm/include/asm/hw_breakpoint.h | 8 |
2 files changed, 6 insertions, 22 deletions
diff --git a/arch/arm/include/asm/cti.h b/arch/arm/include/asm/cti.h index a0ada3ea435..f2e5cad3f30 100644 --- a/arch/arm/include/asm/cti.h +++ b/arch/arm/include/asm/cti.h | |||
| @@ -146,15 +146,7 @@ static inline void cti_irq_ack(struct cti *cti) | |||
| 146 | */ | 146 | */ |
| 147 | static inline void cti_unlock(struct cti *cti) | 147 | static inline void cti_unlock(struct cti *cti) |
| 148 | { | 148 | { |
| 149 | void __iomem *base = cti->base; | 149 | __raw_writel(LOCKCODE, cti->base + LOCKACCESS); |
| 150 | unsigned long val; | ||
| 151 | |||
| 152 | val = __raw_readl(base + LOCKSTATUS); | ||
| 153 | |||
| 154 | if (val & 1) { | ||
| 155 | val = LOCKCODE; | ||
| 156 | __raw_writel(val, base + LOCKACCESS); | ||
| 157 | } | ||
| 158 | } | 150 | } |
| 159 | 151 | ||
| 160 | /** | 152 | /** |
| @@ -166,14 +158,6 @@ static inline void cti_unlock(struct cti *cti) | |||
| 166 | */ | 158 | */ |
| 167 | static inline void cti_lock(struct cti *cti) | 159 | static inline void cti_lock(struct cti *cti) |
| 168 | { | 160 | { |
| 169 | void __iomem *base = cti->base; | 161 | __raw_writel(~LOCKCODE, cti->base + LOCKACCESS); |
| 170 | unsigned long val; | ||
| 171 | |||
| 172 | val = __raw_readl(base + LOCKSTATUS); | ||
| 173 | |||
| 174 | if (!(val & 1)) { | ||
| 175 | val = ~LOCKCODE; | ||
| 176 | __raw_writel(val, base + LOCKACCESS); | ||
| 177 | } | ||
| 178 | } | 162 | } |
| 179 | #endif | 163 | #endif |
diff --git a/arch/arm/include/asm/hw_breakpoint.h b/arch/arm/include/asm/hw_breakpoint.h index c190bc992f0..01169dd723f 100644 --- a/arch/arm/include/asm/hw_breakpoint.h +++ b/arch/arm/include/asm/hw_breakpoint.h | |||
| @@ -98,12 +98,12 @@ static inline void decode_ctrl_reg(u32 reg, | |||
| 98 | #define ARM_BASE_WCR 112 | 98 | #define ARM_BASE_WCR 112 |
| 99 | 99 | ||
| 100 | /* Accessor macros for the debug registers. */ | 100 | /* Accessor macros for the debug registers. */ |
| 101 | #define ARM_DBG_READ(M, OP2, VAL) do {\ | 101 | #define ARM_DBG_READ(N, M, OP2, VAL) do {\ |
| 102 | asm volatile("mrc p14, 0, %0, c0," #M ", " #OP2 : "=r" (VAL));\ | 102 | asm volatile("mrc p14, 0, %0, " #N "," #M ", " #OP2 : "=r" (VAL));\ |
| 103 | } while (0) | 103 | } while (0) |
| 104 | 104 | ||
| 105 | #define ARM_DBG_WRITE(M, OP2, VAL) do {\ | 105 | #define ARM_DBG_WRITE(N, M, OP2, VAL) do {\ |
| 106 | asm volatile("mcr p14, 0, %0, c0," #M ", " #OP2 : : "r" (VAL));\ | 106 | asm volatile("mcr p14, 0, %0, " #N "," #M ", " #OP2 : : "r" (VAL));\ |
| 107 | } while (0) | 107 | } while (0) |
| 108 | 108 | ||
| 109 | struct notifier_block; | 109 | struct notifier_block; |