Skip to content

Commit

Permalink
ARM: 6294/1: etm: do a dummy read from OSSRR during initialization
Browse files Browse the repository at this point in the history
The first read from ETM OS save and restore register after the power
down bit deassertion returns garbage.

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>
  • Loading branch information
Alexander Shishkin authored and Russell King committed Aug 10, 2010
1 parent 9e354ea commit 988257c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion arch/arm/kernel/etm.c
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,9 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id)
t->etm_portsz = 1;

etm_unlock(t);
ret = etm_readl(t, ETMMR_PDSR);
(void)etm_readl(t, ETMMR_PDSR);
/* dummy first read */
(void)etm_readl(&tracer, ETMMR_OSSRR);

t->ncmppairs = etm_readl(t, ETMR_CONFCODE) & 0xf;
etm_writel(t, 0x440, ETMR_CTRL);
Expand Down

0 comments on commit 988257c

Please sign in to comment.