Hi,
On Mon, Oct 24, 2011 at 11:08 PM, Will Deacon <will.deacon@xxxxxxx> wrote:
> Hi Ming Lei,
>
> On Mon, Oct 24, 2011 at 03:45:55PM +0100, ming.lei@xxxxxxxxxxxxx wrote:
>> From: Ming Lei <ming.lei@xxxxxxxxxxxxx>
>>
>> omap4 may create device via hwmod, which can create resources
>> automatically, so may include some non-irq resources.
>>
>> This patch supports device with other non-irq resources.
>
> I'd rather not do this in the Perf code since we're essentially dealing with
> an artifact of the hwmod -> platform_device conversion.
>
>> Signed-off-by: Ming Lei <ming.lei@xxxxxxxxxxxxx>
>> ---
>> arch/arm/kernel/perf_event.c | 5 +++--
>> arch/arm/kernel/pmu.c | 12 ++++++++++--
>> 2 files changed, 13 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
>> index f367780..d91dba2 100644
>> --- a/arch/arm/kernel/perf_event.c
>> +++ b/arch/arm/kernel/perf_event.c
>> @@ -19,6 +19,7 @@
>> #include <linux/platform_device.h>
>> #include <linux/spinlock.h>
>> #include <linux/uaccess.h>
>> +#include <linux/cpumask.h>
>>
>> #include <asm/cputype.h>
>> #include <asm/irq.h>
>> @@ -414,7 +415,7 @@ armpmu_reserve_hardware(void)
>> return -ENODEV;
>> }
>>
>> - for (i = 0; i < pmu_device->num_resources; ++i) {
>> + for (i = 0; i < nr_cpu_ids; ++i) {
>> irq = platform_get_irq(pmu_device, i);
>> if (irq < 0)
>> continue;
>
> Hmm, I actually changed this code recently. Take a look:
>
> https://github.com/wdeacon/linux-wd/blob/perf/system-pmus/arch/arm/kernel/perf_event.c
>
> This should all be in for 3.2-rc1, so you can rebase then. If you still have
> hwmod issues, please solve them outside of perf_event.c
Looks your patch has solved the problem, so the patch is not needed
any more.
I will try to rebase the patchset on your tree first.
>> diff --git a/arch/arm/kernel/pmu.c b/arch/arm/kernel/pmu.c
>> index c53474f..0e9c908 100644
>> --- a/arch/arm/kernel/pmu.c
>> +++ b/arch/arm/kernel/pmu.c
>> @@ -19,6 +19,7 @@
>> #include <linux/module.h>
>> #include <linux/of_device.h>
>> #include <linux/platform_device.h>
>> +#include <linux/cpumask.h>
>
> 'fraid I've changed this file too!
>
> https://github.com/wdeacon/linux-wd/blob/perf/system-pmus/arch/arm/kernel/pmu.c
>
> Will
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
thanks,
--
Ming Lei
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
