lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ARM: 6292/1: coresight: add ETM management registers

Browse Source 
Add notion of ETM OS lock, save and restore registers.

Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Alexander Shishkin
2010-08-04 11:25:20 +01:00
committed by Russell King
parent 686ff22812
commit 9e354ea8e0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/include/asm/hardware/coresight.h
View File

@@ -48,8 +48,6 @@ struct tracectx {
/* CoreSight Component Registers */ /* CoreSight Component Registers */
#define CSCR_CLASS 0xff4 #define CSCR_CLASS 0xff4
#define CSCR_PRSR 0x314
#define UNLOCK_MAGIC 0xc5acce55 #define UNLOCK_MAGIC 0xc5acce55
/* ETM control register, "ETM Architecture", 3.3.1 */ /* ETM control register, "ETM Architecture", 3.3.1 */
@@ -132,6 +130,12 @@ struct tracectx {
ETMCTRL_BRANCH_OUTPUT | \ ETMCTRL_BRANCH_OUTPUT | \
ETMCTRL_DO_CONTEXTID) ETMCTRL_DO_CONTEXTID)
/* ETM management registers, "ETM Architecture", 3.5.24 */
#define ETMMR_OSLAR 0x300
#define ETMMR_OSLSR 0x304
#define ETMMR_OSSRR 0x308
#define ETMMR_PDSR 0x314
/* ETB registers, "CoreSight Components TRM", 9.3 */ /* ETB registers, "CoreSight Components TRM", 9.3 */
#define ETBR_DEPTH 0x04 #define ETBR_DEPTH 0x04
#define ETBR_STATUS 0x0c #define ETBR_STATUS 0x0c

2
arch/arm/kernel/etm.c
View File

@@ -543,7 +543,7 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id)
t->etm_portsz = 1; t->etm_portsz = 1;
etm_unlock(t); etm_unlock(t);
ret = etm_readl(t, CSCR_PRSR); ret = etm_readl(t, ETMMR_PDSR);
t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf; t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf;
etm_writel(t, 0x440, ETMR_CTRL); etm_writel(t, 0x440, ETMR_CTRL);