From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Subject: [PATCH 4/8] ARM: etm: Allow range selection Date: Mon, 14 Feb 2011 22:11:12 -0800 Message-ID: <1297750276-12475-4-git-send-email-arve@android.com> References: <1296701663-12168-1-git-send-email-arve@android.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1296701663-12168-1-git-send-email-arve@android.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: linux-arm-kernel@lists.infradead.org Cc: Russell King , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, Alexander Shishkin , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Jason Wessel , linux-omap@vger.kernel.org List-Id: linux-omap@vger.kernel.org VHJhY2Uga2VybmVsIHRleHQgc2VnbWVudCBieSBkZWZhdWx0IGFzIGJlZm9yZSwgYWxsb3cgdHJh Y2luZyBvZiBvdGhlcgpyYW5nZXMgYnkgd3JpdGluZyBhIHJhbmdlIHRvIC9zeXMvZGV2aWNlcy9l dG0vdHJhY2VfcmFuZ2UsIG9yIHRvIHRyYWNlCmV2ZXJ5dGhpbmcgYnkgd3JpdGluZyAwIDAuCgpT aWduZWQtb2ZmLWJ5OiBBcnZlIEhqw7hubmV2w6VnIDxhcnZlQGFuZHJvaWQuY29tPgotLS0KIGFy Y2gvYXJtL2tlcm5lbC9ldG0uYyB8ICAgNDkgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLQogMSBmaWxlcyBjaGFuZ2VkLCA0NiBpbnNlcnRpb25zKCspLCAz IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2FyY2gvYXJtL2tlcm5lbC9ldG0uYyBiL2FyY2gv YXJtL2tlcm5lbC9ldG0uYwppbmRleCBiYzdkOGYyLi44YTFjNDIyIDEwMDY0NAotLS0gYS9hcmNo L2FybS9rZXJuZWwvZXRtLmMKKysrIGIvYXJjaC9hcm0va2VybmVsL2V0bS5jCkBAIC00MCwxMiAr NDAsMTcgQEAgc3RydWN0IHRyYWNlY3R4IHsKIAl1bnNpZ25lZCBsb25nCWZsYWdzOwogCWludAkJ bmNtcHBhaXJzOwogCWludAkJZXRtX3BvcnRzejsKKwl1bnNpZ25lZCBsb25nCXJhbmdlX3N0YXJ0 OworCXVuc2lnbmVkIGxvbmcJcmFuZ2VfZW5kOwogCXN0cnVjdCBkZXZpY2UJKmRldjsKIAlzdHJ1 Y3QgY2xrCSplbXVfY2xrOwogCXN0cnVjdCBtdXRleAltdXRleDsKIH07CiAKLXN0YXRpYyBzdHJ1 Y3QgdHJhY2VjdHggdHJhY2VyOworc3RhdGljIHN0cnVjdCB0cmFjZWN0eCB0cmFjZXIgPSB7CisJ LnJhbmdlX3N0YXJ0ID0gKHVuc2lnbmVkIGxvbmcpX3N0ZXh0LAorCS5yYW5nZV9lbmQgPSAodW5z aWduZWQgbG9uZylfZXRleHQsCit9OwogCiBzdGF0aWMgaW5saW5lIGJvb2wgdHJhY2VfaXNydW5u aW5nKHN0cnVjdCB0cmFjZWN0eCAqdCkKIHsKQEAgLTExNSw4ICsxMjAsMTIgQEAgc3RhdGljIGlu dCB0cmFjZV9zdGFydChzdHJ1Y3QgdHJhY2VjdHggKnQpCiAJCXJldHVybiAtRUZBVUxUOwogCX0K IAotCWV0bV9zZXR1cF9hZGRyZXNzX3JhbmdlKHQsIDEsICh1bnNpZ25lZCBsb25nKV9zdGV4dCwK LQkJCSh1bnNpZ25lZCBsb25nKV9ldGV4dCwgMCwgMCk7CisJaWYgKHQtPnJhbmdlX3N0YXJ0IHx8 IHQtPnJhbmdlX2VuZCkKKwkJZXRtX3NldHVwX2FkZHJlc3NfcmFuZ2UodCwgMSwKKwkJCQkJdC0+ cmFuZ2Vfc3RhcnQsIHQtPnJhbmdlX2VuZCwgMCwgMCk7CisJZWxzZQorCQlldG1fd3JpdGVsKHQs IEVUTVRFX0lOQ0xFWENMLCBFVE1SX1RSQUNFRU5DVFJMKTsKKwogCWV0bV93cml0ZWwodCwgMCwg RVRNUl9UUkFDRUVOQ1RSTDIpOwogCWV0bV93cml0ZWwodCwgMCwgRVRNUl9UUkFDRVNTQ1RSTCk7 CiAJZXRtX3dyaXRlbCh0LCAweDZmLCBFVE1SX1RSQUNFRU5FVlQpOwpAQCAtNTI1LDYgKzUzNCwz NSBAQCBzdGF0aWMgc3NpemVfdCB0cmFjZV9tb2RlX3N0b3JlKHN0cnVjdCBrb2JqZWN0ICprb2Jq LAogc3RhdGljIHN0cnVjdCBrb2JqX2F0dHJpYnV0ZSB0cmFjZV9tb2RlX2F0dHIgPQogCV9fQVRU Uih0cmFjZV9tb2RlLCAwNjQ0LCB0cmFjZV9tb2RlX3Nob3csIHRyYWNlX21vZGVfc3RvcmUpOwog CitzdGF0aWMgc3NpemVfdCB0cmFjZV9yYW5nZV9zaG93KHN0cnVjdCBrb2JqZWN0ICprb2JqLAor CQkJCSAgc3RydWN0IGtvYmpfYXR0cmlidXRlICphdHRyLAorCQkJCSAgY2hhciAqYnVmKQorewor CXJldHVybiBzcHJpbnRmKGJ1ZiwgIiUwOGx4ICUwOGx4XG4iLAorCQkJdHJhY2VyLnJhbmdlX3N0 YXJ0LCB0cmFjZXIucmFuZ2VfZW5kKTsKK30KKworc3RhdGljIHNzaXplX3QgdHJhY2VfcmFuZ2Vf c3RvcmUoc3RydWN0IGtvYmplY3QgKmtvYmosCisJCQkJICAgc3RydWN0IGtvYmpfYXR0cmlidXRl ICphdHRyLAorCQkJCSAgIGNvbnN0IGNoYXIgKmJ1Ziwgc2l6ZV90IG4pCit7CisJdW5zaWduZWQg bG9uZyByYW5nZV9zdGFydCwgcmFuZ2VfZW5kOworCisJaWYgKHNzY2FuZihidWYsICIlbHggJWx4 IiwgJnJhbmdlX3N0YXJ0LCAmcmFuZ2VfZW5kKSAhPSAyKQorCQlyZXR1cm4gLUVJTlZBTDsKKwor CW11dGV4X2xvY2soJnRyYWNlci5tdXRleCk7CisJdHJhY2VyLnJhbmdlX3N0YXJ0ID0gcmFuZ2Vf c3RhcnQ7CisJdHJhY2VyLnJhbmdlX2VuZCA9IHJhbmdlX2VuZDsKKwltdXRleF91bmxvY2soJnRy YWNlci5tdXRleCk7CisKKwlyZXR1cm4gbjsKK30KKworCitzdGF0aWMgc3RydWN0IGtvYmpfYXR0 cmlidXRlIHRyYWNlX3JhbmdlX2F0dHIgPQorCV9fQVRUUih0cmFjZV9yYW5nZSwgMDY0NCwgdHJh Y2VfcmFuZ2Vfc2hvdywgdHJhY2VfcmFuZ2Vfc3RvcmUpOworCiBzdGF0aWMgaW50IF9faW5pdCBl dG1fcHJvYmUoc3RydWN0IGFtYmFfZGV2aWNlICpkZXYsIHN0cnVjdCBhbWJhX2lkICppZCkKIHsK IAlzdHJ1Y3QgdHJhY2VjdHggKnQgPSAmdHJhY2VyOwpAQCAtNTc2LDYgKzYxNCwxMCBAQCBzdGF0 aWMgaW50IF9faW5pdCBldG1fcHJvYmUoc3RydWN0IGFtYmFfZGV2aWNlICpkZXYsIHN0cnVjdCBh bWJhX2lkICppZCkKIAlpZiAocmV0KQogCQlkZXZfZGJnKCZkZXYtPmRldiwgIkZhaWxlZCB0byBj cmVhdGUgdHJhY2VfbW9kZSBpbiBzeXNmc1xuIik7CiAKKwlyZXQgPSBzeXNmc19jcmVhdGVfZmls ZSgmZGV2LT5kZXYua29iaiwgJnRyYWNlX3JhbmdlX2F0dHIuYXR0cik7CisJaWYgKHJldCkKKwkJ ZGV2X2RiZygmZGV2LT5kZXYsICJGYWlsZWQgdG8gY3JlYXRlIHRyYWNlX3JhbmdlIGluIHN5c2Zz XG4iKTsKKwogCWRldl9kYmcodC0+ZGV2LCAiRVRNIEFNQkEgZHJpdmVyIGluaXRpYWxpemVkLlxu Iik7CiAKIG91dDoKQEAgLTYwNSw2ICs2NDcsNyBAQCBzdGF0aWMgaW50IGV0bV9yZW1vdmUoc3Ry dWN0IGFtYmFfZGV2aWNlICpkZXYpCiAJc3lzZnNfcmVtb3ZlX2ZpbGUoJmRldi0+ZGV2LmtvYmos ICZ0cmFjZV9ydW5uaW5nX2F0dHIuYXR0cik7CiAJc3lzZnNfcmVtb3ZlX2ZpbGUoJmRldi0+ZGV2 LmtvYmosICZ0cmFjZV9pbmZvX2F0dHIuYXR0cik7CiAJc3lzZnNfcmVtb3ZlX2ZpbGUoJmRldi0+ ZGV2LmtvYmosICZ0cmFjZV9tb2RlX2F0dHIuYXR0cik7CisJc3lzZnNfcmVtb3ZlX2ZpbGUoJmRl di0+ZGV2LmtvYmosICZ0cmFjZV9yYW5nZV9hdHRyLmF0dHIpOwogCiAJcmV0dXJuIDA7CiB9Ci0t IAoxLjcuMy4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5p bmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8v bGludXgtYXJtLWtlcm5lbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: arve@android.com (=?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?=) Date: Mon, 14 Feb 2011 22:11:12 -0800 Subject: [PATCH 4/8] ARM: etm: Allow range selection In-Reply-To: <1296701663-12168-1-git-send-email-arve@android.com> References: <1296701663-12168-1-git-send-email-arve@android.com> Message-ID: <1297750276-12475-4-git-send-email-arve@android.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Trace kernel text segment by default as before, allow tracing of other ranges by writing a range to /sys/devices/etm/trace_range, or to trace everything by writing 0 0. Signed-off-by: Arve Hj?nnev?g --- arch/arm/kernel/etm.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index bc7d8f2..8a1c422 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -40,12 +40,17 @@ struct tracectx { unsigned long flags; int ncmppairs; int etm_portsz; + unsigned long range_start; + unsigned long range_end; struct device *dev; struct clk *emu_clk; struct mutex mutex; }; -static struct tracectx tracer; +static struct tracectx tracer = { + .range_start = (unsigned long)_stext, + .range_end = (unsigned long)_etext, +}; static inline bool trace_isrunning(struct tracectx *t) { @@ -115,8 +120,12 @@ static int trace_start(struct tracectx *t) return -EFAULT; } - etm_setup_address_range(t, 1, (unsigned long)_stext, - (unsigned long)_etext, 0, 0); + if (t->range_start || t->range_end) + etm_setup_address_range(t, 1, + t->range_start, t->range_end, 0, 0); + else + etm_writel(t, ETMTE_INCLEXCL, ETMR_TRACEENCTRL); + etm_writel(t, 0, ETMR_TRACEENCTRL2); etm_writel(t, 0, ETMR_TRACESSCTRL); etm_writel(t, 0x6f, ETMR_TRACEENEVT); @@ -525,6 +534,35 @@ static ssize_t trace_mode_store(struct kobject *kobj, static struct kobj_attribute trace_mode_attr = __ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store); +static ssize_t trace_range_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + return sprintf(buf, "%08lx %08lx\n", + tracer.range_start, tracer.range_end); +} + +static ssize_t trace_range_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t n) +{ + unsigned long range_start, range_end; + + if (sscanf(buf, "%lx %lx", &range_start, &range_end) != 2) + return -EINVAL; + + mutex_lock(&tracer.mutex); + tracer.range_start = range_start; + tracer.range_end = range_end; + mutex_unlock(&tracer.mutex); + + return n; +} + + +static struct kobj_attribute trace_range_attr = + __ATTR(trace_range, 0644, trace_range_show, trace_range_store); + static int __init etm_probe(struct amba_device *dev, struct amba_id *id) { struct tracectx *t = &tracer; @@ -576,6 +614,10 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id) if (ret) dev_dbg(&dev->dev, "Failed to create trace_mode in sysfs\n"); + ret = sysfs_create_file(&dev->dev.kobj, &trace_range_attr.attr); + if (ret) + dev_dbg(&dev->dev, "Failed to create trace_range in sysfs\n"); + dev_dbg(t->dev, "ETM AMBA driver initialized.\n"); out: @@ -605,6 +647,7 @@ static int etm_remove(struct amba_device *dev) sysfs_remove_file(&dev->dev.kobj, &trace_running_attr.attr); sysfs_remove_file(&dev->dev.kobj, &trace_info_attr.attr); sysfs_remove_file(&dev->dev.kobj, &trace_mode_attr.attr); + sysfs_remove_file(&dev->dev.kobj, &trace_range_attr.attr); return 0; } -- 1.7.3.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754204Ab1BOGMF (ORCPT ); Tue, 15 Feb 2011 01:12:05 -0500 Received: from mail-px0-f174.google.com ([209.85.212.174]:40737 "EHLO mail-px0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753115Ab1BOGLy (ORCPT ); Tue, 15 Feb 2011 01:11:54 -0500 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= To: linux-arm-kernel@lists.infradead.org Cc: linux-omap@vger.kernel.org, =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Russell King , Alexander Shishkin , Jason Wessel , Greg Kroah-Hartman , linux-kernel@vger.kernel.org Subject: [PATCH 4/8] ARM: etm: Allow range selection Date: Mon, 14 Feb 2011 22:11:12 -0800 Message-Id: <1297750276-12475-4-git-send-email-arve@android.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1296701663-12168-1-git-send-email-arve@android.com> References: <1296701663-12168-1-git-send-email-arve@android.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Trace kernel text segment by default as before, allow tracing of other ranges by writing a range to /sys/devices/etm/trace_range, or to trace everything by writing 0 0. Signed-off-by: Arve Hjønnevåg --- arch/arm/kernel/etm.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 46 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/etm.c b/arch/arm/kernel/etm.c index bc7d8f2..8a1c422 100644 --- a/arch/arm/kernel/etm.c +++ b/arch/arm/kernel/etm.c @@ -40,12 +40,17 @@ struct tracectx { unsigned long flags; int ncmppairs; int etm_portsz; + unsigned long range_start; + unsigned long range_end; struct device *dev; struct clk *emu_clk; struct mutex mutex; }; -static struct tracectx tracer; +static struct tracectx tracer = { + .range_start = (unsigned long)_stext, + .range_end = (unsigned long)_etext, +}; static inline bool trace_isrunning(struct tracectx *t) { @@ -115,8 +120,12 @@ static int trace_start(struct tracectx *t) return -EFAULT; } - etm_setup_address_range(t, 1, (unsigned long)_stext, - (unsigned long)_etext, 0, 0); + if (t->range_start || t->range_end) + etm_setup_address_range(t, 1, + t->range_start, t->range_end, 0, 0); + else + etm_writel(t, ETMTE_INCLEXCL, ETMR_TRACEENCTRL); + etm_writel(t, 0, ETMR_TRACEENCTRL2); etm_writel(t, 0, ETMR_TRACESSCTRL); etm_writel(t, 0x6f, ETMR_TRACEENEVT); @@ -525,6 +534,35 @@ static ssize_t trace_mode_store(struct kobject *kobj, static struct kobj_attribute trace_mode_attr = __ATTR(trace_mode, 0644, trace_mode_show, trace_mode_store); +static ssize_t trace_range_show(struct kobject *kobj, + struct kobj_attribute *attr, + char *buf) +{ + return sprintf(buf, "%08lx %08lx\n", + tracer.range_start, tracer.range_end); +} + +static ssize_t trace_range_store(struct kobject *kobj, + struct kobj_attribute *attr, + const char *buf, size_t n) +{ + unsigned long range_start, range_end; + + if (sscanf(buf, "%lx %lx", &range_start, &range_end) != 2) + return -EINVAL; + + mutex_lock(&tracer.mutex); + tracer.range_start = range_start; + tracer.range_end = range_end; + mutex_unlock(&tracer.mutex); + + return n; +} + + +static struct kobj_attribute trace_range_attr = + __ATTR(trace_range, 0644, trace_range_show, trace_range_store); + static int __init etm_probe(struct amba_device *dev, struct amba_id *id) { struct tracectx *t = &tracer; @@ -576,6 +614,10 @@ static int __init etm_probe(struct amba_device *dev, struct amba_id *id) if (ret) dev_dbg(&dev->dev, "Failed to create trace_mode in sysfs\n"); + ret = sysfs_create_file(&dev->dev.kobj, &trace_range_attr.attr); + if (ret) + dev_dbg(&dev->dev, "Failed to create trace_range in sysfs\n"); + dev_dbg(t->dev, "ETM AMBA driver initialized.\n"); out: @@ -605,6 +647,7 @@ static int etm_remove(struct amba_device *dev) sysfs_remove_file(&dev->dev.kobj, &trace_running_attr.attr); sysfs_remove_file(&dev->dev.kobj, &trace_info_attr.attr); sysfs_remove_file(&dev->dev.kobj, &trace_mode_attr.attr); + sysfs_remove_file(&dev->dev.kobj, &trace_range_attr.attr); return 0; } -- 1.7.3.1