Skip to contentSkip to conversation

ARM: fix mistaken dependency for CPU_HAS_PMU

PATCH In review tom.leiming at gmail.com 2 participants 6 messages May 18, 2011 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: fix mistaken dependency for CPU_HAS_PMU

From: Ming Lei <[email protected]>

Obviously it is mistake for CPU_HAS_PMU to depend on (!ARCH_OMAP3 || OMAP3_EMU).

No mattery it is omap3 or not, we can build pmu.o into kernel safely. In fact, arm-v7 of omap3 has pmu inside also.

So fix it that we can build pmu into kernel to support perf for some valid config(such as enable both omap4 and omap3, but OMAP3_EMU).

Cc Will Deacon <[email protected]>
Cc linux-omap at vger.kernel.org
---
 arch/arm/Kconfig |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
arch/arm/Kconfig +1 -2
index 377a7a5..ba314d5 100644
@@ -1061,8 +1061,7 @@ config XSCALE_PMU
 	default y
 
 config CPU_HAS_PMU
-	depends on (CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU) && \
-		   (!ARCH_OMAP3 || OMAP3_EMU)
+	depends on CPU_V6 || CPU_V6K || CPU_V7 || XSCALE_PMU
 	default y
 	bool
 
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/1 ARM: fix mistaken dependency for CPU_HAS_PMU

Hi,

Quoted 4 lines

From: Ming Lei <[email protected]>

Obviously it is mistake for CPU_HAS_PMU to depend on (!ARCH_OMAP3 || OMAP3_EMU).

It's not that obvious!

Quoted 3 lines

No mattery it is omap3 or not, we can build pmu.o into kernel safely. In fact, arm-v7 of omap3 has pmu inside also.

Yes, but the PMU on Omap3 doesn't work unless you enable the emu clk, which is done in kernel/etm.c. Rather than duplicate that code (which only seems to be needed for Omap anyway) I decided to add a dependency on OMAP3_EMU so the clock gets enabled in etb_probe.

Quoted 3 lines

So fix it that we can build pmu into kernel to support perf for some valid config(such as enable both omap4 and omap3, but OMAP3_EMU).

No, I don't like this. The reason I don't like it is because it will lead to lots of bug reports that perf doesn't work on Omap3 because they haven't got the emu clock ticking. It was this scenario that led to the dependency being introduced in the first place:

8954bb0d ("OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU")

Is there a problem building the etm support for Omap4?

Will

#2 lore raw
In reply to tom.leiming at gmail.com

Hi,

Quoted 4 lines

From: Ming Lei <[email protected]>

Obviously it is mistake for CPU_HAS_PMU to depend on (!ARCH_OMAP3 || OMAP3_EMU).

It's not that obvious!

Quoted 3 lines

No mattery it is omap3 or not, we can build pmu.o into kernel safely. In fact, arm-v7 of omap3 has pmu inside also.

Yes, but the PMU on Omap3 doesn't work unless you enable the emu clk, which is done in kernel/etm.c. Rather than duplicate that code (which only seems to be needed for Omap anyway) I decided to add a dependency on OMAP3_EMU so the clock gets enabled in etb_probe.

Quoted 3 lines

So fix it that we can build pmu into kernel to support perf for some valid config(such as enable both omap4 and omap3, but OMAP3_EMU).

No, I don't like this. The reason I don't like it is because it will lead to lots of bug reports that perf doesn't work on Omap3 because they haven't got the emu clock ticking. It was this scenario that led to the dependency being introduced in the first place:

8954bb0d ("OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU")

Is there a problem building the etm support for Omap4?

Will

A message that is not in the archive (sent off-list or not yet received): 4785097973995347565@unknownmsgid

author
#4 lore raw

PATCH 1/1 ARM: fix mistaken dependency for CPU_HAS_PMU

Hi,

2011/5/18 Will Deacon <[email protected]>:

Quoted 8 lines

