Received-SPF: pass (google.com: domain of linux-kernel+bounces-97666-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Message-ID: <e367a4ad-3431-4cf8-9c0c-1205e00b907c@amd.com>
Date: Fri, 8 Mar 2024 17:43:26 -0500
User-Agent: Mozilla Thunderbird
From: Yazen Ghannam <yazen.ghannam@amd.com>
Subject: Re: linux-next: build failure after merge of the edac tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
 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@amd.com,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
 Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20240227134352.6deda860@canb.auug.org.au>
Content-Language: en-US
In-Reply-To: <20240227134352.6deda860@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?eWliRy9scDFpNll3amF3eUJLTmxpZmhRcXJMN2x4K24wZnFCTUZoeFhVY0VG?=
 =?utf-8?B?TGFOZG1kT3RJN1g1U1FrQ1FwR3VCQ1UvTjQ3cmcvb3VDOTNSTlhvOW91QmNY?=
 =?utf-8?B?cVZIZDMycjdCR0JTT0tVQUJuUWczMXo5MCtreFE2VkF2SFp2VnhtWEhBWEN0?=
 =?utf-8?B?ZDBwZ0NyQS9OSUFNVmxGM21UVEU4eGZGN1FVM1RTWlRnSTdYQUcyeFo1bDFQ?=
 =?utf-8?B?NGNENlNGK3UyNUYxeFVnYVVnUTkyaFBhMkNCMlhuRXJzQlFCVkxnNTE1L1Y1?=
 =?utf-8?B?VVNoOTNwRVhPRGQ0MW1GcDM2YUx2N2NudDNQa2szUDBFTS9EQTlZbkluZ2Ro?=
 =?utf-8?B?dU1EbW93aDdUT1liTHdOemVpYWdtd0trRnZVSDhHemRyMVNGZFA1cklMMVFi?=
 =?utf-8?B?VDBrQ0hrSzJRd3RIVGZoQ2Y2VENadHF5cU9IQkpNTEh4bHkxSkY2c3RFMjd4?=
 =?utf-8?B?SXlLNXNFck1ONXc5YVp3OUFzSStnbkpKQlVTYkVzYWt6Q3k4bGM5d1FzbWY2?=
 =?utf-8?B?U1NhYS9oMlJ5SFBzVitGU2VmSXFydkxKNW0vRWhZUm9HWmFhUjZDRWlFQWVw?=
 =?utf-8?B?NW91aTZkaDBaWWVQQ25GeERzRDhmeTkrcWk5aXZnRHhsbjN1Ry9DV0x6VHV3?=
 =?utf-8?B?QUpHeUgxTVVqcG5IY3VmbDQvaTZXcUN1S3RaeFN6VUJBNG91VEtMVkNIdUZq?=
 =?utf-8?B?ZlhPR1Fod2VYYzhjRjJ4YTJiZS9nTksxVWtwZ29EKzh3dTJ6UTJ5anVaekw0?=
 =?utf-8?B?UjNERzRPSW5lYjVxMEQ1UUIzSDByOEMvYTlubGRzR0ZtU1U5QWcyK0E1UVN0?=
 =?utf-8?B?ZnpCbGN2cldrQ0Q1MURLY0VMdEVLdzQ3aTlNMVJyLzQ1ZDlsd2dxTEJyMUQx?=
 =?utf-8?B?a2ZJMVlkN1BpdWNNT2JyblFjTkFybVo2K0swbWsxbGZlVVNWWXNPTTUrRk5T?=
 =?utf-8?B?UWtueHAraXNTbThjTlN6SWYxM1lQUFVBRHZ0QXNKb2xKZGJXWDYybFhkRjlu?=
 =?utf-8?B?eUpINVZRdlMxM3pySmlTWGM3bnNtZkNvU2xQL2tHbzV5ak85ZG0vNUdzMHFD?=
 =?utf-8?B?TW5vQmVsNXo2WWtwRDlJYlBvTXZzTmVLVi9kQTVTcVBlTVN0a2hkMmxncDQz?=
 =?utf-8?B?aUloaGVsRUt5RnJScnU0UWV0NkV5Uit6TEI3U3laRjZxemdtbmxNeFNhcmYz?=
 =?utf-8?B?N2dhWTd2M2VvZVcxN3RCNWk2S0c1UEV5NUFnNjQvNjR4em1pVktYS3I2L0FW?=
 =?utf-8?B?U3EvbHpFTkwyNFVNaXJldU52UXVnd3pCREd4STBzRjBVWGF6S2R2QVBCQlZn?=
 =?utf-8?B?dFRwS3JCcG92dVd5dTNxVFBSUCs5V1Z6cTFvT3hJQXg5eXpqTEx0bDduOHo1?=
 =?utf-8?B?dDR5N3ZIOWRtVWNIY0lTakl2SWMyZkRVT0lqeEx0MTNsVzA5Y0ppcXFPMjBm?=
 =?utf-8?B?Q1NsWVFCSnZFMkRSMTlCNVIwVUZFUk1YSjgxSHpkZk1HZ0lBVlh6TEVnT3Ar?=
 =?utf-8?B?TklKeitxb2c0WUNUcWFsVHhxL1Z1MDJjYUtNcllOWVNjUGlvcmxtdU9uS2NE?=
 =?utf-8?B?NW1BNWgrOTBMcVBWMldLbWJNd2xEcExUSmFVTW1zTGlJL0ZVUlAzcTZjZUpy?=
 =?utf-8?B?TkRGYnFEb1pyZHBDUTVTZHlPOFJxd2lTL1V6Z2d0MTNyWmh1YmRUUTZvajR2?=
 =?utf-8?B?V0VpNjdDTTdiTm1nb1lOZXp5ekx4enJqc096YmVoeUsyY2xaQ3U4WVJ4UG1R?=
 =?utf-8?B?MjBhaG1ReFQyY0xvYzhQdzlSV2wycmxFV3ZmdWovaFRuKzhmRWcwZzZKY2tB?=
 =?utf-8?B?eklRdjdXSWNJL3RkdjNlUW4xK1A1b1JvalJaZ1J3U2pZbnpRSDBIZ0p5cTd0?=
 =?utf-8?B?V1pUaG84YmxrYUxEVU93MUE2azFGOEkvVG9TMUJXek81ZGhmazlyMENiRGtn?=
 =?utf-8?B?Qjk5RUhnREg3NjlFY2k5M3hxa01zTDQ3VDllSFhTZlJUM2x6MnpVY0JHbXhy?=
 =?utf-8?B?VWtlNE5SbkFrd05rK0RJN0NraENWekI0a2xJNEtTeGhreTJTblc3dnVrc0h3?=
 =?utf-8?B?YmJRdUpJMkxsbCtYM1dibFVuUzBFOGJVWUpPMzRpOTc0T3ZER0hVdmNuTGQx?=
 =?utf-8?Q?qpWKlsl3iqKP07lkPjxenR6DX?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 99f72c82-7a5d-4021-a91e-08dc3fc12c00
X-MS-Exchange-CrossTenant-AuthSource: BYAPR12MB3109.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2024 22:43:28.1359
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Bx4hbb86aoO+Tcs36iVgg3uq7Vg6chvf69kdGE3BAqlve8Uu0u6MQHGdObiuKuuuewbeADKV3EY0eBpv4X9TQQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB5616

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