* linux-next: build failure after merge of the kspp tree
@ 2024-09-09 9:59 Stephen Rothwell
2024-09-09 10:05 ` ✓ CI.Patch_applied: success for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Stephen Rothwell @ 2024-09-09 9:59 UTC (permalink / raw)
To: Kees Cook, Lucas De Marchi, Thomas Hellström
Cc: Riana Tauro, Rodrigo Vivi, Michal Wajdeczko, DRM XE List,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1960 bytes --]
Hi all,
After merging the kspp tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/xe/xe_gt_idle.c:56:27: error: redefinition of 'str_up_down'
56 | static inline const char *str_up_down(bool v)
| ^~~~~~~~~~~
In file included from include/linux/string_helpers.h:7,
from drivers/gpu/drm/xe/xe_assert.h:9,
from drivers/gpu/drm/xe/xe_force_wake.h:9,
from drivers/gpu/drm/xe/xe_gt_idle.c:8:
include/linux/string_choices.h:62:27: note: previous definition of 'str_up_down' with type 'const char *(bool)' {aka 'const char *(_Bool)'}
62 | static inline const char *str_up_down(bool v)
| ^~~~~~~~~~~
Caused by commit
a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")
interacting with commit
0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")
from the drm-xe tree.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Sep 2024 19:40:17 +1000
Subject: [PATCH] fix up for "lib/string_choices: Add str_up_down() helper"
interacting wit commit "drm/xe/xe_gt_idle: add debugfs entry for
powergating info" from the drm-xe tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/gpu/drm/xe/xe_gt_idle.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
index 85a35ed153a3..0f98c1539c64 100644
--- a/drivers/gpu/drm/xe/xe_gt_idle.c
+++ b/drivers/gpu/drm/xe/xe_gt_idle.c
@@ -53,11 +53,6 @@ pc_to_xe(struct xe_guc_pc *pc)
return gt_to_xe(gt);
}
-static inline const char *str_up_down(bool v)
-{
- return v ? "up" : "down";
-}
-
static const char *gt_idle_state_to_string(enum xe_gt_idle_state state)
{
switch (state) {
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread* ✓ CI.Patch_applied: success for linux-next: build failure after merge of the kspp tree
2024-09-09 9:59 linux-next: build failure after merge of the kspp tree Stephen Rothwell
@ 2024-09-09 10:05 ` Patchwork
2024-09-09 10:05 ` ✗ CI.checkpatch: warning " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2024-09-09 10:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-xe
== Series Details ==
Series: linux-next: build failure after merge of the kspp tree
URL : https://patchwork.freedesktop.org/series/138397/
State : success
== Summary ==
=== Applying kernel patches on branch 'drm-tip' with base: ===
Base commit: 62212ed3e756 drm-tip: 2024y-09m-09d-09h-27m-03s UTC integration manifest
=== git am output follows ===
Applying: linux-next: build failure after merge of the kspp tree
^ permalink raw reply [flat|nested] 6+ messages in thread* ✗ CI.checkpatch: warning for linux-next: build failure after merge of the kspp tree
2024-09-09 9:59 linux-next: build failure after merge of the kspp tree Stephen Rothwell
2024-09-09 10:05 ` ✓ CI.Patch_applied: success for " Patchwork
@ 2024-09-09 10:05 ` Patchwork
2024-09-09 10:05 ` ✗ CI.KUnit: failure " Patchwork
2024-09-18 23:27 ` Stephen Rothwell
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2024-09-09 10:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-xe
== Series Details ==
Series: linux-next: build failure after merge of the kspp tree
URL : https://patchwork.freedesktop.org/series/138397/
State : warning
== Summary ==
+ KERNEL=/kernel
+ git clone https://gitlab.freedesktop.org/drm/maintainer-tools mt
Cloning into 'mt'...
warning: redirecting to https://gitlab.freedesktop.org/drm/maintainer-tools.git/
+ git -C mt rev-list -n1 origin/master
c62d7e164862503a3662a095da1c6c9014248cb2
+ cd /kernel
+ git config --global --add safe.directory /kernel
+ git log -n1
commit 5da43ee5f5eb6adb37b1999e068bea3fe1f5ccfa
Author: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon Sep 9 19:59:39 2024 +1000
linux-next: build failure after merge of the kspp tree
Hi all,
After merging the kspp tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/gpu/drm/xe/xe_gt_idle.c:56:27: error: redefinition of 'str_up_down'
56 | static inline const char *str_up_down(bool v)
| ^~~~~~~~~~~
In file included from include/linux/string_helpers.h:7,
from drivers/gpu/drm/xe/xe_assert.h:9,
from drivers/gpu/drm/xe/xe_force_wake.h:9,
from drivers/gpu/drm/xe/xe_gt_idle.c:8:
include/linux/string_choices.h:62:27: note: previous definition of 'str_up_down' with type 'const char *(bool)' {aka 'const char *(_Bool)'}
62 | static inline const char *str_up_down(bool v)
| ^~~~~~~~~~~
Caused by commit
a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")
interacting with commit
0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")
from the drm-xe tree.
I have applied the following patch for today.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 9 Sep 2024 19:40:17 +1000
Subject: [PATCH] fix up for "lib/string_choices: Add str_up_down() helper"
interacting wit commit "drm/xe/xe_gt_idle: add debugfs entry for
powergating info" from the drm-xe tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
+ /mt/dim checkpatch 62212ed3e75612eb3e50899f90c81922a0a76220 drm-intel
5da43ee5f5eb linux-next: build failure after merge of the kspp tree
-:28: WARNING:COMMIT_LOG_LONG_LINE: Prefer a maximum 75 chars per line (possible unwrapped commit description?)
#28:
0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")
-:28: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")'
#28:
0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")
total: 1 errors, 1 warnings, 0 checks, 11 lines checked
^ permalink raw reply [flat|nested] 6+ messages in thread* ✗ CI.KUnit: failure for linux-next: build failure after merge of the kspp tree
2024-09-09 9:59 linux-next: build failure after merge of the kspp tree Stephen Rothwell
2024-09-09 10:05 ` ✓ CI.Patch_applied: success for " Patchwork
2024-09-09 10:05 ` ✗ CI.checkpatch: warning " Patchwork
@ 2024-09-09 10:05 ` Patchwork
2024-09-18 23:27 ` Stephen Rothwell
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2024-09-09 10:05 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: intel-xe
== Series Details ==
Series: linux-next: build failure after merge of the kspp tree
URL : https://patchwork.freedesktop.org/series/138397/
State : failure
== Summary ==
+ trap cleanup EXIT
+ /kernel/tools/testing/kunit/kunit.py run --kunitconfig /kernel/drivers/gpu/drm/xe/.kunitconfig
ERROR:root:../drivers/gpu/drm/xe/xe_gt_idle.c: In function ‘xe_gt_idle_pg_print’:
../drivers/gpu/drm/xe/xe_gt_idle.c:225:7: error: implicit declaration of function ‘str_up_down’ [-Werror=implicit-function-declaration]
225 | str_up_down(pg_status & RENDER_AWAKE_STATUS));
| ^~~~~~~~~~~
../drivers/gpu/drm/xe/xe_gt_idle.c:224:45: warning: format ‘%s’ expects argument of type ‘char *’, but argument 3 has type ‘int’ [-Wformat=]
224 | drm_printf(p, "Render Power Gate Status: %s\n",
| ~^
| |
| char *
| %d
225 | str_up_down(pg_status & RENDER_AWAKE_STATUS));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| int
../drivers/gpu/drm/xe/xe_gt_idle.c:238:54: warning: format ‘%s’ expects argument of type ‘char *’, but argument 4 has type ‘int’ [-Wformat=]
238 | drm_printf(p, "Media Slice%d Power Gate Status: %s\n", n,
| ~^
| |
| char *
| %d
239 | str_up_down(pg_status & media_slices[n].status_bit));
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| |
| int
cc1: some warnings being treated as errors
make[7]: *** [../scripts/Makefile.build:244: drivers/gpu/drm/xe/xe_gt_idle.o] Error 1
make[7]: *** Waiting for unfinished jobs....
make[6]: *** [../scripts/Makefile.build:485: drivers/gpu/drm/xe] Error 2
make[6]: *** Waiting for unfinished jobs....
../lib/iomap.c:156:5: warning: no previous prototype for ‘ioread64_lo_hi’ [-Wmissing-prototypes]
156 | u64 ioread64_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:163:5: warning: no previous prototype for ‘ioread64_hi_lo’ [-Wmissing-prototypes]
163 | u64 ioread64_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~
../lib/iomap.c:170:5: warning: no previous prototype for ‘ioread64be_lo_hi’ [-Wmissing-prototypes]
170 | u64 ioread64be_lo_hi(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:178:5: warning: no previous prototype for ‘ioread64be_hi_lo’ [-Wmissing-prototypes]
178 | u64 ioread64be_hi_lo(const void __iomem *addr)
| ^~~~~~~~~~~~~~~~
../lib/iomap.c:264:6: warning: no previous prototype for ‘iowrite64_lo_hi’ [-Wmissing-prototypes]
264 | void iowrite64_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:272:6: warning: no previous prototype for ‘iowrite64_hi_lo’ [-Wmissing-prototypes]
272 | void iowrite64_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~
../lib/iomap.c:280:6: warning: no previous prototype for ‘iowrite64be_lo_hi’ [-Wmissing-prototypes]
280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
../lib/iomap.c:288:6: warning: no previous prototype for ‘iowrite64be_hi_lo’ [-Wmissing-prototypes]
288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr)
| ^~~~~~~~~~~~~~~~~
make[5]: *** [../scripts/Makefile.build:485: drivers/gpu/drm] Error 2
make[4]: *** [../scripts/Makefile.build:485: drivers/gpu] Error 2
make[3]: *** [../scripts/Makefile.build:485: drivers] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [/kernel/Makefile:1926: .] Error 2
make[1]: *** [/kernel/Makefile:224: __sub-make] Error 2
make: *** [Makefile:224: __sub-make] Error 2
[10:05:23] Configuring KUnit Kernel ...
Generating .config ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
[10:05:27] Building KUnit Kernel ...
Populating config with:
$ make ARCH=um O=.kunit olddefconfig
Building with:
$ make ARCH=um O=.kunit --jobs=48
+ cleanup
++ stat -c %u:%g /kernel
+ chown -R 1003:1003 /kernel
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the kspp tree
2024-09-09 9:59 linux-next: build failure after merge of the kspp tree Stephen Rothwell
` (2 preceding siblings ...)
2024-09-09 10:05 ` ✗ CI.KUnit: failure " Patchwork
@ 2024-09-18 23:27 ` Stephen Rothwell
2024-09-20 3:43 ` Lucas De Marchi
3 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2024-09-18 23:27 UTC (permalink / raw)
To: Lucas De Marchi, Thomas Hellström
Cc: Kees Cook, Riana Tauro, Rodrigo Vivi, Michal Wajdeczko,
DRM XE List, Linux Kernel Mailing List, Linux Next Mailing List,
Dave Airlie, DRI
[-- Attachment #1: Type: text/plain, Size: 2233 bytes --]
Hi all,
On Mon, 9 Sep 2024 19:59:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the kspp tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/xe/xe_gt_idle.c:56:27: error: redefinition of 'str_up_down'
> 56 | static inline const char *str_up_down(bool v)
> | ^~~~~~~~~~~
> In file included from include/linux/string_helpers.h:7,
> from drivers/gpu/drm/xe/xe_assert.h:9,
> from drivers/gpu/drm/xe/xe_force_wake.h:9,
> from drivers/gpu/drm/xe/xe_gt_idle.c:8:
> include/linux/string_choices.h:62:27: note: previous definition of 'str_up_down' with type 'const char *(bool)' {aka 'const char *(_Bool)'}
> 62 | static inline const char *str_up_down(bool v)
> | ^~~~~~~~~~~
>
> Caused by commit
>
> a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")
>
> interacting with commit
>
> 0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")
>
> from the drm-xe tree.
>
> I have applied the following patch for today.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 9 Sep 2024 19:40:17 +1000
> Subject: [PATCH] fix up for "lib/string_choices: Add str_up_down() helper"
>
> interacting wit commit "drm/xe/xe_gt_idle: add debugfs entry for
> powergating info" from the drm-xe tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/gpu/drm/xe/xe_gt_idle.c | 5 -----
> 1 file changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
> index 85a35ed153a3..0f98c1539c64 100644
> --- a/drivers/gpu/drm/xe/xe_gt_idle.c
> +++ b/drivers/gpu/drm/xe/xe_gt_idle.c
> @@ -53,11 +53,6 @@ pc_to_xe(struct xe_guc_pc *pc)
> return gt_to_xe(gt);
> }
>
> -static inline const char *str_up_down(bool v)
> -{
> - return v ? "up" : "down";
> -}
> -
> static const char *gt_idle_state_to_string(enum xe_gt_idle_state state)
> {
> switch (state) {
> --
> 2.45.2
This is now needed in the merge between Linus' tree and the drm-xe tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: linux-next: build failure after merge of the kspp tree
2024-09-18 23:27 ` Stephen Rothwell
@ 2024-09-20 3:43 ` Lucas De Marchi
0 siblings, 0 replies; 6+ messages in thread
From: Lucas De Marchi @ 2024-09-20 3:43 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Thomas Hellström, Kees Cook, Riana Tauro, Rodrigo Vivi,
Michal Wajdeczko, DRM XE List, Linux Kernel Mailing List,
Linux Next Mailing List, Dave Airlie, DRI
On Thu, Sep 19, 2024 at 09:27:52AM GMT, Stephen Rothwell wrote:
>Hi all,
>
>On Mon, 9 Sep 2024 19:59:39 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> After merging the kspp tree, today's linux-next build (x86_64
>> allmodconfig) failed like this:
>>
>> drivers/gpu/drm/xe/xe_gt_idle.c:56:27: error: redefinition of 'str_up_down'
>> 56 | static inline const char *str_up_down(bool v)
>> | ^~~~~~~~~~~
>> In file included from include/linux/string_helpers.h:7,
>> from drivers/gpu/drm/xe/xe_assert.h:9,
>> from drivers/gpu/drm/xe/xe_force_wake.h:9,
>> from drivers/gpu/drm/xe/xe_gt_idle.c:8:
>> include/linux/string_choices.h:62:27: note: previous definition of 'str_up_down' with type 'const char *(bool)' {aka 'const char *(_Bool)'}
>> 62 | static inline const char *str_up_down(bool v)
>> | ^~~~~~~~~~~
>>
>> Caused by commit
>>
>> a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")
>>
>> interacting with commit
>>
>> 0914c1e45d3a ("drm/xe/xe_gt_idle: add debugfs entry for powergating info")
>>
>> from the drm-xe tree.
>>
>> I have applied the following patch for today.
>>
>> From: Stephen Rothwell <sfr@canb.auug.org.au>
>> Date: Mon, 9 Sep 2024 19:40:17 +1000
>> Subject: [PATCH] fix up for "lib/string_choices: Add str_up_down() helper"
>>
>> interacting wit commit "drm/xe/xe_gt_idle: add debugfs entry for
>> powergating info" from the drm-xe tree.
>>
>> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>> ---
>> drivers/gpu/drm/xe/xe_gt_idle.c | 5 -----
>> 1 file changed, 5 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_gt_idle.c b/drivers/gpu/drm/xe/xe_gt_idle.c
>> index 85a35ed153a3..0f98c1539c64 100644
>> --- a/drivers/gpu/drm/xe/xe_gt_idle.c
>> +++ b/drivers/gpu/drm/xe/xe_gt_idle.c
>> @@ -53,11 +53,6 @@ pc_to_xe(struct xe_guc_pc *pc)
>> return gt_to_xe(gt);
>> }
>>
>> -static inline const char *str_up_down(bool v)
>> -{
>> - return v ? "up" : "down";
>> -}
>> -
>> static const char *gt_idle_state_to_string(enum xe_gt_idle_state state)
>> {
>> switch (state) {
>> --
>> 2.45.2
>
>This is now needed in the merge between Linus' tree and the drm-xe tree.
Thanks. This not going to 6.12. It's targeted to 6.13, so we should fix
it when merging drm-next back to drm-xe-next.
Lucas De Marchi
>
>--
>Cheers,
>Stephen Rothwell
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-09-20 3:43 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-09 9:59 linux-next: build failure after merge of the kspp tree Stephen Rothwell
2024-09-09 10:05 ` ✓ CI.Patch_applied: success for " Patchwork
2024-09-09 10:05 ` ✗ CI.checkpatch: warning " Patchwork
2024-09-09 10:05 ` ✗ CI.KUnit: failure " Patchwork
2024-09-18 23:27 ` Stephen Rothwell
2024-09-20 3:43 ` Lucas De Marchi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox