ARM: etm: Check arch version and disable data tracing for ptm

Change-Id: If2cb7928d0711f48348443d882a12416be9c5910
Signed-off-by: Arve Hjønnevåg <arve@android.com>

diff --git a/arch/arm/include/asm/hardware/coresight.h b/arch/arm/include/asm/hardware/coresight.h
index 6643d6c4f35ec62be77f80f5556afeece24302a9..0fad8f8aed7d0dd07ad7e24e93ba24a5f16b64b3 100644 (file)
--- a/arch/arm/include/asm/hardware/coresight.h
+++ b/arch/arm/include/asm/hardware/coresight.h
@@ -60,6 +60,7 @@
 
 /* ETM configuration code register */
 #define ETMR_CONFCODE          (0x04)
+#define ETMCCR_ETMIDR_PRESENT  BIT(31)
 
 /* ETM trace start/stop resource control register */
 #define ETMR_TRACESSCTRL       (0x18)
@@ -126,6 +127,10 @@
                                ETMCTRL_BRANCH_OUTPUT | \
                                ETMCTRL_DO_CONTEXTID)
 
+#define ETMR_ID                        0x1e4
+#define ETMIDR_VERSION(x)      (((x) >> 4) & 0xff)
+#define ETMIDR_VERSION_PFT_1_0 0x30
+
 #define ETMR_TRACEIDR          0x200
 
 /* ETM management registers, "ETM Architecture", 3.5.24 */

diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c
index 845287bd4ba2a1406738cd25c955a7ac68e7468e..9cdbb6d2a4e17a408be2ec0a6711b0274797cba7 100644 (file)
--- a/arch/arm/kernel/etm.c
+++ b/arch/arm/kernel/etm.c
@@ -723,6 +723,9 @@ static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id
        int ret = 0;
        void __iomem **new_regs;
        int new_count;
+       u32 etmccr;
+       u32 etmidr;
+       u8 etm_version = 0;
 
        mutex_lock(&t->mutex);
        new_count = t->etm_regs_count + 1;
@@ -757,7 +760,12 @@ static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id
        /* dummy first read */
        (void)etm_readl(&tracer, t->etm_regs_count, ETMMR_OSSRR);
 
-       t->ncmppairs = etm_readl(t, t->etm_regs_count, ETMR_CONFCODE) & 0xf;
+       etmccr = etm_readl(t, t->etm_regs_count, ETMR_CONFCODE);
+       t->ncmppairs = etmccr & 0xf;
+       if (etmccr & ETMCCR_ETMIDR_PRESENT) {
+               etmidr = etm_readl(t, t->etm_regs_count, ETMR_ID);
+               etm_version = ETMIDR_VERSION(etmidr);
+       }
        etm_writel(t, t->etm_regs_count, 0x441, ETMR_CTRL);
        etm_writel(t, t->etm_regs_count, new_count, ETMR_TRACEIDR);
        etm_lock(t, t->etm_regs_count);
@@ -780,10 +788,15 @@ static int __devinit etm_probe(struct amba_device *dev, const struct amba_id *id
        if (ret)
                dev_dbg(&dev->dev, "Failed to create trace_range in sysfs\n");
 
-       ret = sysfs_create_file(&dev->dev.kobj, &trace_data_range_attr.attr);
-       if (ret)
-               dev_dbg(&dev->dev,
-                       "Failed to create trace_data_range in sysfs\n");
+       if (etm_version < ETMIDR_VERSION_PFT_1_0) {
+               ret = sysfs_create_file(&dev->dev.kobj,
+                                       &trace_data_range_attr.attr);
+               if (ret)
+                       dev_dbg(&dev->dev,
+                               "Failed to create trace_data_range in sysfs\n");
+       } else {
+               tracer.flags &= ~TRACER_TRACE_DATA;
+       }
 
        dev_dbg(&dev->dev, "ETM AMBA driver initialized.\n");