Hi,

Quoted 4 lines

From: Ming Lei <[email protected]>

Obviously it is mistake for CPU_HAS_PMU to depend on (!ARCH_OMAP3 || OMAP3_EMU).

It's not that obvious!

No, on ubuntu 11.04, default config options enables ARCH_OMAP3 and ARCH_OMAP4, and disable OMAP3_EMU, so cause pmu.o can't be built in kernel.

pmu.o is just a platform driver for pmu device, so we should always allow it to be built into kernel no matter there are pmu devices or not, so we can support multiple boards with one same image.

Quoted 14 lines
Quoted 4 lines

No mattery it is omap3 or not, we can build pmu.o into kernel safely. In fact, arm-v7 of omap3 has pmu inside also.

Yes, but the PMU on Omap3 doesn't work unless you enable the emu clk, which is done in kernel/etm.c. Rather than duplicate that code (which only seems to be needed for Omap anyway) I decided to add a dependency on OMAP3_EMU so the clock gets enabled in etb_probe.

Quoted 3 lines

So fix it that we can build pmu into kernel to support perf for some valid config(such as enable both omap4 and omap3, but OMAP3_EMU).

Quoted 6 lines

No, I don't like this. The reason I don't like it is because it will lead to lots of bug reports that perf doesn't work on Omap3 because they haven't got the emu clock ticking. It was this scenario that led to the dependency being introduced in the first place:

8954bb0d ("OMAP3: pmu: make CPU_HAS_PMU dependent on OMAP3_EMU")

I don't think it is good fix.

In fact, we should keep arch/arm/Kconfig or arch/arm/kernel/pmu.c more generic, and avoid to make arm core code depend on machines options as far as possible.

For the pmu issue on omap3, below fix should be better than what 8954bb0d did, shouldn't it?

