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

Commit 9e354ea8 authored by Alexander Shishkin's avatar Alexander Shishkin Committed by Russell King
Browse files

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: default avatarAlexander Shishkin <virtuoso@slind.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 686ff228

arch/arm/include/asm/hardware/coresight.h

+6 −2
Original line number Diff line number Diff line
@@ -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

arch/arm/kernel/etm.c

+1 −1
Original line number Diff line number Diff line
@@ -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);