* [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7
@ 2012-09-11 8:05 Simon Horman
2012-09-11 8:05 ` [PATCH 1/2] ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit) Simon Horman
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Simon Horman @ 2012-09-11 8:05 UTC (permalink / raw)
To: linux-arm-kernel
Hi Will,
please consider the following changes from Kobayashi-san
for the pmu/cleanup branch.
----------------------------------------------------------------
The following changes since commit 051f1b13144dd8553d5a5104dde94c7263ae3ba7:
ARM: perf: move irq registration into pmu implementation (2012-08-23 11:35:52 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pmu/cleanup
for you to fetch changes up to e433d4440bf7dd5955a4616cfb9bffd1ec6ab839:
ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit) (2012-09-11 16:27:41 +0900)
----------------------------------------------------------------
Tetsuyuki Kobayashi (2):
ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
arch/arm/configs/kzm9d_defconfig | 1 +
arch/arm/configs/kzm9g_defconfig | 1 +
arch/arm/mach-shmobile/setup-emev2.c | 21 +++++++++++++++++++++
arch/arm/mach-shmobile/setup-sh73a0.c | 21 +++++++++++++++++++++
4 files changed, 44 insertions(+)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
2012-09-11 8:05 [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Simon Horman
@ 2012-09-11 8:05 ` Simon Horman
2012-09-11 8:05 ` [PATCH 2/2] ARM: shmobile: emev2: " Simon Horman
2012-09-11 8:49 ` [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Will Deacon
2 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2012-09-11 8:05 UTC (permalink / raw)
To: linux-arm-kernel
From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
This patch enables PMU(Performance Monitoring Unit) for sh73a0.
Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/kzm9g_defconfig | 1 +
arch/arm/mach-shmobile/setup-sh73a0.c | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/arch/arm/configs/kzm9g_defconfig b/arch/arm/configs/kzm9g_defconfig
index 2388c86..5d0c667 100644
--- a/arch/arm/configs/kzm9g_defconfig
+++ b/arch/arm/configs/kzm9g_defconfig
@@ -14,6 +14,7 @@ CONFIG_NAMESPACES=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y
CONFIG_MODULES=y
CONFIG_MODULE_FORCE_LOAD=y
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index d230af6..38ed2dd 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -734,6 +734,26 @@ static struct platform_device mpdma0_device = {
},
};
+static struct resource pmu_resources[] = {
+ [0] = {
+ .start = gic_spi(55),
+ .end = gic_spi(55),
+ .flags = IORESOURCE_IRQ,
+ },
+ [1] = {
+ .start = gic_spi(56),
+ .end = gic_spi(56),
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device pmu_device = {
+ .name = "arm-pmu",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(pmu_resources),
+ .resource = pmu_resources,
+};
+
static struct platform_device *sh73a0_early_devices[] __initdata = {
&scif0_device,
&scif1_device,
@@ -757,6 +777,7 @@ static struct platform_device *sh73a0_late_devices[] __initdata = {
&i2c4_device,
&dma0_device,
&mpdma0_device,
+ &pmu_device,
};
#define SRCR2 0xe61580b0
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
2012-09-11 8:05 [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Simon Horman
2012-09-11 8:05 ` [PATCH 1/2] ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit) Simon Horman
@ 2012-09-11 8:05 ` Simon Horman
2012-09-11 8:49 ` [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Will Deacon
2 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2012-09-11 8:05 UTC (permalink / raw)
To: linux-arm-kernel
From: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
This patch enables PMU(Performance Monitoring Unit) for emev2.
Signed-off-by: Tetsuyuki Kobayashi <koba@kmckk.co.jp>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/configs/kzm9d_defconfig | 1 +
arch/arm/mach-shmobile/setup-emev2.c | 21 +++++++++++++++++++++
2 files changed, 22 insertions(+)
diff --git a/arch/arm/configs/kzm9d_defconfig b/arch/arm/configs/kzm9d_defconfig
index 26146ff..8c49df6 100644
--- a/arch/arm/configs/kzm9d_defconfig
+++ b/arch/arm/configs/kzm9d_defconfig
@@ -8,6 +8,7 @@ CONFIG_LOG_BUF_SHIFT\x16
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_SYSCTL_SYSCALL=y
CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
CONFIG_SLAB=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index dae9aa6..61446f3 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -356,6 +356,26 @@ static struct platform_device gio4_device = {
},
};
+static struct resource pmu_resources[] = {
+ [0] = {
+ .start = 152,
+ .end = 152,
+ .flags = IORESOURCE_IRQ,
+ },
+ [1] = {
+ .start = 153,
+ .end = 153,
+ .flags = IORESOURCE_IRQ,
+ },
+};
+
+static struct platform_device pmu_device = {
+ .name = "arm-pmu",
+ .id = -1,
+ .num_resources = ARRAY_SIZE(pmu_resources),
+ .resource = pmu_resources,
+};
+
static struct platform_device *emev2_early_devices[] __initdata = {
&uart0_device,
&uart1_device,
@@ -370,6 +390,7 @@ static struct platform_device *emev2_late_devices[] __initdata = {
&gio2_device,
&gio3_device,
&gio4_device,
+ &pmu_device,
};
void __init emev2_add_standard_devices(void)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7
2012-09-11 8:05 [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Simon Horman
2012-09-11 8:05 ` [PATCH 1/2] ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit) Simon Horman
2012-09-11 8:05 ` [PATCH 2/2] ARM: shmobile: emev2: " Simon Horman
@ 2012-09-11 8:49 ` Will Deacon
2012-09-11 9:03 ` Simon Horman
2012-09-12 6:08 ` Olof Johansson
2 siblings, 2 replies; 6+ messages in thread
From: Will Deacon @ 2012-09-11 8:49 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 09:05:25AM +0100, Simon Horman wrote:
> Hi Will,
Hi Simon,
> please consider the following changes from Kobayashi-san
> for the pmu/cleanup branch.
Thanks for this. It probably makes more sense for the arm-soc guys to pull
it in directly, rather than me send it as another pull request.
Arnd, Olof -- can you pull this into an shmobile perf branch please?
Will
> ----------------------------------------------------------------
> The following changes since commit 051f1b13144dd8553d5a5104dde94c7263ae3ba7:
>
> ARM: perf: move irq registration into pmu implementation (2012-08-23 11:35:52 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pmu/cleanup
>
> for you to fetch changes up to e433d4440bf7dd5955a4616cfb9bffd1ec6ab839:
>
> ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit) (2012-09-11 16:27:41 +0900)
>
> ----------------------------------------------------------------
> Tetsuyuki Kobayashi (2):
> ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
> ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
>
> arch/arm/configs/kzm9d_defconfig | 1 +
> arch/arm/configs/kzm9g_defconfig | 1 +
> arch/arm/mach-shmobile/setup-emev2.c | 21 +++++++++++++++++++++
> arch/arm/mach-shmobile/setup-sh73a0.c | 21 +++++++++++++++++++++
> 4 files changed, 44 insertions(+)
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7
2012-09-11 8:49 ` [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Will Deacon
@ 2012-09-11 9:03 ` Simon Horman
2012-09-12 6:08 ` Olof Johansson
1 sibling, 0 replies; 6+ messages in thread
From: Simon Horman @ 2012-09-11 9:03 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 09:49:14AM +0100, Will Deacon wrote:
> On Tue, Sep 11, 2012 at 09:05:25AM +0100, Simon Horman wrote:
> > Hi Will,
>
> Hi Simon,
>
> > please consider the following changes from Kobayashi-san
> > for the pmu/cleanup branch.
>
> Thanks for this. It probably makes more sense for the arm-soc guys to pull
> it in directly, rather than me send it as another pull request.
Sorry, I was a bit confused about who does the pulling,
naturally that is fine by me.
>
> Arnd, Olof -- can you pull this into an shmobile perf branch please?
>
> Will
>
> > ----------------------------------------------------------------
> > The following changes since commit 051f1b13144dd8553d5a5104dde94c7263ae3ba7:
> >
> > ARM: perf: move irq registration into pmu implementation (2012-08-23 11:35:52 +0100)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git pmu/cleanup
> >
> > for you to fetch changes up to e433d4440bf7dd5955a4616cfb9bffd1ec6ab839:
> >
> > ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit) (2012-09-11 16:27:41 +0900)
> >
> > ----------------------------------------------------------------
> > Tetsuyuki Kobayashi (2):
> > ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit)
> > ARM: shmobile: emev2: enable PMU(Performance Monitoring Unit)
> >
> > arch/arm/configs/kzm9d_defconfig | 1 +
> > arch/arm/configs/kzm9g_defconfig | 1 +
> > arch/arm/mach-shmobile/setup-emev2.c | 21 +++++++++++++++++++++
> > arch/arm/mach-shmobile/setup-sh73a0.c | 21 +++++++++++++++++++++
> > 4 files changed, 44 insertions(+)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7
2012-09-11 8:49 ` [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Will Deacon
2012-09-11 9:03 ` Simon Horman
@ 2012-09-12 6:08 ` Olof Johansson
1 sibling, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2012-09-12 6:08 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Sep 11, 2012 at 1:49 AM, Will Deacon <will.deacon@arm.com> wrote:
> On Tue, Sep 11, 2012 at 09:05:25AM +0100, Simon Horman wrote:
>> Hi Will,
>
> Hi Simon,
>
>> please consider the following changes from Kobayashi-san
>> for the pmu/cleanup branch.
>
> Thanks for this. It probably makes more sense for the arm-soc guys to pull
> it in directly, rather than me send it as another pull request.
>
> Arnd, Olof -- can you pull this into an shmobile perf branch please?
Done, pulled in as renesas/pmu, part of next/soc with proper dependencies.
Thanks,
-Olof
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-12 6:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-11 8:05 [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Simon Horman
2012-09-11 8:05 ` [PATCH 1/2] ARM: shmobile: sh73a0: enable PMU(Performance Monitoring Unit) Simon Horman
2012-09-11 8:05 ` [PATCH 2/2] ARM: shmobile: emev2: " Simon Horman
2012-09-11 8:49 ` [GIT] Renesas ARM-based SoC: pmu/cleanup for 3.7 Will Deacon
2012-09-11 9:03 ` Simon Horman
2012-09-12 6:08 ` Olof Johansson
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).