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

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>

diff --git a/arch/arm/include/asm/hardware/coresight.h b/arch/arm/include/asm/hardware/coresight.h
index f82b25d4f73e6cb72bbbc4564acbe745a3fb3685..212e47828c791e44c16f93783cba17d10eadddff 100644 (file)
--- a/arch/arm/include/asm/hardware/coresight.h
+++ b/arch/arm/include/asm/hardware/coresight.h
@@ -48,8 +48,6 @@ struct tracectx {
 /* CoreSight Component Registers */
 #define CSCR_CLASS     0xff4
 
-#define CSCR_PRSR      0x314
-
 #define UNLOCK_MAGIC   0xc5acce55
 
 /* ETM control register, "ETM Architecture", 3.3.1 */
@@ -132,6 +130,12 @@ struct tracectx {
                                ETMCTRL_BRANCH_OUTPUT | \
                                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 */
 #define ETBR_DEPTH             0x04
 #define ETBR_STATUS            0x0c

diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 827753966301434f55174d26948c88a4ba249733..9e9db63c298a39a354b9468dd515c29bf3d34f74 100644 (file)
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -543,7 +543,7 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id)
        t->etm_portsz = 1;
 
        etm_unlock(t);
-       ret = etm_readl(t, CSCR_PRSR);
+       ret = etm_readl(t, ETMMR_PDSR);
 
        t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf;
        etm_writel(t, 0x440, ETMR_CTRL);