Re: [PATCH 11/15] ARM: etm: Check arch version and disable data tracing for ptm

Linus Walleij
2012-06-28T16:07:51Z

On Thu, Jun 21, 2012 at 12:47 AM, John Stultz <john.stultz@linaro.org> wrote:

> +#define ETMR_ID                        0x1e4
> +#define ETMIDR_VERSION(x)      (((x) >> 4) & 0xff)
> +#define ETMIDR_VERSION_PFT_1_0 0x30

NAK don't reinvent this stuff.

>From <linux/amba/bus.h>

Use these macros on the periphid:
#define amba_config(d) AMBA_CONFIG_BITS((d)->periphid)
#define amba_rev(d) AMBA_REV_BITS((d)->periphid)
#define amba_manf(d) AMBA_MANF_BITS((d)->periphid)
#define amba_part(d) AMBA_PART_BITS((d)->periphid)

I thin amba_rev() is the one you're looking for (not sure).

So here:

> @@ -724,6 +724,9 @@ static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id

> +       if (etmccr & ETMCCR_ETMIDR_PRESENT) {
> +               etmidr = etm_readl(t, t->etm_regs_count, ETMR_ID);
> +               etm_version = ETMIDR_VERSION(etmidr);

etm_version = amba_rev(dev);

etc.

Yours,
Linus Walleij