Received-SPF: pass (google.com: domain of linux-kernel+bounces-82622-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Tue, 27 Feb 2024 13:43:52 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>, Borislav Petkov
 <bp@alien8.de>, 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>
Cc: Yazen Ghannam <yazen.ghannam@amd.com>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the edac tree
Message-ID: <20240227134352.6deda860@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/C4dCoS1g5NUh.vzFQtk/I=s";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/C4dCoS1g5NUh.vzFQtk/I=s
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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=3Dimplicit-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();
 }
=20
 #define UMC_CHANNEL_NUM	GENMASK(31, 20)
--=20
2.43.0

--=20
Cheers,
Stephen Rothwell

--Sig_/C4dCoS1g5NUh.vzFQtk/I=s
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXdTGgACgkQAVBC80lX
0Gwa+QgAiQIbP1j90MTyouxjS1jTdKVwUt6L4/+hapVf4UC8lXVP8SyZEf2pdHDk
rDHtMCFLdNORLab67PYDLHZAH0HIsQfWXrPUt0GDXcv694aap2Jjo55eZSZ5pV5d
Iuci56176bd3uz5W70sFY7cU7/NlpcIQZUhhFmDSTM1JSY5ByJ3AYFWOg/OQjnt7
i6Qz6pxh70QW4B0dPz7ruyA4rwHe91MCiNJqaxS5vdrz1BDuZcpp0S2CBfFgNa6H
5Mo4VHHdAyx7Xd9pF2zNMXsD3/a9rkyOwz0/9oozDQ4XJRVXU3G+jvgxDT94LHrh
nDPGZ6N7ShNuRlPvApfH09O+oTDfLg==
=1um8
-----END PGP SIGNATURE-----

--Sig_/C4dCoS1g5NUh.vzFQtk/I=s--