arch/arm/mach-omap2/devices.c +5 -2
index 7b85585..c20a3a3 100644
@@ -410,9 +410,12 @@ static void omap_init_pmu(void)
 {
 	if (cpu_is_omap24xx())
 		omap_pmu_device.resource = &omap2_pmu_resource;
-	else if (cpu_is_omap34xx())
+	else if (cpu_is_omap34xx()) {
 		omap_pmu_device.resource = &omap3_pmu_resource;
-	else
+#ifndef  CONFIG_OMAP3_EMU
+		return;
+#endif
+	} else
 		return;
 
 	platform_device_register(&omap_pmu_device);
Quoted 1 line

Is there a problem building the etm support for Omap4?

Of course, there is the problem I described above.

thanks,

Signature · 1 line
Ming Lei
#5 lore raw

PATCH 1/1 ARM: fix mistaken dependency for CPU_HAS_PMU

Quoted 7 lines
Quoted 6 lines
Quoted 4 lines

From: Ming Lei <[email protected]>

Obviously it is mistake for CPU_HAS_PMU to depend on (!ARCH_OMAP3 || OMAP3_EMU).

It's not that obvious!

Quoted 7 lines

No, on ubuntu 11.04, default config options enables ARCH_OMAP3 and ARCH_OMAP4, and disable OMAP3_EMU, so cause pmu.o can't be built in kernel.

pmu.o is just a platform driver for pmu device, so we should always allow it to be built into kernel no matter there are pmu devices or not, so we can support multiple boards with one same image.

CPU_HAS_PMU is also used as a condition for enabling HW_PERF_EVENTS. I don't think we should set that for configurations where the platform doesn't provide working hardware counters.

On top of that, pmu.o provides a reservation mechanism for the PMU which is used by tools such as perf and LTTng. If CPU_HAS_PMU is not set then you will get back -ENODEV, which I think is better than providing access to a PMU that's not working.

Quoted 15 lines

In fact, we should keep arch/arm/Kconfig or arch/arm/kernel/pmu.c more generic, and avoid to make arm core code depend on machines options as far as possible.

For the pmu issue on omap3, below fix should be better than what 8954bb0d did, shouldn't it?

arch/arm/mach-omap2/devices.c +0 -1
index 7b85585..c20a3a3 100644
@@ -410,9 +410,12 @@ static void omap_init_pmu(void)
 {
 	if (cpu_is_omap24xx())
 		omap_pmu_device.resource = &omap2_pmu_resource;
-	else if (cpu_is_omap34xx())

arch/arm/mach-omap2/devices.c static void omap_init_pmu(void) · line 421

Quoted 10 lines
arch/arm/mach-omap2/devices.c +5 -1
+	else if (cpu_is_omap34xx()) {
 		omap_pmu_device.resource = &omap3_pmu_resource;
-	else
+#ifndef  CONFIG_OMAP3_EMU
+		return;
+#endif
+	} else
 		return;
 
 	platform_device_register(&omap_pmu_device);

The problem with this is that it still allows users to build kernels where perf is enabled but doesn't work. Since we know this is the case at build time, we have chance to stop them doing it then (or at least not let them select HW_PERF_EVENTS).

Quoted 3 lines
Quoted 1 line

Is there a problem building the etm support for Omap4?

Of course, there is the problem I described above.

What I mean is, why can't you just select OMAP3_EMU in your Omap3/4 combined kernel config? Then everything should work.

Will

#6 lore raw
In reply to Ming Lei
Quoted 7 lines
Quoted 6 lines
Quoted 4 lines

From: Ming Lei <[email protected]>

Obviously it is mistake for CPU_HAS_PMU to depend on (!ARCH_OMAP3 || OMAP3_EMU).

It's not that obvious!

Quoted 7 lines

No, on ubuntu 11.04, default config options enables ARCH_OMAP3 and ARCH_OMAP4, and disable OMAP3_EMU, so cause pmu.o can't be built in kernel.

pmu.o is just a platform driver for pmu device, so we should always allow it to be built into kernel no matter there are pmu devices or not, so we can support multiple boards with one same image.

CPU_HAS_PMU is also used as a condition for enabling HW_PERF_EVENTS. I don't think we should set that for configurations where the platform doesn't provide working hardware counters.

On top of that, pmu.o provides a reservation mechanism for the PMU which is used by tools such as perf and LTTng. If CPU_HAS_PMU is not set then you will get back -ENODEV, which I think is better than providing access to a PMU that's not working.

Quoted 15 lines

In fact, we should keep arch/arm/Kconfig or arch/arm/kernel/pmu.c more generic, and avoid to make arm core code depend on machines options as far as possible.

For the pmu issue on omap3, below fix should be better than what 8954bb0d did, shouldn't it?

arch/arm/mach-omap2/devices.c +0 -1
index 7b85585..c20a3a3 100644
@@ -410,9 +410,12 @@ static void omap_init_pmu(void)
 {
 	if (cpu_is_omap24xx())
 		omap_pmu_device.resource = &omap2_pmu_resource;
-	else if (cpu_is_omap34xx())

arch/arm/mach-omap2/devices.c static void omap_init_pmu(void) · line 421

Quoted 10 lines
arch/arm/mach-omap2/devices.c +5 -1
+	else if (cpu_is_omap34xx()) {
 		omap_pmu_device.resource = &omap3_pmu_resource;
-	else
+#ifndef  CONFIG_OMAP3_EMU
+		return;
+#endif
+	} else
 		return;
 
 	platform_device_register(&omap_pmu_device);

The problem with this is that it still allows users to build kernels where perf is enabled but doesn't work. Since we know this is the case at build time, we have chance to stop them doing it then (or at least not let them select HW_PERF_EVENTS).

Quoted 3 lines
Quoted 1 line

Is there a problem building the etm support for Omap4?

Of course, there is the problem I described above.

What I mean is, why can't you just select OMAP3_EMU in your Omap3/4 combined kernel config? Then everything should work.

Will