2023-10-09 22:56:24

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the arm-perf tree

Hi all,

After merging the arm-perf tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
164 | writel(threshold, cspmu->base0 + PMAUXR0);
| ^~~~~~
cc1: all warnings being treated as errors

Caused by commit

290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")

I have used the arm-perf tree from next-20231009 for today.

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2023-10-10 05:46:01

by Ilkka Koskinen

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the arm-perf tree


Hi Stephen,

On Mon, 9 Oct 2023, Stephen Rothwell wrote:
> Hi all,
>
> After merging the arm-perf tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
> drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
> 164 | writel(threshold, cspmu->base0 + PMAUXR0);
> | ^~~~~~
> cc1: all warnings being treated as errors
>
> Caused by commit
>
> 290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")
>
> I have used the arm-perf tree from next-20231009 for today.

Thanks for catching the bug! It doesn't seem to happen on arm64 build but
I can reproduce it on x86_64 build indeed.


Will, it seems that "#include <linux/io.h>" is missing from
ampere_cspmu.c. After that also x86_64 build goes through. How would you
like to get the bug fixed? Shall I submit a new version of the patch, and
you would replace the old patch with the new one or is it better to
create a completely new patch that only adds the missing include line?

Cheers, Ilkka

2023-10-10 17:50:30

by Will Deacon

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the arm-perf tree

On Mon, Oct 09, 2023 at 10:45:18PM -0700, Ilkka Koskinen wrote:
>
> Hi Stephen,
>
> On Mon, 9 Oct 2023, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the arm-perf tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> >
> > drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
> > drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
> > 164 | writel(threshold, cspmu->base0 + PMAUXR0);
> > | ^~~~~~
> > cc1: all warnings being treated as errors
> >
> > Caused by commit
> >
> > 290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")
> >
> > I have used the arm-perf tree from next-20231009 for today.
>
> Thanks for catching the bug! It doesn't seem to happen on arm64 build but I
> can reproduce it on x86_64 build indeed.
>
>
> Will, it seems that "#include <linux/io.h>" is missing from ampere_cspmu.c.
> After that also x86_64 build goes through. How would you like to get the bug
> fixed? Shall I submit a new version of the patch, and you would replace the
> old patch with the new one or is it better to
> create a completely new patch that only adds the missing include line?

If it's just a missing include, I can chuck a patch on top to fix it myself.
I'll double-check it resolves the problem and then update the branch.

Thanks!

Will

2023-10-10 18:14:59

by Will Deacon

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the arm-perf tree

On Tue, Oct 10, 2023 at 06:50:13PM +0100, Will Deacon wrote:
> On Mon, Oct 09, 2023 at 10:45:18PM -0700, Ilkka Koskinen wrote:
> > On Mon, 9 Oct 2023, Stephen Rothwell wrote:
> > > After merging the arm-perf tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > >
> > > drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
> > > drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
> > > 164 | writel(threshold, cspmu->base0 + PMAUXR0);
> > > | ^~~~~~
> > > cc1: all warnings being treated as errors
> > >
> > > Caused by commit
> > >
> > > 290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")
> > >
> > > I have used the arm-perf tree from next-20231009 for today.
> >
> > Thanks for catching the bug! It doesn't seem to happen on arm64 build but I
> > can reproduce it on x86_64 build indeed.
> >
> >
> > Will, it seems that "#include <linux/io.h>" is missing from ampere_cspmu.c.
> > After that also x86_64 build goes through. How would you like to get the bug
> > fixed? Shall I submit a new version of the patch, and you would replace the
> > old patch with the new one or is it better to
> > create a completely new patch that only adds the missing include line?
>
> If it's just a missing include, I can chuck a patch on top to fix it myself.
> I'll double-check it resolves the problem and then update the branch.

In the end I just fixed up your commit, as it was still on the HEAD of the
branch. Update now pushed out!

Cheers,

Will

2023-10-10 20:21:15

by Ilkka Koskinen

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the arm-perf tree


On Tue, 10 Oct 2023, Will Deacon wrote:
> On Tue, Oct 10, 2023 at 06:50:13PM +0100, Will Deacon wrote:
>> On Mon, Oct 09, 2023 at 10:45:18PM -0700, Ilkka Koskinen wrote:
>>> On Mon, 9 Oct 2023, Stephen Rothwell wrote:
>>>> After merging the arm-perf tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> drivers/perf/arm_cspmu/ampere_cspmu.c: In function 'ampere_cspmu_set_ev_filter':
>>>> drivers/perf/arm_cspmu/ampere_cspmu.c:164:9: error: implicit declaration of function 'writel' [-Werror=implicit-function-declaration]
>>>> 164 | writel(threshold, cspmu->base0 + PMAUXR0);
>>>> | ^~~~~~
>>>> cc1: all warnings being treated as errors
>>>>
>>>> Caused by commit
>>>>
>>>> 290a9c0e55f8 ("perf: arm_cspmu: ampere_cspmu: Add support for Ampere SoC PMU")
>>>>
>>>> I have used the arm-perf tree from next-20231009 for today.
>>>
>>> Thanks for catching the bug! It doesn't seem to happen on arm64 build but I
>>> can reproduce it on x86_64 build indeed.
>>>
>>>
>>> Will, it seems that "#include <linux/io.h>" is missing from ampere_cspmu.c.
>>> After that also x86_64 build goes through. How would you like to get the bug
>>> fixed? Shall I submit a new version of the patch, and you would replace the
>>> old patch with the new one or is it better to
>>> create a completely new patch that only adds the missing include line?
>>
>> If it's just a missing include, I can chuck a patch on top to fix it myself.
>> I'll double-check it resolves the problem and then update the branch.
>
> In the end I just fixed up your commit, as it was still on the HEAD of the
> branch. Update now pushed out!
>
> Cheers,
>
> Will

Sounds perfect! Thank you Will, much appreciated!

Cheers, Ilkka