From: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
To: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Vineet.Gupta1@synopsys.com,
arc-linux-dev@synopsys.com, arnd@arndb.de, peterz@infradead.org,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Subject: [PATCH v2 2/8] ARC: perf: cap the number of counters to hardware max of 32
Date: Wed, 5 Aug 2015 18:13:28 +0300 [thread overview]
Message-ID: <1438787614-14074-3-git-send-email-abrodkin@synopsys.com> (raw)
In-Reply-To: <1438787614-14074-1-git-send-email-abrodkin@synopsys.com>
From: Vineet Gupta <vgupta@synopsys.com>
The number of counters in PCT can never be more than 32 (while countable
conditions could be 100+) for both ARCompact and ARCv2
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
---
No changes since v1.
arch/arc/include/asm/perf_event.h | 5 +++--
arch/arc/kernel/perf_event.c | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arc/include/asm/perf_event.h b/arch/arc/include/asm/perf_event.h
index ea43477..ca8c414 100644
--- a/arch/arc/include/asm/perf_event.h
+++ b/arch/arc/include/asm/perf_event.h
@@ -1,6 +1,7 @@
/*
* Linux performance counter support for ARC
*
+ * Copyright (C) 2014-2015 Synopsys, Inc. (www.synopsys.com)
* Copyright (C) 2011-2013 Synopsys, Inc. (www.synopsys.com)
*
* This program is free software; you can redistribute it and/or modify
@@ -12,8 +13,8 @@
#ifndef __ASM_PERF_EVENT_H
#define __ASM_PERF_EVENT_H
-/* real maximum varies per CPU, this is the maximum supported by the driver */
-#define ARC_PMU_MAX_HWEVENTS 64
+/* Max number of counters that PCT block may ever have */
+#define ARC_PERF_MAX_COUNTERS 32
/* Max number of countable events that CPU may have */
#define ARC_PERF_MAX_EVENTS 256
diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
index ae4a921..461fccf 100644
--- a/arch/arc/kernel/perf_event.c
+++ b/arch/arc/kernel/perf_event.c
@@ -23,7 +23,7 @@ struct arc_pmu {
int counter_size; /* in bits */
int n_counters;
int n_events;
- unsigned long used_mask[BITS_TO_LONGS(ARC_PMU_MAX_HWEVENTS)];
+ unsigned long used_mask[BITS_TO_LONGS(ARC_PERF_MAX_COUNTERS)];
int ev_hw_idx[PERF_COUNT_ARC_HW_MAX];
u64 raw_events[ARC_PERF_MAX_EVENTS];
};
@@ -306,7 +306,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev)
pr_err("This core does not have performance counters!\n");
return -ENODEV;
}
- BUG_ON(pct_bcr.c > ARC_PMU_MAX_HWEVENTS);
+ BUG_ON(pct_bcr.c > ARC_PERF_MAX_COUNTERS);
READ_BCR(ARC_REG_CC_BUILD, cc_bcr);
BUG_ON(!cc_bcr.v); /* Counters exist but No countable conditions ? */
--
2.4.3
next prev parent reply other threads:[~2015-08-05 15:14 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-05 15:13 [PATCH v2 0/8] ARCv2 port to Linux - (C) perf Alexey Brodkin
2015-08-05 15:13 ` [PATCH v2 1/8] ARC: perf: support RAW events Alexey Brodkin
2015-08-05 15:13 ` Alexey Brodkin [this message]
2015-08-05 15:13 ` [PATCH v2 3/8] ARCv2: perf: implement "event_set_period" for future use with interrupts Alexey Brodkin
2015-08-18 17:52 ` Peter Zijlstra
2015-08-18 18:03 ` Alexey Brodkin
2015-08-20 10:46 ` Alexey Brodkin
2015-08-18 17:55 ` Peter Zijlstra
2015-08-20 11:25 ` Alexey Brodkin
2015-08-05 15:13 ` [PATCH v2 4/8] ARCv2: perf: Support sampling events using overflow interrupts Alexey Brodkin
2015-08-18 22:12 ` Peter Zijlstra
2015-08-20 11:30 ` Alexey Brodkin
2015-08-05 15:13 ` [PATCH v2 5/8] ARCv2: perf: set usable max period as a half of real max period Alexey Brodkin
2015-08-05 15:13 ` [PATCH v2 6/8] ARCv2: perf: implement exclusion of event counting in user or kernel mode Alexey Brodkin
2015-08-18 23:37 ` Peter Zijlstra
2015-08-20 11:33 ` Alexey Brodkin
2015-08-05 15:13 ` [PATCH v2 7/8] ARCv2: perf: SMP support Alexey Brodkin
2015-08-05 15:13 ` [PATCH v2 8/8] ARCv2: perf: Finally introduce HS perf unit Alexey Brodkin
2015-08-10 8:29 ` [PATCH v2 0/8] ARCv2 port to Linux - (C) perf Alexey Brodkin
2015-08-14 7:41 ` [arc-linux-dev] " Vineet Gupta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1438787614-14074-3-git-send-email-abrodkin@synopsys.com \
--to=alexey.brodkin@synopsys.com \
--cc=Vineet.Gupta1@synopsys.com \
--cc=acme@kernel.org \
--cc=arc-linux-dev@synopsys.com \
--cc=arnd@arndb.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).