Re: linux-next: build failure after merge of the edac tree

[Borislav Petkov]

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