Received-SPF: pass (google.com: domain of linux-kernel+bounces-97831-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Sat, 9 Mar 2024 10:46:51 +0100
From: Borislav Petkov <bp@alien8.de>
To: Yazen Ghannam <yazen.ghannam@amd.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Mauro Carvalho Chehab <mchehab+samsung@kernel.org>,
	Tony Luck <tony.luck@intel.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the edac tree
Message-ID: <20240309094651.GAZewwC3u3U7DhXBdo@fat_crate.local>
References: <20240227134352.6deda860@canb.auug.org.au>
 <e367a4ad-3431-4cf8-9c0c-1205e00b907c@amd.com>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <e367a4ad-3431-4cf8-9c0c-1205e00b907c@amd.com>

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