* linux-next: build failure after merge of the edac tree
@ 2024-02-27 2:43 Stephen Rothwell
2024-03-08 22:43 ` Yazen Ghannam
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2024-02-27 2:43 UTC (permalink / raw)
To: Mauro Carvalho Chehab, Borislav Petkov, Tony Luck,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra
Cc: Yazen Ghannam, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1657 bytes --]
Hi all,
After merging the edac tree, today's linux-next build (x86_64
allmodconfig) failed like this:
drivers/ras/amd/atl/umc.c: In function 'get_die_id':
drivers/ras/amd/atl/umc.c:318:44: error: implicit declaration of function 'amd_get_nodes_per_socket' [-Werror=implicit-function-declaration]
318 | return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
| ^~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
3f3174996be6 ("RAS: Introduce AMD Address Translation Library")
interacting with commit
c749ce393b8f ("x86/cpu: Use common topology code for AMD")
from the tip tree.
I applied the following merge resolution patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 27 Feb 2024 13:22:56 +1100
Subject: [PATCH] fix up for "RAS: Introduce AMD Address Translation Library"
interacting with "x86/cpu: Use common topology code for AMD"
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
drivers/ras/amd/atl/umc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
index 08c6dbd44c62..65a0ab651ee2 100644
--- a/drivers/ras/amd/atl/umc.c
+++ b/drivers/ras/amd/atl/umc.c
@@ -315,7 +315,7 @@ static u8 get_die_id(struct atl_err *err)
* For CPUs, this is the AMD Node ID modulo the number
* of AMD Nodes per socket.
*/
- return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
+ return topology_die_id(err->cpu) % topology_amd_nodes_per_pkg();
}
#define UMC_CHANNEL_NUM GENMASK(31, 20)
--
2.43.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the edac tree
2024-02-27 2:43 linux-next: build failure after merge of the edac tree Stephen Rothwell
@ 2024-03-08 22:43 ` Yazen Ghannam
2024-03-09 9:46 ` Borislav Petkov
0 siblings, 1 reply; 8+ messages in thread
From: Yazen Ghannam @ 2024-03-08 22:43 UTC (permalink / raw)
To: Stephen Rothwell, Mauro Carvalho Chehab, Borislav Petkov,
Tony Luck, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra
Cc: yazen.ghannam, Linux Kernel Mailing List, Linux Next Mailing List
On 2/26/2024 9:43 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the edac tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/ras/amd/atl/umc.c: In function 'get_die_id':
> drivers/ras/amd/atl/umc.c:318:44: error: implicit declaration of function 'amd_get_nodes_per_socket' [-Werror=implicit-function-declaration]
> 318 | return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
> | ^~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 3f3174996be6 ("RAS: Introduce AMD Address Translation Library")
>
> interacting with commit
>
> c749ce393b8f ("x86/cpu: Use common topology code for AMD")
>
> from the tip tree.
>
> I applied the following merge resolution patch.
>
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 27 Feb 2024 13:22:56 +1100
> Subject: [PATCH] fix up for "RAS: Introduce AMD Address Translation Library"
>
> interacting with "x86/cpu: Use common topology code for AMD"
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
> drivers/ras/amd/atl/umc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
> index 08c6dbd44c62..65a0ab651ee2 100644
> --- a/drivers/ras/amd/atl/umc.c
> +++ b/drivers/ras/amd/atl/umc.c
> @@ -315,7 +315,7 @@ static u8 get_die_id(struct atl_err *err)
> * For CPUs, this is the AMD Node ID modulo the number
> * of AMD Nodes per socket.
> */
> - return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
> + return topology_die_id(err->cpu) % topology_amd_nodes_per_pkg();
"topology_die_id -> topology_amd_node_id" is also needed.
Does this need to be fixed up in the RAS tree?
Thanks,
Yazen
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the edac tree
2024-03-08 22:43 ` Yazen Ghannam
@ 2024-03-09 9:46 ` Borislav Petkov
2024-03-11 13:06 ` Yazen Ghannam
0 siblings, 1 reply; 8+ messages in thread
From: Borislav Petkov @ 2024-03-09 9:46 UTC (permalink / raw)
To: Yazen Ghannam
Cc: Stephen Rothwell, Mauro Carvalho Chehab, Tony Luck,
Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Peter Zijlstra,
Linux Kernel Mailing List, Linux Next Mailing List
On Fri, Mar 08, 2024 at 05:43:26PM -0500, Yazen Ghannam wrote:
> > diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
> > index 08c6dbd44c62..65a0ab651ee2 100644
> > --- a/drivers/ras/amd/atl/umc.c
> > +++ b/drivers/ras/amd/atl/umc.c
> > @@ -315,7 +315,7 @@ static u8 get_die_id(struct atl_err *err)
> > * For CPUs, this is the AMD Node ID modulo the number
> > * of AMD Nodes per socket.
> > */
> > - return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
> > + return topology_die_id(err->cpu) % topology_amd_nodes_per_pkg();
>
> "topology_die_id -> topology_amd_node_id" is also needed.
Are you saying topology_die_id() was already wrong?
Because even before the topo rewrite, this was
- cpuinfo_x86.topo.die_id:
The physical ID of the die. This information is retrieved via CPUID.
while this code talks about the AMD node thing.
> Does this need to be fixed up in the RAS tree?
I'll give a diff to Linus when I send the pull request.
--
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquette
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the edac tree
2024-03-09 9:46 ` Borislav Petkov
@ 2024-03-11 13:06 ` Yazen Ghannam
0 siblings, 0 replies; 8+ messages in thread
From: Yazen Ghannam @ 2024-03-11 13:06 UTC (permalink / raw)
To: Borislav Petkov
Cc: yazen.ghannam, Stephen Rothwell, Mauro Carvalho Chehab,
Tony Luck, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Peter Zijlstra, Linux Kernel Mailing List,
Linux Next Mailing List
On 3/9/2024 4:46 AM, Borislav Petkov wrote:
> On Fri, Mar 08, 2024 at 05:43:26PM -0500, Yazen Ghannam wrote:
>>> diff --git a/drivers/ras/amd/atl/umc.c b/drivers/ras/amd/atl/umc.c
>>> index 08c6dbd44c62..65a0ab651ee2 100644
>>> --- a/drivers/ras/amd/atl/umc.c
>>> +++ b/drivers/ras/amd/atl/umc.c
>>> @@ -315,7 +315,7 @@ static u8 get_die_id(struct atl_err *err)
>>> * For CPUs, this is the AMD Node ID modulo the number
>>> * of AMD Nodes per socket.
>>> */
>>> - return topology_die_id(err->cpu) % amd_get_nodes_per_socket();
>>> + return topology_die_id(err->cpu) % topology_amd_nodes_per_pkg();
>>
>> "topology_die_id -> topology_amd_node_id" is also needed.
>
> Are you saying topology_die_id() was already wrong?
>
> Because even before the topo rewrite, this was
>
> - cpuinfo_x86.topo.die_id:
>
> The physical ID of the die. This information is retrieved via CPUID.
>
> while this code talks about the AMD node thing.
>
We used to save AMD Node ID into topology_die_id() before the following:
03fa6bea5a3e ("x86/cpu: Make topology_amd_node_id() use the actual node info")
>> Does this need to be fixed up in the RAS tree?
>
> I'll give a diff to Linus when I send the pull request.
>
Thanks,
Yazen
^ permalink raw reply [flat|nested] 8+ messages in thread
* linux-next: build failure after merge of the edac tree
@ 2011-11-01 6:00 Stephen Rothwell
2011-11-01 11:58 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 8+ messages in thread
From: Stephen Rothwell @ 2011-11-01 6:00 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: linux-next, linux-kernel, Borislav Petkov
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
Hi Mauro,
After merging the edac tree, today's linux-next build (x86_64
allmodconfig) failed like this:
arch/x86/kernel/cpu/mcheck/mce.c:39:28: fatal error: linux/edac_mce.h: No such file or directory
Caused by commit cdaf4f4e563c ("i7core_edac: Drop the edac_mce
facility"). This commit removed the file include/linux/edac_mce.h which
is still metioned by the above file (and MAINTAINERS). Grep is your
friend.
I have used the version of the edac tree from next-20111025 for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the edac tree
2011-11-01 6:00 Stephen Rothwell
@ 2011-11-01 11:58 ` Mauro Carvalho Chehab
2011-11-01 12:54 ` Borislav Petkov
0 siblings, 1 reply; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2011-11-01 11:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Borislav Petkov
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Em 01-11-2011 04:00, Stephen Rothwell escreveu:
> Hi Mauro,
>
> After merging the edac tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> arch/x86/kernel/cpu/mcheck/mce.c:39:28: fatal error: linux/edac_mce.h: No such file or directory
>
> Caused by commit cdaf4f4e563c ("i7core_edac: Drop the edac_mce
> facility"). This commit removed the file include/linux/edac_mce.h which
> is still metioned by the above file (and MAINTAINERS). Grep is your
> friend.
Sorry, it were caused by a bad merge conflict resolution. The include
isn't need anymore.
The MAINTAINERS fix is indeed needed.
> I have used the version of the edac tree from next-20111025 for today.
I'm fixing both issues for tomorrow's next.
Thanks,
Mauro.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iQIcBAEBAgAGBQJOr96/AAoJEGO08Bl/PELn/asQAIIqZ+yth5ZEka4FFAnuFOyI
Cez2u5rU5WKkxnlqn3lDjq5pBR5/uvVGqDvNFurTzGwFFqRb2SNDh4LL8m0nXJ8O
JF2zs7n6ZtO5h3KMy5j9PuDDQcwFf3FUB9WRY/4LvGINCqNit+inrdYcbSKB1NDD
M3nF63tdv4HmpsI/7iriKfeUwWYHoOkHYdXFoPRxGdSBabW0GpEtjMAtBw8E1DXG
1hdOTBnpOyH2m/XIsZwYav09BitdOH/OzoyRRDPvFVOuofvsOLPxAq649x4DCiTo
XBjMma9JyiiqXjKl2t7T16Vgvp0TSiB5i2LXfIZdMIjpWKvyoEVM6+E75woBgwyX
iEOKdRrvPIdO0lU7+rkrW0sKVKdZpmpJl0vAVYSApyxpS4yxeBsLxakzbI6RoCdC
IKSY8QbIe7mj5Mp4LmOxZ+kMXgdttSdeloVfOOQzEtMMLY6Gf5wiodz0uEy19ouX
iCE8KzZRVgcgop+reG/jqTNv0/RwGMbsOdiaog6PmVDZY8z3WVKkA7IS0tUHCT7E
oEY+MIaS/OmKhRXhzjAsdkghbKBruZS1ai+kZ5MOl7gkaN1mK0c2FFueda6oxxhV
4p00mEmL+jwyx8dIKEdOHMMnziRSOlU+8xQubAJLNDnimVJ0eHJXvKlHZIGaVQfp
1vMymFukiedpFWjKaU4J
=s7ei
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: linux-next: build failure after merge of the edac tree
2011-11-01 11:58 ` Mauro Carvalho Chehab
@ 2011-11-01 12:54 ` Borislav Petkov
2011-11-01 13:00 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 8+ messages in thread
From: Borislav Petkov @ 2011-11-01 12:54 UTC (permalink / raw)
To: Mauro Carvalho Chehab; +Cc: Stephen Rothwell, linux-next, linux-kernel
On Tue, Nov 01, 2011 at 07:58:02AM -0400, Mauro Carvalho Chehab wrote:
> Sorry, it were caused by a bad merge conflict resolution. The include
> isn't need anymore.
>
> The MAINTAINERS fix is indeed needed.
>
> > I have used the version of the edac tree from next-20111025 for today.
>
> I'm fixing both issues for tomorrow's next.
Btw, you're sending those to Linus soon, right?
Thanks.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: linux-next: build failure after merge of the edac tree
2011-11-01 12:54 ` Borislav Petkov
@ 2011-11-01 13:00 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 8+ messages in thread
From: Mauro Carvalho Chehab @ 2011-11-01 13:00 UTC (permalink / raw)
To: Borislav Petkov; +Cc: Stephen Rothwell, linux-next, linux-kernel
Em 01-11-2011 10:54, Borislav Petkov escreveu:
> On Tue, Nov 01, 2011 at 07:58:02AM -0400, Mauro Carvalho Chehab wrote:
>> Sorry, it were caused by a bad merge conflict resolution. The include
>> isn't need anymore.
>>
>> The MAINTAINERS fix is indeed needed.
>>
>>> I have used the version of the edac tree from next-20111025 for today.
>>
>> I'm fixing both issues for tomorrow's next.
>
> Btw, you're sending those to Linus soon, right?
Yes, likely tomorrow, if no surprises at linux-next merge arise.
>
> Thanks.
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-03-11 13:06 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-27 2:43 linux-next: build failure after merge of the edac tree Stephen Rothwell
2024-03-08 22:43 ` Yazen Ghannam
2024-03-09 9:46 ` Borislav Petkov
2024-03-11 13:06 ` Yazen Ghannam
-- strict thread matches above, loose matches on Subject: below --
2011-11-01 6:00 Stephen Rothwell
2011-11-01 11:58 ` Mauro Carvalho Chehab
2011-11-01 12:54 ` Borislav Petkov
2011-11-01 13:00 ` Mauro Carvalho Chehab
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).